Merge branch '5.5'

diff --cc package-lock.json
index d15d00e0879f614bfb8cd5f7ec8680cfff66754f,9874f4319df6372a06ada9986c7a1201dcf09700..3c73cda11ee646909b41f53f204898b181251019
--- 1/package-lock.json
--- 2/package-lock.json
+++ b/package-lock.json
@@@ -5,16 -5,16 +5,16 @@@
    "packages": {
      "": {
        "dependencies": {
-         "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#506f03428901de5c6e4dc0447c43a9d90237a037"
 -        "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#5ed76b3a3267dfbffdf19405822d22510ad2bc7d"
++        "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#d0139b8637e75c763701d96a722e0835c8986a37"
        },
        "devDependencies": {
-         "@typescript-eslint/eslint-plugin": "^5.44.0",
-         "@typescript-eslint/parser": "^5.44.0",
-         "eslint": "^8.28.0",
-         "eslint-config-prettier": "^8.5.0",
-         "prettier": "^2.7.1",
-         "tslib": "^2.4.1",
-         "typescript": "^4.9.3"
+         "@typescript-eslint/eslint-plugin": "^5.51.0",
+         "@typescript-eslint/parser": "^5.51.0",
+         "eslint": "^8.33.0",
+         "eslint-config-prettier": "^8.6.0",
+         "prettier": "^2.8.4",
+         "tslib": "^2.5.0",
+         "typescript": "^4.9.5"
        }
      },
      "node_modules/@eslint/eslintrc": {
@@@ -40,10 -40,10 +40,19 @@@
          "url": "https://opencollective.com/eslint"
        }
      },
++    "node_modules/@googlemaps/markerclusterer": {
++      "version": "2.0.15",
++      "resolved": "https://registry.npmjs.org/@googlemaps/markerclusterer/-/markerclusterer-2.0.15.tgz",
++      "integrity": "sha512-/I6Esi5FtyeVHsezN9Kut8zRJoqe7KkTIJXGVqpKFf6BjC7qQ1xRajLMkOz0s8XKgLevbr+KdYjuvmj+LohOGg==",
++      "dependencies": {
++        "fast-deep-equal": "^3.1.3",
++        "supercluster": "^7.1.3"
++      }
++    },
      "node_modules/@humanwhocodes/config-array": {
-       "version": "0.11.7",
-       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
-       "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
+       "version": "0.11.8",
+       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+       "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
        "dev": true,
        "dependencies": {
          "@humanwhocodes/object-schema": "^1.2.1",
@@@ -354,22 -355,21 +364,24 @@@
        }
      },
      "node_modules/@woltlab/wcf": {
 -      "version": "5.4.0",
 -      "resolved": "git+ssh://git@github.com/WoltLab/WCF.git#5ed76b3a3267dfbffdf19405822d22510ad2bc7d",
 -      "integrity": "sha512-RFdoxbASRY4VpBSZkGhI6Vovf49YR4D9bjdxweJgobf+rPAcJAXmE5idzwk3osKrUS+yH2STewzsxZ6Bpak5cQ==",
 +      "version": "6.0.0",
-       "resolved": "git+ssh://git@github.com/WoltLab/WCF.git#506f03428901de5c6e4dc0447c43a9d90237a037",
-       "integrity": "sha512-Pr59F9me26AhQbC2sII8qWrGOgnzAxRNsDIH8PwszySDqmr0balbm+BFgDRxQS8xYRJ3lfJOX7xcdIuIsjxObg==",
++      "resolved": "git+ssh://git@github.com/WoltLab/WCF.git#d0139b8637e75c763701d96a722e0835c8986a37",
++      "integrity": "sha512-pdZOdlN0pJKk8m4JwPgB+/9su/OzRVP2K53vnwuXKdxWv0igLZxphYwSUq4uicBOyzcd0qF4T8OLFxqPocfaFA==",
        "dependencies": {
++        "@googlemaps/markerclusterer": "^2.0.15",
          "@types/facebook-js-sdk": "^3.3.6",
-         "@types/google.maps": "^3.50.5",
+         "@types/google.maps": "^3.51.1",
          "@types/jquery": "^3.5.14",
          "@types/perfect-scrollbar": "^0.7.0",
          "@types/pica": "^5.1.3",
--        "@types/prismjs": "^1.16.6",
++        "@types/prismjs": "^1.26.0",
          "@types/twitter-for-web": "0.0.2",
-         "focus-trap": "^7.1.0",
 -        "focus-trap": "^6.9.4",
++        "focus-trap": "^7.2.0",
++        "html-parsed-element": "^0.4.1",
          "qr-creator": "^1.0.0",
 -        "tabbable": "^5.3.3",
 +        "reflect-metadata": "^0.1.13",
 +        "tabbable": "^6.0.1",
-         "tslib": "^2.4.1"
+         "tslib": "^2.5.0"
        }
      },
      "node_modules/acorn": {
@@@ -817,8 -817,8 +829,7 @@@
      "node_modules/fast-deep-equal": {
        "version": "3.1.3",
        "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
--      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
--      "dev": true
++      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
      },
      "node_modules/fast-glob": {
        "version": "3.2.12",
@@@ -929,11 -929,11 +940,11 @@@
        "dev": true
      },
      "node_modules/focus-trap": {
-       "version": "7.1.0",
-       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.1.0.tgz",
-       "integrity": "sha512-CuJvwUBfJCWcU6fc4xr3UwMF5vWnox4isXAixCwrPzCsPKOQjP9T+nTlYT2t+vOmQL8MOQ16eim99XhjQHAuiQ==",
 -      "version": "6.9.4",
 -      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.4.tgz",
 -      "integrity": "sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw==",
++      "version": "7.2.0",
++      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.2.0.tgz",
++      "integrity": "sha512-v4wY6HDDYvzkBy4735kW5BUEuw6Yz9ABqMYLuTNbzAFPcBOGiGHwwcNVMvUz4G0kgSYh13wa/7TG3XwTeT4O/A==",
        "dependencies": {
 -        "tabbable": "^5.3.3"
 +        "tabbable": "^6.0.1"
        }
      },
      "node_modules/fs.realpath": {
@@@ -1024,6 -1024,6 +1035,11 @@@
          "node": ">=8"
        }
      },
++    "node_modules/html-parsed-element": {
++      "version": "0.4.1",
++      "resolved": "https://registry.npmjs.org/html-parsed-element/-/html-parsed-element-0.4.1.tgz",
++      "integrity": "sha512-uRNt6oVAFAQ/PBS9JZiURMpR2Me0KR11mOG6sbamJl1PIX7qMX1h/ck2EhY11RPU4m39o9x9XvOs5KaLneaxGA=="
++    },
      "node_modules/ignore": {
        "version": "5.2.0",
        "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
@@@ -1149,6 -1149,6 +1165,11 @@@
        "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
        "dev": true
      },
++    "node_modules/kdbush": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz",
++      "integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew=="
++    },
      "node_modules/levn": {
        "version": "0.4.1",
        "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@@ -1564,6 -1559,6 +1585,14 @@@
          "url": "https://github.com/sponsors/sindresorhus"
        }
      },
++    "node_modules/supercluster": {
++      "version": "7.1.5",
++      "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz",
++      "integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==",
++      "dependencies": {
++        "kdbush": "^3.0.0"
++      }
++    },
      "node_modules/supports-color": {
        "version": "7.2.0",
        "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@@ -1738,10 -1733,10 +1767,19 @@@
          "strip-json-comments": "^3.1.1"
        }
      },
++    "@googlemaps/markerclusterer": {
++      "version": "2.0.15",
++      "resolved": "https://registry.npmjs.org/@googlemaps/markerclusterer/-/markerclusterer-2.0.15.tgz",
++      "integrity": "sha512-/I6Esi5FtyeVHsezN9Kut8zRJoqe7KkTIJXGVqpKFf6BjC7qQ1xRajLMkOz0s8XKgLevbr+KdYjuvmj+LohOGg==",
++      "requires": {
++        "fast-deep-equal": "^3.1.3",
++        "supercluster": "^7.1.3"
++      }
++    },
      "@humanwhocodes/config-array": {
-       "version": "0.11.7",
-       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
-       "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
+       "version": "0.11.8",
+       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+       "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
        "dev": true,
        "requires": {
          "@humanwhocodes/object-schema": "^1.2.1",
@@@ -1944,22 -1940,21 +1983,24 @@@
        }
      },
      "@woltlab/wcf": {
-       "version": "git+ssh://git@github.com/WoltLab/WCF.git#506f03428901de5c6e4dc0447c43a9d90237a037",
-       "integrity": "sha512-Pr59F9me26AhQbC2sII8qWrGOgnzAxRNsDIH8PwszySDqmr0balbm+BFgDRxQS8xYRJ3lfJOX7xcdIuIsjxObg==",
-       "from": "@woltlab/wcf@https://github.com/WoltLab/WCF.git#506f03428901de5c6e4dc0447c43a9d90237a037",
 -      "version": "git+ssh://git@github.com/WoltLab/WCF.git#5ed76b3a3267dfbffdf19405822d22510ad2bc7d",
 -      "integrity": "sha512-RFdoxbASRY4VpBSZkGhI6Vovf49YR4D9bjdxweJgobf+rPAcJAXmE5idzwk3osKrUS+yH2STewzsxZ6Bpak5cQ==",
 -      "from": "@woltlab/wcf@https://github.com/WoltLab/WCF.git#5ed76b3a3267dfbffdf19405822d22510ad2bc7d",
++      "version": "git+ssh://git@github.com/WoltLab/WCF.git#d0139b8637e75c763701d96a722e0835c8986a37",
++      "integrity": "sha512-pdZOdlN0pJKk8m4JwPgB+/9su/OzRVP2K53vnwuXKdxWv0igLZxphYwSUq4uicBOyzcd0qF4T8OLFxqPocfaFA==",
++      "from": "@woltlab/wcf@https://github.com/WoltLab/WCF.git#d0139b8637e75c763701d96a722e0835c8986a37",
        "requires": {
++        "@googlemaps/markerclusterer": "^2.0.15",
          "@types/facebook-js-sdk": "^3.3.6",
-         "@types/google.maps": "^3.50.5",
+         "@types/google.maps": "^3.51.1",
          "@types/jquery": "^3.5.14",
          "@types/perfect-scrollbar": "^0.7.0",
          "@types/pica": "^5.1.3",
--        "@types/prismjs": "^1.16.6",
++        "@types/prismjs": "^1.26.0",
          "@types/twitter-for-web": "0.0.2",
-         "focus-trap": "^7.1.0",
 -        "focus-trap": "^6.9.4",
++        "focus-trap": "^7.2.0",
++        "html-parsed-element": "^0.4.1",
          "qr-creator": "^1.0.0",
 -        "tabbable": "^5.3.3",
 +        "reflect-metadata": "^0.1.13",
 +        "tabbable": "^6.0.1",
-         "tslib": "^2.4.1"
+         "tslib": "^2.5.0"
        }
      },
      "acorn": {
@@@ -2291,8 -2286,8 +2332,7 @@@
      "fast-deep-equal": {
        "version": "3.1.3",
        "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
--      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
--      "dev": true
++      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
      },
      "fast-glob": {
        "version": "3.2.12",
@@@ -2384,11 -2379,11 +2424,11 @@@
        "dev": true
      },
      "focus-trap": {
-       "version": "7.1.0",
-       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.1.0.tgz",
-       "integrity": "sha512-CuJvwUBfJCWcU6fc4xr3UwMF5vWnox4isXAixCwrPzCsPKOQjP9T+nTlYT2t+vOmQL8MOQ16eim99XhjQHAuiQ==",
 -      "version": "6.9.4",
 -      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.4.tgz",
 -      "integrity": "sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw==",
++      "version": "7.2.0",
++      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.2.0.tgz",
++      "integrity": "sha512-v4wY6HDDYvzkBy4735kW5BUEuw6Yz9ABqMYLuTNbzAFPcBOGiGHwwcNVMvUz4G0kgSYh13wa/7TG3XwTeT4O/A==",
        "requires": {
 -        "tabbable": "^5.3.3"
 +        "tabbable": "^6.0.1"
        }
      },
      "fs.realpath": {
@@@ -2455,6 -2450,6 +2495,11 @@@
        "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
        "dev": true
      },
++    "html-parsed-element": {
++      "version": "0.4.1",
++      "resolved": "https://registry.npmjs.org/html-parsed-element/-/html-parsed-element-0.4.1.tgz",
++      "integrity": "sha512-uRNt6oVAFAQ/PBS9JZiURMpR2Me0KR11mOG6sbamJl1PIX7qMX1h/ck2EhY11RPU4m39o9x9XvOs5KaLneaxGA=="
++    },
      "ignore": {
        "version": "5.2.0",
        "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
@@@ -2553,6 -2548,6 +2598,11 @@@
        "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
        "dev": true
      },
++    "kdbush": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz",
++      "integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew=="
++    },
      "levn": {
        "version": "0.4.1",
        "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@@ -2825,6 -2815,6 +2875,14 @@@
        "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
        "dev": true
      },
++    "supercluster": {
++      "version": "7.1.5",
++      "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz",
++      "integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==",
++      "requires": {
++        "kdbush": "^3.0.0"
++      }
++    },
      "supports-color": {
        "version": "7.2.0",
        "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",

diff --cc package.json
index bf2c798dcdc97820568b7ae97a2440e27c78600a,6dce65ef7c5d759fa876639d1809a693f10885bb..e2285185efb646018a0710f0846298309790b96a
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -1,14 -1,14 +1,14 @@@
  {
    "devDependencies": {
-     "@typescript-eslint/eslint-plugin": "^5.44.0",
-     "@typescript-eslint/parser": "^5.44.0",
-     "eslint": "^8.28.0",
-     "eslint-config-prettier": "^8.5.0",
-     "prettier": "^2.7.1",
-     "tslib": "^2.4.1",
-     "typescript": "^4.9.3"
+     "@typescript-eslint/eslint-plugin": "^5.51.0",
+     "@typescript-eslint/parser": "^5.51.0",
+     "eslint": "^8.33.0",
+     "eslint-config-prettier": "^8.6.0",
+     "prettier": "^2.8.4",
+     "tslib": "^2.5.0",
+     "typescript": "^4.9.5"
    },
    "dependencies": {
-     "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#506f03428901de5c6e4dc0447c43a9d90237a037"
 -    "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#5ed76b3a3267dfbffdf19405822d22510ad2bc7d"
++    "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#d0139b8637e75c763701d96a722e0835c8986a37"
    }
  }