Merge remote-tracking branch 'origin/master' into hunternif

# Conflicts:
#	client/css/post-content-control.styl
#	client/css/post-list-view.styl
#	client/html/post_edit_sidebar.tpl
#	client/js/controllers/post_list_controller.js
#	client/js/controllers/post_main_controller.js
#	client/js/controllers/post_upload_controller.js
#	client/js/controllers/tag_controller.js
#	client/js/controllers/user_list_controller.js
#	client/js/controls/expander_control.js
#	client/js/controls/post_content_control.js
#	client/js/controls/post_edit_sidebar_control.js
#	client/js/controls/post_readonly_sidebar_control.js
#	client/js/controls/tag_input_control.js
#	client/js/main.js
#	client/js/models/abstract_list.js
#	client/js/models/post.js
#	client/js/models/post_list.js
#	client/js/models/settings.js
#	client/js/models/tag.js
#	client/js/models/tag_list.js
#	client/js/tags.js
#	client/js/util/search.js
#	client/js/util/touch.js
#	client/js/util/uri.js
#	client/js/util/views.js
#	client/js/views/post_main_view.js
#	client/js/views/post_upload_view.js
#	client/js/views/posts_header_view.js
#	client/js/views/posts_page_view.js
#	client/js/views/settings_view.js
#	client/js/views/tag_view.js
#	client/package-lock.json
#	client/package.json
#	server/config.yaml.dist
#	server/szurubooru/api/__init__.py
#	server/szurubooru/api/post_api.py
#	server/szurubooru/api/tag_api.py
#	server/szurubooru/func/posts.py
#	server/szurubooru/func/tags.py
#	server/szurubooru/model/__init__.py
#	server/szurubooru/model/post.py
#	server/szurubooru/model/tag.py
#	server/szurubooru/search/configs/__init__.py
#	server/szurubooru/search/configs/post_search_config.py
#	server/szurubooru/search/executor.py
#	server/szurubooru/tests/api/test_post_retrieving.py
#	server/szurubooru/tests/api/test_post_updating.py
#	server/szurubooru/tests/api/test_tag_updating.py
#	server/szurubooru/tests/conftest.py
#	server/szurubooru/tests/func/test_posts.py
#	server/szurubooru/tests/func/test_tags.py
#	server/szurubooru/tests/search/configs/test_post_search_config.py

1 files changed, 114 insertions, 0 deletions

diff --git a/client/js/models/pool_category.js b/client/js/models/pool_category.js
new file mode 100644
index 0000000..8c7df46
--- /dev/null
+++ b/client/js/models/pool_category.js
@@ -0,0 +1,114 @@
+"use strict";
+
+const api = require("../api.js");
+const uri = require("../util/uri.js");
+const events = require("../events.js");
+
+class PoolCategory extends events.EventTarget {
+    constructor() {
+        super();
+        this._name = "";
+        this._color = "#000000";
+        this._poolCount = 0;
+        this._isDefault = false;
+        this._origName = null;
+        this._origColor = null;
+    }
+
+    get name() {
+        return this._name;
+    }
+
+    get color() {
+        return this._color;
+    }
+
+    get poolCount() {
+        return this._poolCount;
+    }
+
+    get isDefault() {
+        return this._isDefault;
+    }
+
+    get isTransient() {
+        return !this._origName;
+    }
+
+    set name(value) {
+        this._name = value;
+    }
+
+    set color(value) {
+        this._color = value;
+    }
+
+    static fromResponse(response) {
+        const ret = new PoolCategory();
+        ret._updateFromResponse(response);
+        return ret;
+    }
+
+    save() {
+        const detail = { version: this._version };
+
+        if (this.name !== this._origName) {
+            detail.name = this.name;
+        }
+        if (this.color !== this._origColor) {
+            detail.color = this.color;
+        }
+
+        if (!Object.keys(detail).length) {
+            return Promise.resolve();
+        }
+
+        let promise = this._origName
+            ? api.put(
+                  uri.formatApiLink("pool-category", this._origName),
+                  detail
+              )
+            : api.post(uri.formatApiLink("pool-categories"), detail);
+
+        return promise.then((response) => {
+            this._updateFromResponse(response);
+            this.dispatchEvent(
+                new CustomEvent("change", {
+                    detail: {
+                        poolCategory: this,
+                    },
+                })
+            );
+            return Promise.resolve();
+        });
+    }
+
+    delete() {
+        return api
+            .delete(uri.formatApiLink("pool-category", this._origName), {
+                version: this._version,
+            })
+            .then((response) => {
+                this.dispatchEvent(
+                    new CustomEvent("delete", {
+                        detail: {
+                            poolCategory: this,
+                        },
+                    })
+                );
+                return Promise.resolve();
+            });
+    }
+
+    _updateFromResponse(response) {
+        this._version = response.version;
+        this._name = response.name;
+        this._color = response.color;
+        this._isDefault = response.default;
+        this._poolCount = response.usages;
+        this._origName = this.name;
+        this._origColor = this.color;
+    }
+}
+
+module.exports = PoolCategory;