build(deps-dev): bump browserify-sign from 4.0.4 to 4.2.2 in /client

Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.0.4 to 4.2.2. - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.0.4...v4.2.2) --- updated-dependencies: - dependency-name: browserify-sign dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
2025-07-17 08:26:24 +00:00 · 2023-10-26 21:16:03 +00:00
33 changed files with 253 additions and 357 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 [yt-dlp](https://github.com/yt-dlp/yt-dlp)
+- Ability to retrieve web video content using [youtube-dl](https://github.com/ytdl-org/youtube-dl)
 - 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
@ -127,10 +127,6 @@ $comment-border-color = #DDD
            color: mix($main-color, $inactive-link-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
@ -300,10 +300,10 @@ a .access-key
        background-size: 20px 20px
    img
        opacity: 0
-        width: 100%
+        width: auto
        height: 100%
    video
-        width: 100%
+        width: auto
        height: 100%

 .flexbox-dummy
--- a/client/css/post-list-view.styl
+++ b/client/css/post-list-view.styl
@ -187,9 +187,6 @@
            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,42 +15,38 @@
            border: 0
            outline: 0

-    >.sidebar>nav.buttons, >.content nav.buttons
-        margin-top: 0
-        display: flex
-        flex-wrap: wrap
-        article
-            flex: 1 0 33%
-            a
-                display: inline-block
-                width: 100%
-                padding: 0.3em 0
+        nav.buttons
+            margin-top: 0
+            display: flex
+            flex-wrap: wrap
+            article
+                flex: 1 0 33%
+                a
+                    display: inline-block
+                    width: 100%
+                    padding: 0.3em 0
+                    text-align: center
+                    vertical-align: middle
+                    transition: background 0.2s linear, box-shadow 0.2s linear
+                    &:not(.inactive):hover
+                        background: lighten($main-color, 90%)
+                i
+                    font-size: 140%
                text-align: center
-                vertical-align: middle
-                transition: background 0.2s linear, box-shadow 0.2s linear
-                &:not(.inactive):hover
-                    background: lighten($main-color, 90%)
-            i
-                font-size: 140%
-            text-align: center
-        @media (max-width: 800px)
-            margin-top: 0.6em
-            margin-bottom: 0.6em
+            @media (max-width: 800px)
+                margin-top: 2em

    >.content
        width: 100%

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

        .post-content
            margin: 0

-    .after-mobile-controls
-        width: 100%
-
 .darktheme .post-view
-    >.sidebar, >.content
+    >.sidebar
        nav.buttons
            article
                a:not(.inactive):hover
@ -60,8 +56,6 @@
@media (max-width: 800px)
    .post-view
        flex-wrap: wrap
-        >.after-mobile-controls
-            order: 3
        >.sidebar
            order: 2
            min-width: 100%
@ -119,6 +113,7 @@
        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,11 +21,10 @@
    .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.0'>
+    <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1'/>
    <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
@ -29,7 +29,6 @@
                    <span class='vim-nav-hint'>Next post &gt;</span>
                </a>
            </article>
-            <% if (ctx.canEditPosts || ctx.canDeletePosts || ctx.canFeaturePosts) { %>
            <article class='edit-post'>
                <% if (ctx.editMode) { %>
                    <a href='<%= ctx.getPostUrl(ctx.post.id, ctx.parameters) %>'>
@ -37,13 +36,16 @@
                        <span class='vim-nav-hint'>Back to view mode</span>
                    </a>
                <% } else { %>
-                    <a href='<%= ctx.getPostEditUrl(ctx.post.id, ctx.parameters) %>'>
-                    <i class='fa fa-pencil'></i>
-                    <span class='vim-nav-hint'>Edit post</span>
+                    <% if (ctx.canEditPosts || ctx.canDeletePosts || ctx.canFeaturePosts) { %>
+                        <a href='<%= ctx.getPostEditUrl(ctx.post.id, ctx.parameters) %>'>
+                    <% } else { %>
+                        <a class='inactive'>
+                    <% } %>
+                        <i class='fa fa-pencil'></i>
+                        <span class='vim-nav-hint'>Edit post</span>
                    </a>
                <% } %>
            </article>
-            <% } %>
        </nav>

        <div class='sidebar-container'></div>
@ -52,15 +54,13 @@
    <div class='content'>
        <div class='post-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>
+        <% } %>

-            <% if (ctx.canListComments) { %>
-                <div class='comments-container'></div>
-            <% } %>
-        </div>
+        <% if (ctx.canCreateComments) { %>
+            <h2>Add comment</h2>
+            <div class='comment-form-container'></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://lens.google.com/uploadbyurl?url=<%- encodeURIComponent(ctx.post.fullContentUrl) %>'>Google Images</a>
+            <a href='https://www.google.com/searchbyimage?&image_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]) %><!--
+                            --><%- ctx.getPrettyName(tag.names[0]) %>&#32;<!--
                        --><% 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,6 +16,7 @@
        %><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/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 && e.detail.names !== null) {
+        if (e.detail.names !== undefined) {
            e.detail.pool.names = e.detail.names;
        }
-        if (e.detail.category !== undefined && e.detail.category !== null) {
+        if (e.detail.category !== undefined) {
            e.detail.pool.category = e.detail.category;
        }
-        if (e.detail.description !== undefined && e.detail.description !== null) {
+        if (e.detail.description !== undefined) {
            e.detail.pool.description = e.detail.description;
        }
-        if (e.detail.posts !== undefined && e.detail.posts !== null) {
+        if (e.detail.posts !== undefined) {
            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,8 +43,6 @@ 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 && e.detail.safety !== null) {
+        if (e.detail.safety !== undefined) {
            post.safety = e.detail.safety;
        }
-        if (e.detail.flags !== undefined && e.detail.flags !== null) {
+        if (e.detail.flags !== undefined) {
            post.flags = e.detail.flags;
        }
-        if (e.detail.relations !== undefined && e.detail.relations !== null) {
+        if (e.detail.relations !== undefined) {
            post.relations = e.detail.relations;
        }
-        if (e.detail.content !== undefined && e.detail.content !== null) {
+        if (e.detail.content !== undefined) {
            post.newContent = e.detail.content;
        }
-        if (e.detail.thumbnail !== undefined && e.detail.thumbnail !== null) {
+        if (e.detail.thumbnail !== undefined) {
            post.newThumbnail = e.detail.thumbnail;
        }
-        if (e.detail.source !== undefined && e.detail.source !== null) {
+        if (e.detail.source !== undefined) {
            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 && e.detail.names !== null) {
+        if (e.detail.names !== undefined) {
            e.detail.tag.names = e.detail.names;
        }
-        if (e.detail.category !== undefined && e.detail.category !== null) {
+        if (e.detail.category !== undefined) {
            e.detail.tag.category = e.detail.category;
        }
-        if (e.detail.description !== undefined && e.detail.description !== null) {
+        if (e.detail.description !== undefined) {
            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 && e.detail.name !== null) {
+        if (e.detail.name !== undefined) {
            e.detail.user.name = e.detail.name;
        }
-        if (e.detail.email !== undefined && e.detail.email !== null) {
+        if (e.detail.email !== undefined) {
            e.detail.user.email = e.detail.email;
        }
-        if (e.detail.rank !== undefined && e.detail.rank !== null) {
+        if (e.detail.rank !== undefined) {
            e.detail.user.rank = e.detail.rank;
        }

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

-        if (e.detail.avatarStyle !== undefined && e.detail.avatarStyle !== null) {
+        if (e.detail.avatarStyle !== undefined) {
            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 && e.detail.note !== null) {
+        if (e.detail.note !== undefined) {
            e.detail.userToken.note = e.detail.note;
        }

--- a/client/js/controls/file_dropper_control.js
+++ b/client/js/controls/file_dropper_control.js
@ -48,12 +48,6 @@ 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) =>
@ -61,11 +55,6 @@ 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);
    }
@ -140,17 +129,6 @@ 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,30 +103,6 @@ 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
@ -427,7 +427,7 @@ class PostEditSidebarControl extends events.EventTarget {
                        : undefined,

                    thumbnail:
-                        this._newPostThumbnail !== undefined && this._newPostThumbnail !== null
+                        this._newPostThumbnail !== undefined
                            ? 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 && this._newThumbnail !== null) {
+        if (this._newThumbnail !== undefined) {
            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 ? tag.category : "unknown";
+    const category = tag ? tag.category : "unknown";
    let text = misc.getPrettyName(name);
    if (includeHash === true) {
        text = "#" + text;
    }
    if (includeCount === true) {
-        text += " (" + (tag && tag.postCount ? tag.postCount : 0) + ")";
+        text += " (" + (tag ? 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 ? pool.category : "unknown";
+    const category = pool ? pool.category : "unknown";
    let text = misc.getPrettyName(
-        name ? name : pool && pool.names ? pool.names[0] : "pool " + id
+        name ? name : pool ? pool.names[0] : "unknown"
    );
    if (includeHash === true) {
        text = "#" + text;
    }
    if (includeCount === true) {
-        text += " (" + (pool && pool.postCount ? pool.postCount : 0) + ")";
+        text += " (" + (pool ? pool.postCount : 0) + ")";
    }
    return api.hasPrivilege("pools:view")
        ? makeElement(
@ -264,7 +264,7 @@ function makeUserLink(user) {
    let text = makeThumbnail(user ? user.avatarUrl : null);
    text += user && user.name ? misc.escapeHtml(user.name) : "Anonymous";
    const link =
-        user && user.name && api.hasPrivilege("users:view")
+        user && api.hasPrivilege("users:view")
            ? makeElement(
                  "a",
                  { href: uri.formatClientLink("user", user.name) },
--- a/client/package-lock.json
+++ b/client/package-lock.json
@ -477,14 +477,15 @@
      }
    },
    "node_modules/asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
      "dev": true,
      "dependencies": {
        "bn.js": "^4.0.0",
        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
      }
    },
    "node_modules/assert": {
@ -1404,30 +1405,87 @@
      }
    },
    "node_modules/browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
      "dev": true,
      "dependencies": {
-        "bn.js": "^4.1.0",
+        "bn.js": "^5.0.0",
        "randombytes": "^2.0.1"
      }
    },
+    "node_modules/browserify-rsa/node_modules/bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+      "dev": true
+    },
    "node_modules/browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
      "dev": true,
      "dependencies": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.4",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 4"
      }
    },
+    "node_modules/browserify-sign/node_modules/bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+      "dev": true
+    },
+    "node_modules/browserify-sign/node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
    "node_modules/browserify-zlib": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
@ -3305,16 +3363,16 @@
      }
    },
    "node_modules/parse-asn1": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
      "dev": true,
      "dependencies": {
-        "asn1.js": "^4.0.0",
+        "asn1.js": "^5.2.0",
        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3"
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
      }
    },
    "node_modules/parse-bmfont-ascii": {
@ -5031,14 +5089,15 @@
      }
    },
    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
      "dev": true,
      "requires": {
        "bn.js": "^4.0.0",
        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
      }
    },
    "assert": {
@ -5940,28 +5999,69 @@
      }
    },
    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
      "dev": true,
      "requires": {
-        "bn.js": "^4.1.0",
+        "bn.js": "^5.0.0",
        "randombytes": "^2.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+          "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+          "dev": true
+        }
      }
    },
    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
      "dev": true,
      "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.4",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+          "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+          "dev": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
      }
    },
    "browserify-zlib": {
@ -7513,16 +7613,16 @@
      }
    },
    "parse-asn1": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
      "dev": true,
      "requires": {
-        "asn1.js": "^4.0.0",
+        "asn1.js": "^5.2.0",
        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3"
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
      }
    },
    "parse-bmfont-ascii": {
--- 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-pools)
+        - [Listing pools](#listing-pool)
        - [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 [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
+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

 Finally, in some cases the user might want to reuse one file between the
 requests to save the bandwidth (for example, reverse search + consecutive
@ -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 `unsafe`.                                         |
+    | `safety`             | having given safety. `<value>` can be either `safe`, `sketchy` (or `questionable`) or `unsafe`.                                         |
    | `rating`             | alias of `safety`                                                                                                                       |

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

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

 - **Input**

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

 ### Prepare things

@ -38,7 +38,7 @@ and the Docker Compose CLI (version 1.27.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 the Docker Compose CLI (version 1.27.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 the Docker Compose CLI (version 1.27.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 the Docker Compose CLI (version 1.27.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/doc/example.env
+++ b/doc/example.env
@ -10,10 +10,6 @@ BUILD_INFO=latest
 # otherwise the port specified here will be publicly accessible
 PORT=8080

-# Uncomment PORT_SERVER variable if you did the same in docker-compose.yml
-# to make embeds work.
-# PORT_SERVER=8081
-
 # How many waitress threads to start
 # 4 is the default amount of threads. If you experience performance
 # degradation with a large number of posts, increasing this may
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,7 +1,9 @@
 ## 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:
@ -21,12 +23,8 @@ services:
      #LOG_SQL: 0 (1 for verbose SQL logs)
      THREADS:
    volumes:
-      - client:/opt/app/client:ro
      - "${MOUNT_DATA}:/data"
      - "./server/config.yaml:/opt/app/config.yaml"
-    ## Expose this port if you want embeds
-    #ports:
-    #  - "${PORT_SERVER}:6666"

  client:
    image: szurubooru/client:latest
@ -36,7 +34,6 @@ services:
      BACKEND_HOST: server
      BASE_URL:
    volumes:
-      - client:/var/www
      - "${MOUNT_DATA}:/data:ro"
    ports:
      - "${PORT}:80"
@ -49,6 +46,3 @@ services:
      POSTGRES_PASSWORD:
    volumes:
      - "${MOUNT_SQL}:/var/lib/postgresql/data"
-
-volumes:
-  client:
--- a/server/Dockerfile
+++ b/server/Dockerfile
@ -23,15 +23,15 @@ RUN apk --no-cache add \
        py3-pillow \
        py3-pynacl \
        py3-tz \
-        py3-pyrfc3339
-RUN pip3 install --no-cache-dir --disable-pip-version-check \
+        py3-pyrfc3339 \
+ && 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" \
-        yt-dlp \
-        "pillow-avif-plugin~=1.1.0"
-RUN apk --no-cache del py3-pip
+        youtube_dl \
+        "pillow-avif-plugin>=1.1.0" \
+ && apk --no-cache del py3-pip

 COPY ./ /opt/app/
 RUN rm -rf /opt/app/szurubooru/tests
--- a/server/config.yaml.dist
+++ b/server/config.yaml.dist
@ -169,19 +169,11 @@ privileges:
    'uploads:create':               regular
    'uploads:use_downloader':       power

-homepage_url: https://www.example.com/
-site_url: https://www.example.com/booru
-
-## Client folder sharing, required for embeds.
-# Docker requires you to share /var/www from the client to the server.
-client_dir: /opt/app/client
-
 ## ONLY SET THESE IF DEPLOYING OUTSIDE OF DOCKER
 #debug: 0 # generate server logs?
 #show_sql: 0 # show sql in server logs?
 #data_url: /data/
 #data_dir: /var/www/data
-#client_dir: /var/www
 ## usage: schema://user:password@host:port/database_name
 ## example: postgres://szuru:dog@localhost:5432/szuru_test
 #database:
--- 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
-yt-dlp
+youtube_dl
--- a/server/szurubooru/api/init.py
+++ b/server/szurubooru/api/init.py
@ -1,5 +1,4 @@
 import szurubooru.api.comment_api
-import szurubooru.api.embed_api
 import szurubooru.api.info_api
 import szurubooru.api.password_reset_api
 import szurubooru.api.pool_api
--- a/server/szurubooru/api/embed_api.py
+++ b/server/szurubooru/api/embed_api.py
@ -1,111 +0,0 @@
-import logging
-from pathlib import Path
-import re
-import html
-from urllib.parse import quote
-from typing import Dict, Optional
-
-from szurubooru import config, model, rest
-from szurubooru.func import (
-    auth,
-    posts,
-    serialization,
-)
-
-if (Path(config.config['client_dir']) / "index.htm").exists():
-    with open(f"{config.config['client_dir']}/index.htm") as index:
-        index_html = index.read()
-else:
-    logging.warning("Could not find index.htm needed for embeds.")
-
-def _index_path(params: Dict[str, str]) -> int:
-    try:
-        return params["path"]
-    except (TypeError, ValueError):
-        raise posts.InvalidPostIdError(
-            "Invalid post ID."
-        )
-
-
-def _get_post(post_id: int) -> model.Post:
-    return posts.get_post_by_id(post_id)
-
-
-def _get_post_id(match: re.Match) -> int:
-    post_id = match.group("post_id")
-    try:
-        return int(post_id)
-    except (TypeError, ValueError):
-        raise posts.InvalidPostIdError(
-            "Invalid post ID: %r." % post_id
-        )
-
-
-def _serialize_post(
-    ctx: rest.Context, post: Optional[model.Post]
-) -> rest.Response:
-    return posts.serialize_post(
-        post, ctx.user, options=["thumbnailUrl", "user"]
-    )
-
-
-@rest.routes.get("/oembed/?")
-def get_post(
-    ctx: rest.Context, _params: Dict[str, str] = {}, url: str = ""
-) -> rest.Response:
-    auth.verify_privilege(ctx.user, "posts:view")
-
-    url = url or ctx.get_param_as_string("url")
-    match = re.match(r".*?/post/(?P<post_id>\d+)", url)
-    if not match:
-        raise posts.InvalidPostIdError("Invalid post ID.")
-
-    post_id = _get_post_id(match)
-    post = _get_post(post_id)
-    serialized = _serialize_post(ctx, post)
-    embed = {
-        "version": "1.0",
-        "type": "photo",
-        "title": f"{config.config['name']} – Post #{post_id}",
-        "author_name": serialized["user"]["name"] if serialized["user"] else None,
-        "provider_name": config.config["name"],
-        "provider_url": config.config["homepage_url"],
-        "thumbnail_url": f"{config.config['site_url']}/{serialized['thumbnailUrl']}",
-        "thumbnail_width": int(config.config["thumbnails"]["post_width"]),
-        "thumbnail_height": int(config.config["thumbnails"]["post_height"]),
-        "url": f"{config.config['site_url']}/{serialized['thumbnailUrl']}",
-        "width": int(config.config["thumbnails"]["post_width"]),
-        "height": int(config.config["thumbnails"]["post_height"])
-    }
-    return embed
-
-
-@rest.routes.get("/index(?P<path>/.+)")
-def post_index(ctx: rest.Context, params: Dict[str, str]) -> rest.Response:
-    path = _index_path(params)
-
-    if not index_html:
-        logging.info("Embed was requested but index.htm file does not exist. Redirecting to 404.")
-        return {"return_type": "custom", "status_code": "404", "content": [("content-type", "text/html")]}
-
-    try:
-        oembed = get_post(ctx, {}, path)
-    except posts.PostNotFoundError:
-        return {"return_type": "custom", "status_code": "404", "content": index_html}
-
-    url = config.config["site_url"] + path
-    new_html = index_html.replace("</head>", f'''
-<meta property="og:site_name" content="{config.config["name"]}">
-<meta property="og:url" content="{html.escape(url)}">
-<meta property="og:type" content="article">
-<meta property="og:title" content="{html.escape(oembed['title'])}">
-<meta name="twitter:title" content="{html.escape(oembed['title'])}">
-<meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:image" content="{html.escape(oembed['url'])}">
-<meta property="og:image:url" content="{html.escape(oembed['url'])}">
-<meta property="og:image:width" content="{oembed['width']}">
-<meta property="og:image:height" content="{oembed['height']}">
-<meta property="article:author" content="{html.escape(oembed['author_name'] or '')}">
-<link rel="alternate" type="application/json+oembed" href="{config.config["site_url"]}/api/oembed?url={quote(html.escape(url))}" title="{html.escape(config.config["name"])}"></head>
-''').replace("<html>", '<html prefix="og: http://ogp.me/ns#">').replace("<title>Loading...</title>", f"<title>{html.escape(oembed['title'])}</title>")
-    return {"return_type": "custom", "content": new_html}
--- a/server/szurubooru/config.py
+++ b/server/szurubooru/config.py
@ -21,7 +21,7 @@ def _merge(left: Dict, right: Dict) -> Dict:
    return left


-def _container_config() -> Dict:
+def _docker_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,15 +49,6 @@ 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"):
@ -66,8 +57,8 @@ def _read_config() -> Dict:
        logger.warning(
            "'config.yaml' should be a file, not a directory, skipping"
        )
-    if _running_inside_container():
-        ret = _merge(ret, _container_config())
+    if os.path.exists("/.dockerenv"):
+        ret = _merge(ret, _docker_config())
    return ret


--- 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 = ["yt-dlp", "--format", "best", "--no-playlist"]
+    cmd = ["youtube-dl", "--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/rest/app.py
+++ b/server/szurubooru/rest/app.py
@ -74,8 +74,7 @@ def application(
 ) -> Tuple[bytes]:
    try:
        ctx = _create_context(env)
-        accept_header = ctx.get_header("Accept")
-        if "*/*" not in accept_header and "application/json" not in accept_header:
+        if "application/json" not in ctx.get_header("Accept"):
            raise errors.HttpNotAcceptable(
                "ValidationError", "This API only supports JSON responses."
            )
@ -112,10 +111,6 @@ def application(
            finally:
                db.session.remove()

-            if type(response) == dict and response.get("return_type") == "custom":
-                start_response(response.get("status_code", "200"), [("content-type", "text/html")])
-                return (response.get("content", "").encode("utf-8"),)
-
            start_response("200", [("content-type", "application/json")])
            return (_dump_json(response).encode("utf-8"),)