Merge 8582267038 into 376f687c38

server: add tagme flag on upload, clear on edit
To easily filter through posts that haven't been retagged since initial upload.
2025-07-17 08:26:24 +00:00 · 2025-04-01 08:12:41 +00:00 · 2025-04-01 10:12:35 +02:00 · 2025-04-01 10:12:35 +02:00 · 2025-04-01 09:35:46 +02:00 · 2025-04-01 07:30:55 +02:00
39 changed files with 343 additions and 331 deletions
--- a/README.md
+++ b/README.md
@ -8,7 +8,7 @@ scrubbing](https://sjp.pwn.pl/sjp/;2527372). It is pronounced as *shoorubooru*.
 ## Features

 - Post content: images (JPG, PNG, GIF, animated GIF), videos (MP4, WEBM), Flash animations
- Ability to retrieve web video content using [youtube-dl](https://github.com/ytdl-org/youtube-dl)
+- Ability to retrieve web video content using [yt-dlp](https://github.com/yt-dlp/yt-dlp)
 - Post comments
 - Post notes / annotations, including arbitrary polygons
 - Rich JSON REST API ([see documentation](doc/API.md))
--- a/client/css/comment-control.styl
+++ b/client/css/comment-control.styl
@ -149,6 +149,10 @@ $comment-border-color = #DDD
                border-right: 0.75em solid $comment-header-background-color-darktheme

 .comment-content
+    p
+        word-wrap: normal
+        word-break: break-word
+
    ul, ol
        list-style-position: inside
        margin: 1em 0
--- a/client/css/core-general.styl
+++ b/client/css/core-general.styl
@ -309,10 +309,10 @@ a .access-key
        background-size: 20px 20px
    img
        opacity: 0
-        width: auto
+        width: 100%
        height: 100%
    video
-        width: auto
+        width: 100%
        height: 100%

 .flexbox-dummy
--- a/client/css/post-list-view.styl
+++ b/client/css/post-list-view.styl
@ -187,6 +187,9 @@
            vertical-align: top
        @media (max-width: 1000px)
            display: block
+            &.bulk-edit-tags:not(.opened), &.bulk-edit-safety:not(.opened)
+                float: left
+                margin-right: 1em
    input
        margin-bottom: 0.25em
        margin-right: 0.25em
--- a/client/css/post-main-view.styl
+++ b/client/css/post-main-view.styl
@ -15,7 +15,7 @@
            border: 0
            outline: 0

-        nav.buttons
+    >.sidebar>nav.buttons, >.content nav.buttons
        margin-top: 0
        display: flex
        flex-wrap: wrap
@ -34,19 +34,23 @@
                font-size: 140%
            text-align: center
        @media (max-width: 800px)
-                margin-top: 2em
+            margin-top: 0.6em
+            margin-bottom: 0.6em

    >.content
        width: 100%

    .post-container
-        margin-bottom: 2em
+        margin-bottom: 0.6em

        .post-content
            margin: 0

+    .after-mobile-controls
+        width: 100%
+
 .darktheme .post-view
-    >.sidebar
+    >.sidebar, >.content
        nav.buttons
            article
                a:not(.inactive):hover
@ -56,6 +60,8 @@
@media (max-width: 800px)
    .post-view
        flex-wrap: wrap
+        >.after-mobile-controls
+            order: 3
        >.sidebar
            order: 2
            min-width: 100%
@ -113,7 +119,6 @@
        h1
            margin-bottom: 0.5em
        .thumbnail
-            background-position: 50% 30%
            width: 4em
            height: 3em
        li
--- a/client/css/user-list-view.styl
+++ b/client/css/user-list-view.styl
@ -21,10 +21,11 @@
    .details
        font-size: 90%
        line-height: 130%
+    .image
+        margin: 0.25em 0.6em 0.25em 0
    .thumbnail
        width: 3em
        height: 3em
-        margin: 0.25em 0.6em 0 0

 .darktheme .user-list
    ul li
--- a/client/html/index.htm
+++ b/client/html/index.htm
@ -2,7 +2,7 @@
 <html>
 <head>
    <meta charset='utf-8'/>
-    <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1'/>
+    <meta name='viewport' content='width=device-width, initial-scale=1.0'>
    <meta name='theme-color' content='#24aadd'/>
    <meta name='apple-mobile-web-app-capable' content='yes'/>
    <meta name='apple-mobile-web-app-status-bar-style' content='black'/>
--- a/client/html/post_main.tpl
+++ b/client/html/post_main.tpl
@ -52,13 +52,15 @@
    <div class='content'>
        <div class='post-container'></div>

-        <% if (ctx.canListComments) { %>
-            <div class='comments-container'></div>
-        <% } %>
-
+        <div class='after-mobile-controls'>
            <% if (ctx.canCreateComments) { %>
                <h2>Add comment</h2>
                <div class='comment-form-container'></div>
            <% } %>
+
+            <% if (ctx.canListComments) { %>
+                <div class='comments-container'></div>
+            <% } %>
+        </div>
    </div>
 </div>
--- a/client/html/post_readonly_sidebar.tpl
+++ b/client/html/post_readonly_sidebar.tpl
@ -17,8 +17,8 @@
                    'video/mp4': 'MPEG-4',
                    'video/quicktime': 'MOV',
                    'application/x-shockwave-flash': 'SWF',
-                }[ctx.post.mimeType] %>
-            </a>
+                }[ctx.post.mimeType] %><!--
+            --></a>
            (<%- ctx.post.canvasWidth %>x<%- ctx.post.canvasHeight %>)
            <% if (ctx.post.flags.length) { %><!--
                --><% if (ctx.post.flags.includes('loop')) { %><i class='fa fa-repeat'></i><% } %><!--
@ -58,7 +58,7 @@
            Search on
            <a href='http://iqdb.org/?url=<%- encodeURIComponent(ctx.post.fullContentUrl) %>'>IQDB</a> &middot;
            <a href='https://danbooru.donmai.us/posts?tags=md5:<%- ctx.post.checksumMD5 %>'>Danbooru</a> &middot;
-            <a href='https://www.google.com/searchbyimage?&image_url=<%- encodeURIComponent(ctx.post.fullContentUrl) %>'>Google Images</a>
+            <a href='https://lens.google.com/uploadbyurl?url=<%- encodeURIComponent(ctx.post.fullContentUrl) %>'>Google Images</a>
        </section>

        <section class='social'>
@ -99,10 +99,10 @@
                        --><% if (ctx.canListPosts) { %><!--
                            --><a href='<%- ctx.formatClientLink('posts', {query: ctx.escapeTagName(tag.names[0])}) %>' class='<%= ctx.makeCssName(tag.category, 'tag') %>'><!--
                        --><% } %><!--
-                            --><%- ctx.getPrettyName(tag.names[0]) %>&#32;<!--
+                            --><%- ctx.getPrettyName(tag.names[0]) %><!--
                        --><% if (ctx.canListPosts) { %><!--
                            --></a><!--
-                        --><% } %><!--
+                        --><% } %>&#32;<!--
                        --><span class='tag-usages' data-pseudo-content='<%- tag.postCount %>'></span><!--
                    --></li><!--
                --><% } %><!--
--- a/client/html/posts_header.tpl
+++ b/client/html/posts_header.tpl
@ -16,7 +16,6 @@
        %><form class='horizontal bulk-edit bulk-edit-tags'><%
            %><span class='append hint'>Tagging with:</span><%
            %><a href class='mousetrap button append open'>Mass tag</a><%
-            %><wbr/><%
            %><%= ctx.makeTextInput({name: 'tag', value: ctx.parameters.tag}) %><%
            %><input class='mousetrap start' type='submit' value='Start tagging'/><%
            %><a href class='mousetrap button append close'>Stop tagging</a><%
--- a/client/html/tags_page.tpl
+++ b/client/html/tags_page.tpl
@ -71,7 +71,7 @@
                            <% } %>
                        </td>
                        <td class='usages'>
-                            <%- tag.postCount %>
+                            <a href='<%- ctx.formatClientLink('posts', {query: ctx.escapeTagName(tag.names[0])}) %>'><%- tag.postCount %></a>
                        </td>
                        <td class='creation-time'>
                            <%= ctx.makeRelativeTime(tag.creationTime) %>
--- a/client/js/api.js
+++ b/client/js/api.js
@ -5,9 +5,11 @@ const request = require("superagent");
 const events = require("./events.js");
 const progress = require("./util/progress.js");
 const uri = require("./util/uri.js");
+const Info = require("../models/info.js");

 let fileTokens = {};
 let remoteConfig = null;
+let remoteConfigPromise = null;

 class Api extends events.EventTarget {
    constructor() {
@ -68,9 +70,13 @@ class Api extends events.EventTarget {

    fetchConfig() {
        if (remoteConfig === null) {
-            return this.get(uri.formatApiLink("info")).then((response) => {
+            if (remoteConfigPromise !== null) {
+                return Promise.resolve(remoteConfigPromise);
+            }
+            remoteConfigPromise = Info.get().then((response) => {
                remoteConfig = response.config;
            });
+            return remoteConfigPromise;
        } else {
            return Promise.resolve();
        }
--- a/client/js/controllers/home_controller.js
+++ b/client/js/controllers/home_controller.js
@ -2,7 +2,6 @@

 const api = require("../api.js");
 const config = require("../config.js");
-const Info = require("../models/info.js");
 const topNavigation = require("../models/top_navigation.js");
 const HomeView = require("../views/home_view.js");

@ -20,7 +19,7 @@ class HomeController {
            isDevelopmentMode: config.environment == "development",
        });

-        Info.get().then(
+        api.fetchConfig().then(
            (info) => {
                this._homeView.setStats({
                    diskUsage: info.diskUsage,
--- a/client/js/controllers/pool_controller.js
+++ b/client/js/controllers/pool_controller.js
@ -91,16 +91,16 @@ class PoolController {
    _evtUpdate(e) {
        this._view.clearMessages();
        this._view.disableForm();
-        if (e.detail.names !== undefined) {
+        if (e.detail.names !== undefined && e.detail.names !== null) {
            e.detail.pool.names = e.detail.names;
        }
-        if (e.detail.category !== undefined) {
+        if (e.detail.category !== undefined && e.detail.category !== null) {
            e.detail.pool.category = e.detail.category;
        }
-        if (e.detail.description !== undefined) {
+        if (e.detail.description !== undefined && e.detail.description !== null) {
            e.detail.pool.description = e.detail.description;
        }
-        if (e.detail.posts !== undefined) {
+        if (e.detail.posts !== undefined && e.detail.posts !== null) {
            e.detail.pool.posts.clear();
            for (let postId of e.detail.posts) {
                e.detail.pool.posts.add(
--- a/client/js/controllers/pool_list_controller.js
+++ b/client/js/controllers/pool_list_controller.js
@ -43,6 +43,8 @@ class PoolListController {
        this._headerView.addEventListener(
            "submit",
            (e) => this._evtSubmit(e),
+        );
+        this._headerView.addEventListener(
            "navigate",
            (e) => this._evtNavigate(e)
        );
--- a/client/js/controllers/post_main_controller.js
+++ b/client/js/controllers/post_main_controller.js
@ -169,22 +169,22 @@ class PostMainController extends BasePostController {
        this._view.sidebarControl.disableForm();
        this._view.sidebarControl.clearMessages();
        const post = e.detail.post;
-        if (e.detail.safety !== undefined) {
+        if (e.detail.safety !== undefined && e.detail.safety !== null) {
            post.safety = e.detail.safety;
        }
-        if (e.detail.flags !== undefined) {
+        if (e.detail.flags !== undefined && e.detail.flags !== null) {
            post.flags = e.detail.flags;
        }
-        if (e.detail.relations !== undefined) {
+        if (e.detail.relations !== undefined && e.detail.relations !== null) {
            post.relations = e.detail.relations;
        }
-        if (e.detail.content !== undefined) {
+        if (e.detail.content !== undefined && e.detail.content !== null) {
            post.newContent = e.detail.content;
        }
-        if (e.detail.thumbnail !== undefined) {
+        if (e.detail.thumbnail !== undefined && e.detail.thumbnail !== null) {
            post.newThumbnail = e.detail.thumbnail;
        }
-        if (e.detail.source !== undefined) {
+        if (e.detail.source !== undefined && e.detail.source !== null) {
            post.source = e.detail.source;
        }
        post.save().then(
--- a/client/js/controllers/tag_controller.js
+++ b/client/js/controllers/tag_controller.js
@ -95,13 +95,13 @@ class TagController {
    _evtUpdate(e) {
        this._view.clearMessages();
        this._view.disableForm();
-        if (e.detail.names !== undefined) {
+        if (e.detail.names !== undefined && e.detail.names !== null) {
            e.detail.tag.names = e.detail.names;
        }
-        if (e.detail.category !== undefined) {
+        if (e.detail.category !== undefined && e.detail.category !== null) {
            e.detail.tag.category = e.detail.category;
        }
-        if (e.detail.description !== undefined) {
+        if (e.detail.description !== undefined && e.detail.description !== null) {
            e.detail.tag.description = e.detail.description;
        }
        e.detail.tag.save().then(
--- a/client/js/controllers/user_controller.js
+++ b/client/js/controllers/user_controller.js
@ -175,21 +175,21 @@ class UserController {
        const isLoggedIn = api.isLoggedIn(e.detail.user);
        const infix = isLoggedIn ? "self" : "any";

-        if (e.detail.name !== undefined) {
+        if (e.detail.name !== undefined && e.detail.name !== null) {
            e.detail.user.name = e.detail.name;
        }
-        if (e.detail.email !== undefined) {
+        if (e.detail.email !== undefined && e.detail.email !== null) {
            e.detail.user.email = e.detail.email;
        }
-        if (e.detail.rank !== undefined) {
+        if (e.detail.rank !== undefined && e.detail.rank !== null) {
            e.detail.user.rank = e.detail.rank;
        }

-        if (e.detail.password !== undefined) {
+        if (e.detail.password !== undefined && e.detail.password !== null) {
            e.detail.user.password = e.detail.password;
        }

-        if (e.detail.avatarStyle !== undefined) {
+        if (e.detail.avatarStyle !== undefined && e.detail.avatarStyle !== null) {
            e.detail.user.avatarStyle = e.detail.avatarStyle;
            if (e.detail.avatarContent) {
                e.detail.user.avatarContent = e.detail.avatarContent;
@ -302,7 +302,7 @@ class UserController {
        this._view.clearMessages();
        this._view.disableForm();

-        if (e.detail.note !== undefined) {
+        if (e.detail.note !== undefined && e.detail.note !== null) {
            e.detail.userToken.note = e.detail.note;
        }

--- a/client/js/controls/file_dropper_control.js
+++ b/client/js/controls/file_dropper_control.js
@ -48,6 +48,12 @@ class FileDropperControl extends events.EventTarget {
            this._urlInputNode.addEventListener("keydown", (e) =>
                this._evtUrlInputKeyDown(e)
            );
+            this._urlInputNode.addEventListener("paste", (e) => {
+                // document.onpaste is used on the post-upload page.
+                // And this event is used on the post edit page.
+                if (document.getElementById("post-upload")) return;
+                this._evtPaste(e)
+            });
        }
        if (this._urlConfirmButtonNode) {
            this._urlConfirmButtonNode.addEventListener("click", (e) =>
@ -55,6 +61,11 @@ class FileDropperControl extends events.EventTarget {
            );
        }

+        document.onpaste = (e) => {
+            if (!document.getElementById("post-upload")) return;
+            this._evtPaste(e)
+        }
+
        this._originalHtml = this._dropperNode.innerHTML;
        views.replaceContent(target, source);
    }
@ -129,6 +140,17 @@ class FileDropperControl extends events.EventTarget {
        this._emitFiles(e.dataTransfer.files);
    }

+    _evtPaste(e) {
+        const items = (e.clipboardData || e.originalEvent.clipboardData).items;
+        const fileList = Array.from(items).map((x) => x.getAsFile()).filter(f => f);
+
+        if (!this._options.allowMultiple && fileList.length > 1) {
+            window.alert("Cannot select multiple files.");
+        } else if (fileList.length > 0) {
+            this._emitFiles(fileList);
+        }
+    }
+
    _evtUrlInputKeyDown(e) {
        if (e.which !== KEY_RETURN) {
            return;
--- a/client/js/controls/post_content_control.js
+++ b/client/js/controls/post_content_control.js
@ -103,6 +103,30 @@ class PostContentControl {
    }

    _refreshSize() {
+        if (window.innerWidth <= 800) {
+            const buttons = document.querySelector(".sidebar > .buttons");
+            if (buttons) {
+                const content = document.querySelector(".content");
+                content.insertBefore(buttons, content.querySelector(".post-container + *"));
+
+                const afterControls = document.querySelector(".content > .after-mobile-controls");
+                if (afterControls) {
+                    afterControls.parentElement.parentElement.appendChild(afterControls);
+                }
+            }
+        } else {
+            const buttons = document.querySelector(".content > .buttons");
+            if (buttons) {
+                const sidebar = document.querySelector(".sidebar");
+                sidebar.insertBefore(buttons, sidebar.firstElementChild);
+            }
+
+            const afterControls = document.querySelector(".content + .after-mobile-controls");
+            if (afterControls) {
+                document.querySelector(".content").appendChild(afterControls);
+            }
+        }
+
        this._currentFitFunction();
    }

--- a/client/js/controls/post_edit_sidebar_control.js
+++ b/client/js/controls/post_edit_sidebar_control.js
@ -440,7 +440,7 @@ class PostEditSidebarControl extends events.EventTarget {
                        : undefined,

                    thumbnail:
-                        this._newPostThumbnail !== undefined
+                        this._newPostThumbnail !== undefined && this._newPostThumbnail !== null
                            ? this._newPostThumbnail
                            : undefined,

--- a/client/js/models/post.js
+++ b/client/js/models/post.js
@ -271,7 +271,7 @@ class Post extends events.EventTarget {
        if (this._newContent) {
            files.content = this._newContent;
        }
-        if (this._newThumbnail !== undefined) {
+        if (this._newThumbnail !== undefined && this._newThumbnail !== null) {
            files.thumbnail = this._newThumbnail;
        }
        if (this._source !== this._orig._source) {
--- a/client/js/util/views.js
+++ b/client/js/util/views.js
@ -209,13 +209,13 @@ function makePostLink(id, includeHash) {
 }

 function makeTagLink(name, includeHash, includeCount, tag) {
-    const category = tag ? tag.category : "unknown";
+    const category = tag && tag.category ? tag.category : "unknown";
    let text = misc.getPrettyName(name);
    if (includeHash === true) {
        text = "#" + text;
    }
    if (includeCount === true) {
-        text += " (" + (tag ? tag.postCount : 0) + ")";
+        text += " (" + (tag && tag.postCount ? tag.postCount : 0) + ")";
    }
    return api.hasPrivilege("tags:view")
        ? makeElement(
@ -234,15 +234,15 @@ function makeTagLink(name, includeHash, includeCount, tag) {
 }

 function makePoolLink(id, includeHash, includeCount, pool, name) {
-    const category = pool ? pool.category : "unknown";
+    const category = pool && pool.category ? pool.category : "unknown";
    let text = misc.getPrettyName(
-        name ? name : pool ? pool.names[0] : "unknown"
+        name ? name : pool && pool.names ? pool.names[0] : "pool " + id
    );
    if (includeHash === true) {
        text = "#" + text;
    }
    if (includeCount === true) {
-        text += " (" + (pool ? pool.postCount : 0) + ")";
+        text += " (" + (pool && pool.postCount ? pool.postCount : 0) + ")";
    }
    return api.hasPrivilege("pools:view")
        ? makeElement(
@ -264,7 +264,7 @@ function makeUserLink(user) {
    let text = makeThumbnail(user ? user.avatarUrl : "img/favicon.png");
    text += user && user.name ? misc.escapeHtml(user.name) : "Anonymous";
    const link =
-        user && api.hasPrivilege("users:view")
+        user && user.name && api.hasPrivilege("users:view")
            ? makeElement(
                  "a",
                  { href: uri.formatClientLink("user", user.name) },
@ -460,6 +460,7 @@ function getTemplate(templatePath) {
            makeCssName: misc.makeCssName,
            makeNumericInput: makeNumericInput,
            formatClientLink: uri.formatClientLink,
+            escapeTagName: uri.escapeTagName,
        });
        return htmlToDom(templateFactory(ctx));
    };
--- a/client/package-lock.json
+++ b/client/package-lock.json
@ -27,13 +27,19 @@
        "html-minifier": "^3.5.18",
        "jimp": "^0.13.0",
        "pretty-error": "^3.0.3",
-        "stylus": "^0.54.8",
+        "stylus": "^0.59.0",
        "terser": "^4.8.1",
        "underscore": "^1.12.1",
        "watchify": "^4.0.0",
        "ws": "^7.4.6"
      }
    },
+    "node_modules/@adobe/css-tools": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz",
+      "integrity": "sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==",
+      "dev": true
+    },
    "node_modules/@babel/runtime": {
      "version": "7.10.3",
      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.3.tgz",
@ -516,18 +522,6 @@
      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
    },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
    "node_modules/available-typed-arrays": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz",
@ -1737,27 +1731,6 @@
        "node": "*"
      }
    },
-    "node_modules/css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/css-parse": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
-      "dev": true,
-      "dependencies": {
-        "css": "^2.0.0"
-      }
-    },
    "node_modules/css-select": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
@ -1795,15 +1768,6 @@
        "url": "https://github.com/sponsors/fb55"
      }
    },
-    "node_modules/css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
    "node_modules/csso": {
      "version": "3.5.1",
      "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
@ -1830,15 +1794,6 @@
        "ms": "2.0.0"
      }
    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
    "node_modules/define-properties": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@ -3676,13 +3631,6 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
-    },
    "node_modules/ripemd160": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@ -3698,12 +3646,6 @@
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
    "node_modules/sax": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@ -3794,19 +3736,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
    "node_modules/source-map-support": {
      "version": "0.4.18",
      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
@ -3816,12 +3745,6 @@
        "source-map": "^0.5.6"
      }
    },
-    "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "dev": true
-    },
    "node_modules/stream-browserify": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
@ -3912,18 +3835,15 @@
      }
    },
    "node_modules/stylus": {
-      "version": "0.54.8",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
-      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
+      "version": "0.59.0",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.59.0.tgz",
+      "integrity": "sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg==",
      "dev": true,
      "dependencies": {
-        "css-parse": "~2.0.0",
-        "debug": "~3.1.0",
+        "@adobe/css-tools": "^4.0.1",
+        "debug": "^4.3.2",
        "glob": "^7.1.6",
-        "mkdirp": "~1.0.4",
-        "safer-buffer": "^2.1.2",
        "sax": "~1.2.4",
-        "semver": "^6.3.0",
        "source-map": "^0.7.3"
      },
      "bin": {
@ -3931,28 +3851,33 @@
      },
      "engines": {
        "node": "*"
+      },
+      "funding": {
+        "url": "https://opencollective.com/stylus"
      }
    },
-    "node_modules/stylus/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+    "node_modules/stylus/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "dependencies": {
+        "ms": "2.1.2"
      },
      "engines": {
-        "node": ">=10"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
      }
    },
-    "node_modules/stylus/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
+    "node_modules/stylus/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
    },
    "node_modules/stylus/node_modules/source-map": {
      "version": "0.7.3",
@ -4219,13 +4144,6 @@
      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
      "dev": true
    },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
-    },
    "node_modules/url": {
      "version": "0.11.0",
      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
@ -4602,6 +4520,12 @@
    }
  },
  "dependencies": {
+    "@adobe/css-tools": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz",
+      "integrity": "sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==",
+      "dev": true
+    },
    "@babel/runtime": {
      "version": "7.10.3",
      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.3.tgz",
@ -5072,12 +4996,6 @@
      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
    "available-typed-arrays": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz",
@ -6246,35 +6164,6 @@
        "randomfill": "^1.0.3"
      }
    },
-    "css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "css-parse": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
-      "dev": true,
-      "requires": {
-        "css": "^2.0.0"
-      }
-    },
    "css-select": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
@ -6326,12 +6215,6 @@
        "ms": "2.0.0"
      }
    },
-    "decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true
-    },
    "define-properties": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@ -7829,12 +7712,6 @@
        "path-parse": "^1.0.6"
      }
    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
    "ripemd160": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@ -7850,12 +7727,6 @@
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
    "sax": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@ -7931,19 +7802,6 @@
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
      "dev": true
    },
-    "source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
    "source-map-support": {
      "version": "0.4.18",
      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
@ -7953,12 +7811,6 @@
        "source-map": "^0.5.6"
      }
    },
-    "source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "dev": true
-    },
    "stream-browserify": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
@ -8040,31 +7892,31 @@
      }
    },
    "stylus": {
-      "version": "0.54.8",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
-      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
+      "version": "0.59.0",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.59.0.tgz",
+      "integrity": "sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg==",
      "dev": true,
      "requires": {
-        "css-parse": "~2.0.0",
-        "debug": "~3.1.0",
+        "@adobe/css-tools": "^4.0.1",
+        "debug": "^4.3.2",
        "glob": "^7.1.6",
-        "mkdirp": "~1.0.4",
-        "safer-buffer": "^2.1.2",
        "sax": "~1.2.4",
-        "semver": "^6.3.0",
        "source-map": "^0.7.3"
      },
      "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
          "dev": true
        },
        "source-map": {
@ -8287,12 +8139,6 @@
      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
      "dev": true
    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
    "url": {
      "version": "0.11.0",
      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
--- a/client/package.json
+++ b/client/package.json
@ -28,7 +28,7 @@
    "html-minifier": "^3.5.18",
    "jimp": "^0.13.0",
    "pretty-error": "^3.0.3",
-    "stylus": "^0.54.8",
+    "stylus": "^0.59.0",
    "terser": "^4.8.1",
    "underscore": "^1.12.1",
    "watchify": "^4.0.0",
--- a/doc/API.md
+++ b/doc/API.md
@ -54,7 +54,7 @@
        - [Deleting pool category](#deleting-pool-category)
        - [Setting default pool category](#setting-default-pool-category)
    - Pools
-        - [Listing pools](#listing-pool)
+        - [Listing pools](#listing-pools)
        - [Creating pool](#creating-pool)
        - [Updating pool](#updating-pool)
        - [Getting pool](#getting-pool)
@ -165,9 +165,9 @@ way. The files, however, should be passed as regular fields appended with a
 accepts a file named `content`, the client should pass
 `{"contentUrl":"http://example.com/file.jpg"}` as a part of the JSON message
 body. When creating or updating post content using this method, the server can
-also be configured to employ [youtube-dl](https://github.com/ytdl-org/youtube-dl)
-to download content from popular sites such as youtube, gfycat, etc. Access to
-youtube-dl can be configured with the `'uploads:use_downloader'` permission
+also be configured to employ [yt-dlp](https://github.com/yt-dlp/yt-dlp) to
+download content from popular sites such as youtube, gfycat, etc. Access to
+yt-dlp can be configured with the `'uploads:use_downloader'` permission

 Finally, in some cases the user might want to reuse one file between the
 requests to save the bandwidth (for example, reverse search + consecutive
@ -323,7 +323,7 @@ data.
    {
        "name":  <name>,
        "color": <color>,
-        "order": <order>  // optional
+        "order": <order>
    }
    ```

@ -789,7 +789,7 @@ data.
    | `fav-time`           | alias of `fav-date`                                                                                                                     |
    | `feature-date`       | featured at given date                                                                                                                  |
    | `feature-time`       | alias of `feature-time`                                                                                                                 |
-    | `safety`             | having given safety. `<value>` can be either `safe`, `sketchy` (or `questionable`) or `unsafe`.                                         |
+    | `safety`             | having given safety. `<value>` can be either `safe`, `sketchy` or `unsafe`.                                         |
    | `rating`             | alias of `safety`                                                                                                                       |

    **Sort style tokens**
@ -1389,7 +1389,7 @@ data.
 ## Creating pool
 - **Request**

-    `POST /pools/create`
+    `POST /pool`

 - **Input**

@ -2491,7 +2491,7 @@ One file together with its metadata posted to the site.
 ## Micro post
 **Description**

-A [post resource](#post) stripped down to `name` and `thumbnailUrl` fields.
+A [post resource](#post) stripped down to `id` and `thumbnailUrl` fields.

 ## Note
 **Description**
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@ -1,5 +1,5 @@
-This assumes that you have Docker (version 17.05 or greater)
-and Docker Compose (version 1.6.0 or greater) already installed.
+This assumes that you have Docker (version 19.03 or greater)
+and the Docker Compose CLI (version 1.27.0 or greater) already installed.

 ### Prepare things

@ -38,7 +38,7 @@ and Docker Compose (version 1.6.0 or greater) already installed.

    This pulls the latest containers from docker.io:
    ```console
-    user@host:szuru$ docker-compose pull
+    user@host:szuru$ docker compose pull
    ```

    If you have modified the application's source and would like to manually
@ -49,17 +49,17 @@ and Docker Compose (version 1.6.0 or greater) already installed.

    For first run, it is recommended to start the database separately:
    ```console
-    user@host:szuru$ docker-compose up -d sql
+    user@host:szuru$ docker compose up -d sql
    ```

    To start all containers:
    ```console
-    user@host:szuru$ docker-compose up -d
+    user@host:szuru$ docker compose up -d
    ```

    To view/monitor the application logs:
    ```console
-    user@host:szuru$ docker-compose logs -f
+    user@host:szuru$ docker compose logs -f
    # (CTRL+C to exit)
    ```

@ -84,13 +84,13 @@ and Docker Compose (version 1.6.0 or greater) already installed.
 2. Build the containers:

    ```console
-    user@host:szuru$ docker-compose build
+    user@host:szuru$ docker compose build
    ```

    That will attempt to build both containers, but you can specify `client`
    or `server` to make it build only one.

-    If `docker-compose build` spits out:
+    If `docker compose build` spits out:

    ```
    ERROR: Service 'server' failed to build: failed to parse platform : "" is an invalid component of "": platform specifier component must match "^[A-Za-z0-9_-]+$": invalid argument
@ -102,7 +102,7 @@ and Docker Compose (version 1.6.0 or greater) already installed.
    user@host:szuru$ export DOCKER_BUILDKIT=1; export COMPOSE_DOCKER_CLI_BUILD=1
    ```

-    ...and run `docker-compose build` again.
+    ...and run `docker compose build` again.

 *Note: If your changes are not taking effect in your builds, consider building
 with `--no-cache`.*
@ -117,7 +117,7 @@ with `--no-cache`.*
    run from docker:

    ```console
-    user@host:szuru$ docker-compose run server ./szuru-admin --help
+    user@host:szuru$ docker compose run server ./szuru-admin --help
    ```

    will give you a breakdown on all available commands.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,9 +1,7 @@
 ## Example Docker Compose configuration
 ##
-## Use this as a template to set up docker-compose, or as guide to set up other
+## Use this as a template to set up docker compose, or as guide to set up other
 ## orchestration services
-version: '2'
-
 services:

  server:
--- a/server/Dockerfile
+++ b/server/Dockerfile
@ -23,15 +23,15 @@ RUN apk --no-cache add \
        py3-pillow \
        py3-pynacl \
        py3-tz \
-        py3-pyrfc3339 \
- && pip3 install --no-cache-dir --disable-pip-version-check \
+        py3-pyrfc3339
+RUN pip3 install --no-cache-dir --disable-pip-version-check \
        "alembic>=0.8.5" \
        "coloredlogs==5.0" \
        "pyheif==0.6.1" \
        "heif-image-plugin>=0.3.2" \
-        youtube_dl \
-        "pillow-avif-plugin>=1.1.0" \
- && apk --no-cache del py3-pip
+        yt-dlp \
+        "pillow-avif-plugin~=1.1.0"
+RUN apk --no-cache del py3-pip

 COPY ./ /opt/app/
 RUN rm -rf /opt/app/szurubooru/tests
--- a/server/requirements.txt
+++ b/server/requirements.txt
@ -3,7 +3,7 @@ certifi>=2017.11.5
 coloredlogs==5.0
 heif-image-plugin==0.3.2
 numpy>=1.8.2
-pillow-avif-plugin>=1.1.0
+pillow-avif-plugin~=1.1.0
 pillow>=4.3.0
 psycopg2-binary>=2.6.1
 pyheif==0.6.1
@ -12,4 +12,4 @@ pyRFC3339>=1.0
 pytz>=2018.3
 pyyaml>=3.11
 SQLAlchemy>=1.0.12, <1.4
-youtube_dl
+yt-dlp
--- a/server/szurubooru/api/post_api.py
+++ b/server/szurubooru/api/post_api.py
@ -161,7 +161,9 @@ def update_post(ctx: rest.Context, params: Dict[str, str]) -> rest.Response:
        posts.update_post_notes(post, ctx.get_param_as_list("notes"))
    if ctx.has_param("flags"):
        auth.verify_privilege(ctx.user, "posts:edit:flags")
-        posts.update_post_flags(post, ctx.get_param_as_string_list("flags"))
+        posts.update_post_flags(post, ctx.get_param_as_string_list("flags"), remove=True)
+    else:
+        posts.update_post_flags(post, post.flags, remove=True)
    if ctx.has_file("thumbnail"):
        auth.verify_privilege(ctx.user, "posts:edit:thumbnail")
        posts.update_post_thumbnail(post, ctx.get_file("thumbnail"))
--- a/server/szurubooru/config.py
+++ b/server/szurubooru/config.py
@ -21,7 +21,7 @@ def _merge(left: Dict, right: Dict) -> Dict:
    return left


-def _docker_config() -> Dict:
+def _container_config() -> Dict:
    if "TEST_ENVIRONMENT" not in os.environ:
        for key in ["POSTGRES_USER", "POSTGRES_PASSWORD", "POSTGRES_HOST"]:
            if key not in os.environ:
@ -49,6 +49,15 @@ def _file_config(filename: str) -> Dict:
        return yaml.load(handle.read(), Loader=yaml.SafeLoader) or {}


+def _running_inside_container() -> bool:
+    env = os.environ.keys()
+    return (
+        os.path.exists("/.dockerenv")
+        or "KUBERNETES_SERVICE_HOST" in env
+        or "container" in env  # set by lxc/podman
+    )
+
+
 def _read_config() -> Dict:
    ret = _file_config("config.yaml.dist")
    if os.path.isfile("config.yaml"):
@ -57,8 +66,8 @@ def _read_config() -> Dict:
        logger.warning(
            "'config.yaml' should be a file, not a directory, skipping"
        )
-    if os.path.exists("/.dockerenv"):
-        ret = _merge(ret, _docker_config())
+    if _running_inside_container():
+        ret = _merge(ret, _container_config())
    return ret


--- a/server/szurubooru/func/favorites.py
+++ b/server/szurubooru/func/favorites.py
@ -30,7 +30,7 @@ def has_favorited(entity: model.Base, user: model.User) -> bool:
    return _get_fav_entity(entity, user) is not None


-def unset_favorite(entity: model.Base, user: Optional[model.User]) -> None:
+def unset_favorite(entity: model.Base, user: model.User) -> None:
    assert entity
    assert user
    fav_entity = _get_fav_entity(entity, user)
@ -38,7 +38,7 @@ def unset_favorite(entity: model.Base, user: Optional[model.User]) -> None:
        db.session.delete(fav_entity)


-def set_favorite(entity: model.Base, user: Optional[model.User]) -> None:
+def set_favorite(entity: model.Base, user: model.User) -> None:
    from szurubooru.func import scores

    assert entity
--- a/server/szurubooru/func/net.py
+++ b/server/szurubooru/func/net.py
@ -64,7 +64,7 @@ def download(url: str, use_video_downloader: bool = False) -> bytes:


 def _get_youtube_dl_content_url(url: str) -> str:
-    cmd = ["youtube-dl", "--format", "best", "--no-playlist"]
+    cmd = ["yt-dlp", "--format", "best", "--no-playlist"]
    if config.config["user_agent"]:
        cmd.extend(["--user-agent", config.config["user_agent"]])
    cmd.extend(["--get-url", url])
--- a/server/szurubooru/func/posts.py
+++ b/server/szurubooru/func/posts.py
@ -94,6 +94,7 @@ TYPE_MAP = {
 FLAG_MAP = {
    model.Post.FLAG_LOOP: "loop",
    model.Post.FLAG_SOUND: "sound",
+    model.Post.FLAG_TAGME: "tagme",
 }


@ -264,8 +265,8 @@ class PostSerializer(serialization.BaseSerializer):
            {
                post["id"]: post
                for post in [
-                    serialize_micro_post(rel, self.auth_user)
-                    for rel in self.post.relations
+                    serialize_micro_post(try_get_post_by_id(rel.child_id), self.auth_user)
+                    for rel in get_post_relations(self.post.post_id)
                ]
            }.values(),
            key=lambda post: post["id"],
@ -281,16 +282,14 @@ class PostSerializer(serialization.BaseSerializer):
        return scores.get_score(self.post, self.auth_user)

    def serialize_own_favorite(self) -> Any:
-        return (
-            len(
-                [
-                    user
-                    for user in self.post.favorited_by
-                    if user.user_id == self.auth_user.user_id
-                ]
-            )
-            > 0
-        )
+        if self.auth_user.user_id is None:
+            return False
+
+        for user in self.post.favorited_by:
+            if user.user_id == self.auth_user.user_id:
+                return True
+
+        return False

    def serialize_tag_count(self) -> Any:
        return self.post.tag_count
@ -365,6 +364,10 @@ def get_post_count() -> int:
    return db.session.query(sa.func.count(model.Post.post_id)).one()[0]


+def get_post_relations(post_id: int) -> List[model.Post]:
+    return db.session.query(model.PostRelation).filter(model.PostRelation.parent_id == post_id).all()
+
+
 def try_get_post_by_id(post_id: int) -> Optional[model.Post]:
    return (
        db.session.query(model.Post)
@ -537,6 +540,7 @@ def get_default_flags(content: bytes) -> List[str]:
    elif mime.is_video(mime.get_mime_type(content)):
        if images.Image(content).check_for_sound():
            ret.append(model.Post.FLAG_SOUND)
+    ret.append(model.Post.FLAG_TAGME)
    return ret


@ -781,10 +785,12 @@ def update_post_notes(post: model.Post, notes: Any) -> None:
        )


-def update_post_flags(post: model.Post, flags: List[str]) -> None:
+def update_post_flags(post: model.Post, flags: List[str], remove: bool = False) -> None:
    assert post
    target_flags = []
    for flag in flags:
+        if remove and flag == model.Post.FLAG_TAGME:
+            continue
        flag = util.flip(FLAG_MAP).get(flag, None)
        if not flag:
            raise InvalidPostFlagError(
--- a/server/szurubooru/func/snapshots.py
+++ b/server/szurubooru/func/snapshots.py
@ -4,7 +4,7 @@ from typing import Any, Callable, Dict, Optional
 import sqlalchemy as sa

 from szurubooru import db, model
-from szurubooru.func import diff, net, users
+from szurubooru.func import diff, net, users, posts


 def get_tag_category_snapshot(category: model.TagCategory) -> Dict[str, Any]:
@ -53,7 +53,7 @@ def get_post_snapshot(post: model.Post) -> Dict[str, Any]:
        "flags": post.flags,
        "featured": post.is_featured,
        "tags": sorted([tag.first_name for tag in post.tags]),
-        "relations": sorted([rel.post_id for rel in post.relations]),
+        "relations": sorted([rel.child_id for rel in posts.get_post_relations(post.post_id)]),
        "notes": sorted(
            [
                {
--- a/server/szurubooru/model/post.py
+++ b/server/szurubooru/model/post.py
@ -197,6 +197,7 @@ class Post(Base):

    FLAG_LOOP = "loop"
    FLAG_SOUND = "sound"
+    FLAG_TAGME = "tagme"

    # basic meta
    post_id = sa.Column("id", sa.Integer, primary_key=True)
--- a/server/szurubooru/search/configs/post_search_config.py
+++ b/server/szurubooru/search/configs/post_search_config.py
@ -47,6 +47,7 @@ def _flag_transformer(value: str) -> str:
    available_values = {
        "loop": model.Post.FLAG_LOOP,
        "sound": model.Post.FLAG_SOUND,
+        "tagme": model.Post.FLAG_TAGME,
    }
    return "%" + search_util.enum_transformer(available_values, value) + "%"

@ -126,6 +127,34 @@ def _pool_filter(
    )(query, criterion, negated)


+def _category_filter(
+    query: SaQuery, criterion: Optional[criteria.BaseCriterion], negated: bool
+) -> SaQuery:
+    assert criterion
+
+    # Step 1. find the id for the category
+    q1 = db.session.query(model.TagCategory.tag_category_id).filter(
+        model.TagCategory.name == criterion.value
+    )
+
+    # Step 2. find the tags with that category
+    q2 = db.session.query(model.Tag.tag_id).filter(
+        model.Tag.category_id.in_(q1)
+    )
+
+    # Step 3. find all posts that have at least one of those tags
+    q3 = db.session.query(model.PostTag.post_id).filter(
+        model.PostTag.tag_id.in_(q2)
+    )
+
+    # Step 4. profit
+    expr = model.Post.post_id.in_(q3)
+    if negated:
+        expr = ~expr
+
+    return query.filter(expr)
+
+
 class PostSearchConfig(BaseSearchConfig):
    def __init__(self) -> None:
        self.user = None  # type: Optional[model.User]
@ -353,6 +382,7 @@ class PostSearchConfig(BaseSearchConfig):
                    ),
                ),
                (["pool"], _pool_filter),
+                (["category"], _category_filter),
            ]
        )

--- a/server/szurubooru/tests/search/configs/test_post_search_config.py
+++ b/server/szurubooru/tests/search/configs/test_post_search_config.py
@ -863,3 +863,55 @@ def test_tumbleweed(
    db.session.flush()
    verify_unpaged("special:tumbleweed", [4])
    verify_unpaged("-special:tumbleweed", [1, 2, 3])
+
+
+@pytest.mark.parametrize(
+    "input,expected_post_ids",
+    [
+        ("category:cat1", [1, 2, 3]),
+        ("category:cat2", [3, 4]),
+    ],
+)
+def test_search_by_tag_category(
+    verify_unpaged,
+    post_factory,
+    tag_factory,
+    tag_category_factory,
+    input,
+    expected_post_ids,
+):
+    cat1 = tag_category_factory(name="cat1")
+    cat2 = tag_category_factory(name="cat2")
+    tag1 = tag_factory(names=["t1"], category=cat1)
+    tag2 = tag_factory(names=["t2"], category=cat1)
+    tag3 = tag_factory(names=["t3"], category=cat2)
+
+    post1 = post_factory(id=1)
+    post1.tags.append(tag1)
+
+    post2 = post_factory(id=2)
+    post2.tags.append(tag2)
+
+    post3 = post_factory(id=3)
+    post3.tags.append(tag1)
+    post3.tags.append(tag3)
+
+    post4 = post_factory(id=4)
+    post4.tags.append(tag3)
+
+    post5 = post_factory(id=5)
+
+    db.session.add_all(
+        [
+            tag1,
+            tag2,
+            tag3,
+            post1,
+            post2,
+            post3,
+            post4,
+            post5,
+        ]
+    )
+    db.session.flush()
+    verify_unpaged(input, expected_post_ids)
Author	SHA1	Message	Date
Eva	0505c11dd9	Merge `8582267038` into `376f687c38`	2025-04-01 08:12:41 +00:00
Eva	8582267038	server: add tagme flag on upload, clear on edit To easily filter through posts that haven't been retagged since initial upload.	2025-04-01 10:12:35 +02:00
Eva	70d29da933	client/api: do a single info api call Initial calls to api.fetchConfig() in quick succession would launch multiple requests. This should be implemented in Info tbh not outside of it.	2025-04-01 10:12:35 +02:00
Eva	362a86712a	server/posts: optimized query for fetching post relations This was taking multiple seconds, now it's <200ms for the whole /post/ api request. Updating relations is still slow, but that doesn't impact user experience.	2025-04-01 09:35:46 +02:00
Eva	f12e28855b	client: update stylus for :has support	2025-04-01 07:30:55 +02:00
dreamer	e21cd61919	client/tags: quicker access to the tagged posts Based on #656, plus escaping.	2025-04-01 05:14:18 +02:00
Eva	223bc9674a	server/posts: early return in own favorite serialization	2025-04-01 04:18:21 +02:00
Eva	04f4558a3b	server/favorites: fix typing user can never be None, we do an assert here and everywhere else this function is called.	2025-04-01 03:42:40 +02:00
Phil	376f687c38	chore: questionable is not a recognized rating	2025-02-11 21:50:27 +01:00
neobooru	4fd848abf2	doc: use docker compose instead of docker-compose The minimum version requirements are rough guesses, in practice any decently modern docker installation should work.	2025-02-11 21:25:10 +01:00
anbosuki	61b9f81e39	Fixed the google search option in the post details view	2024-11-17 16:48:24 +01:00
Zak B. Elep	b721865931	server/config: generalize container support Allow running in Kubernetes, podman, and LXC, besides plain docker-compose, without having to fake out /.dockerenv in non-Docker environments.	2024-11-10 15:44:39 +01:00
Neo	46e3295003	Upload from clipboard (#414 ) client/upload: upload from clipboard Co-authored-by: Eva <evauwu@riseup.net>	2024-09-29 14:54:53 +02:00
Zak B. Elep	031131506e	client/css: fix comment word-break `break-all` makes it hard to read actual comments.	2024-09-29 13:48:06 +02:00
Neo	d102578b54	Merge pull request #647 from po5/null-checks client: add null checks	2024-04-27 21:23:16 +02:00
Neo	6edb25d87b	Merge pull request #641 from po5/mobile Mobile improvements	2024-04-26 22:56:58 +02:00
Neo	93fc15f2a4	Merge pull request #642 from po5/better-links	2024-04-26 22:37:54 +02:00
Neo	4f9d46e1c2	Merge branch 'master' into better-links	2024-04-26 22:16:37 +02:00
Eva	b72e81850d	client: add null checks	2024-03-28 13:31:48 +01:00
Eva	c1c695f082	client/css: stack bulk tagging toggles horizontally on mobile	2024-03-21 22:26:49 +01:00
Eva	4b6b231fc8	client/posts: reorder elements in mobile layout Navigation is always right below the image, and comments are always at the very bottom, to minimize scrolling for common actions.	2024-03-21 22:26:28 +01:00
Eva	6b0c3cfc7f	client/html: allow mobile browsers to zoom in	2024-03-21 22:23:45 +01:00
Eva	4ec8cb3ba2	client/css: constrain thumbnails to parent to prevent overextended links	2024-03-21 22:19:46 +01:00
Eva	8d971234a2	client/views: better pool name fallback	2024-03-21 22:16:05 +01:00
Eva	a16bb198ab	client/views: more thorough link fallbacks Prevents a bunch of errors that can happen when a resource is deleted.	2024-03-21 21:53:11 +01:00
Eva	3f182a66ad	client/posts: fix overextended tag link	2024-03-21 21:52:52 +01:00
Eva	b52363e82d	client/posts: fix overextended download link	2024-03-21 21:52:49 +01:00
Eva	3bf45e4c0a	client/users: fix overextended avatar links	2024-03-21 21:52:39 +01:00
hujle	5596f53744	posts page ugly horizontal bar fix fixes ugly horizontal scrollbar appearing when a post with extremely wide image is present in the posts list	2024-02-29 20:56:27 +01:00
neobooru	da425afc49	Pin pillow-avif-plugin to compatible version range	2024-02-21 17:47:27 +01:00
Xnoe	d7394d672f	Fix Pool Search	2024-02-21 01:27:00 +01:00
neobooru	190d795426	doc: fix small error in pool API docs	2023-12-05 21:31:23 +01:00
ewof	7c92ceaf6a	fix overflow on comments, prevents ugly unnecesary horizontal scroll	2023-11-05 12:27:03 +01:00
Neo	9e00f37464	Merge pull request #597 from zakame/use-yt-dlp server/net: use yt-dlp instead of youtube-dl	2023-11-05 12:22:03 +01:00
Zak B. Elep	59c497e168	doc: update for yt-dlp	2023-08-17 20:58:09 +08:00
Zak B. Elep	c292b96f06	server/net: use yt-dlp instead of youtube-dl youtube-dl no longer even gets URLs properly, so switch to yt-dlp as a drop-in replacement for it.	2023-08-17 20:41:50 +08:00
neobooru	7a82e9d581	tests/server: post category filter	2023-07-05 12:22:11 +00:00
neobooru	4806bbe0ed	server: post category filter	2023-07-05 12:22:11 +00:00
Yochyo	c2fdc2d070	docs (tag categories): order is required when creating tag category	2023-06-26 20:49:48 +02:00
Yochyo	ffdf115714	docs (api): change micro post attribute name to id	2023-06-26 20:49:48 +02:00