core: better blacklist

packages/ui-default/backendlib/template.js

@@ -57,7 +57,7 @@ const replacer = (k, v) => {
 class Nunjucks extends nunjucks.Environment {
   constructor() {
     super(new Loader(), { autoescape: true, trimBlocks: true });
-    this.addFilter('json', (self) => JSON.stringify(self, replacer));
+    this.addFilter('json', (self) => (self ? JSON.stringify(self, replacer) : ''));
     this.addFilter('parseYaml', (self) => yaml.load(self));
     this.addFilter('dumpYaml', (self) => yaml.dump(self));
     this.addFilter('serialize', (self, ignoreFunction = true) => serialize(self, { ignoreFunction }));

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.17.6",
+  "version": "4.17.7",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",

packages/ui-default/templates/layout/basic.html

@@ -1,14 +1,14 @@
 {% set layout_name = "basic" %}
 {% extends "layout/html5.html" %}
 {% block body %}
-{% include "partials/nav.html" %}
+{% if UserContext %}{% include "partials/nav.html" %}{% endif %}
 <div class="slideout-panel" id="panel">
   <div class="slideout-overlay"></div>
-  {% include "partials/header_mobile.html" %}
+  {% if UserContext %}{% include "partials/header_mobile.html" %}{% endif %}
   <div class="main">
     {% block content %}{% endblock %}
   </div>
   {% include "partials/footer.html" %}
 </div>
-{% include "partials/login_dialog.html" %}
+{% if UserContext %}{% include "partials/login_dialog.html" %}{% endif %}
 {% endblock %}

packages/ui-default/templates/layout/html5.html

@@ -25,9 +25,9 @@
   <meta property="og:image" content="{{ static_url('favicon-96x96.png') }}" />
   {% endblock %}
   {% if not isIE(handler.request.headers['user-agent']) %}
-    <script src="{{ static_url(handler.user.theme|default('default') + '.theme.js') }}"></script>
+    <script src="{{ static_url((handler.user|default({})).theme|default('default') + '.theme.js') }}"></script>
   {% endif %}
-  <link rel="stylesheet" media="all" href="{{ static_url(handler.user.theme|default('default') + '.theme.css') }}">
+  <link rel="stylesheet" media="all" href="{{ static_url((handler.user|default({})).theme|default('default') + '.theme.css') }}">
   <link rel="stylesheet" media="all" href="{{ url('ui_extracss') }}">
   <title>{{ handler.renderTitle(page_name) }}</title>
   {% if not isIE(handler.request.headers['user-agent']) %}