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, 120 insertions, 84 deletions

diff --git a/client/js/controllers/post_upload_controller.js b/client/js/controllers/post_upload_controller.js
index f176803..360dd4f 100644
--- a/client/js/controllers/post_upload_controller.js
+++ b/client/js/controllers/post_upload_controller.js
@@ -1,42 +1,42 @@
-'use strict';
+"use strict";
 
-const api = require('../api.js');
-const router = require('../router.js');
-const uri = require('../util/uri.js');
-const misc = require('../util/misc.js');
-const progress = require('../util/progress.js');
-const topNavigation = require('../models/top_navigation.js');
-const settings = require('../models/settings.js');
-const Post = require('../models/post.js');
-const Tag = require('../models/tag.js');
-const PostUploadView = require('../views/post_upload_view.js');
-const EmptyView = require('../views/empty_view.js');
+const api = require("../api.js");
+const router = require("../router.js");
+const uri = require("../util/uri.js");
+const misc = require("../util/misc.js");
+const progress = require("../util/progress.js");
+const settings = require("../models/settings.js");
+const topNavigation = require("../models/top_navigation.js");
+const Post = require("../models/post.js");
+const Tag = require("../models/tag.js");
+const PostUploadView = require("../views/post_upload_view.js");
+const EmptyView = require("../views/empty_view.js");
 
 const genericErrorMessage =
-    'One of the posts needs your attention; ' +
+    "One of the posts needs your attention; " +
     'click "resume upload" when you\'re ready.';
 
 class PostUploadController {
     constructor() {
         this._lastCancellablePromise = null;
 
-        if (!api.hasPrivilege('posts:create')) {
+        if (!api.hasPrivilege("posts:create")) {
             this._view = new EmptyView();
-            this._view.showError('You don\'t have privileges to upload posts.');
+            this._view.showError("You don't have privileges to upload posts.");
             return;
         }
 
-        topNavigation.activate('upload');
-        topNavigation.setTitle('Upload');
+        topNavigation.activate("upload");
+        topNavigation.setTitle("Upload");
         this._view = new PostUploadView({
-            canUploadAnonymously: api.hasPrivilege('posts:create:anonymous'),
-            canViewPosts: api.hasPrivilege('posts:view'),
+            canUploadAnonymously: api.hasPrivilege("posts:create:anonymous"),
+            canViewPosts: api.hasPrivilege("posts:view"),
             enableSafety: api.safetyEnabled(),
             defaultSafety: settings.get().uploadSafety
         });
-        this._view.addEventListener('change', e => this._evtChange(e));
-        this._view.addEventListener('submit', e => this._evtSubmit(e));
-        this._view.addEventListener('cancel', e => this._evtCancel(e));
+        this._view.addEventListener("change", (e) => this._evtChange(e));
+        this._view.addEventListener("submit", (e) => this._evtSubmit(e));
+        this._view.addEventListener("cancel", (e) => this._evtCancel(e));
     }
 
     _evtChange(e) {
@@ -59,98 +59,127 @@ class PostUploadController {
         this._view.clearMessages();
         const tagErrors = []; // to be displayed after all uploads
 
-        e.detail.uploadables.reduce(
-            (promise, uploadable) =>
-                promise.then(() => this._uploadSinglePost(
-                    uploadable, e.detail.skipDuplicates, e.detail.copyTagsToOriginals)),
-            Promise.resolve())
-                .then(() => {
+        e.detail.uploadables
+            .reduce(
+                (promise, uploadable) =>
+                    promise.then(() =>
+                        this._uploadSinglePost(
+                            uploadable,
+                            e.detail.skipDuplicates,
+                            e.detail.copyTagsToOriginals
+                        )
+                    ),
+                Promise.resolve()
+            )
+            .then(
+                () => {
                     this._view.clearMessages();
                     misc.disableExitConfirmation();
-                    const ctx = router.show(uri.formatClientLink('posts'));
-                    ctx.controller.showSuccess('Posts uploaded.');
+                    const ctx = router.show(uri.formatClientLink("posts"));
+                    ctx.controller.showSuccess("Posts uploaded.");
                     for (let tagError of tagErrors) {
                         ctx.controller.showError(tagError);
                     }
-                }, error => {
+                },
+                (error) => {
                     if (error.uploadable) {
                         if (error.similarPosts) {
                             error.uploadable.lookalikes = error.similarPosts;
                             this._view.updateUploadable(error.uploadable);
                             this._view.showInfo(genericErrorMessage);
                             this._view.showInfo(
-                                error.message, error.uploadable);
+                                error.message,
+                                error.uploadable
+                            );
                         } else {
                             this._view.showError(genericErrorMessage);
                             this._view.showError(
-                                error.message, error.uploadable);
+                                error.message,
+                                error.uploadable
+                            );
                         }
                     } else {
                         this._view.showError(error.message);
                     }
                     this._view.enableForm();
-                });
+                }
+            );
     }
 
     _uploadSinglePost(uploadable, skipDuplicates, copyTagsToOriginals) {
         progress.start();
         let reverseSearchPromise = Promise.resolve();
         if (!uploadable.lookalikesConfirmed) {
-            reverseSearchPromise =
-                Post.reverseSearch(uploadable.url || uploadable.file);
+            reverseSearchPromise = Post.reverseSearch(
+                uploadable.url || uploadable.file
+            );
         }
         this._lastCancellablePromise = reverseSearchPromise;
 
-        return reverseSearchPromise.then(searchResult => {
-            if (searchResult) {
-                // notify about exact duplicate
-                if (searchResult.exactPost) {
-                    if (copyTagsToOriginals) {
-                        return this._copyTagsToOriginalAndSave(uploadable, searchResult.exactPost);
-                    } else if (skipDuplicates) {
-                        this._view.removeUploadable(uploadable);
-                        return Promise.resolve();
-                    } else {
-                        let error = new Error('Post already uploaded ' +
-                            `(@${searchResult.exactPost.id})`);
+        return reverseSearchPromise
+            .then((searchResult) => {
+                if (searchResult) {
+                    // notify about exact duplicate
+                    if (searchResult.exactPost) {
+                        if (copyTagsToOriginals) {
+                            return this._copyTagsToOriginalAndSave(
+                                uploadable, searchResult.exactPost
+                            );
+                        } else if (skipDuplicates) {
+                            this._view.removeUploadable(uploadable);
+                            return Promise.resolve();
+                        } else {
+                            let error = new Error(
+                                "Post already uploaded " +
+                                    `(@${searchResult.exactPost.id})`
+                            );
+                            error.uploadable = uploadable;
+                            error.similarPosts = [
+                                {
+                                    distance: 0,
+                                    post: searchResult.exactPost
+                                }
+                            ];
+                            return Promise.reject(error);
+                        }
+                    }
+
+                    // notify about similar posts
+                    if (searchResult.similarPosts.length) {
+                        let error = new Error(
+                            `Found ${searchResult.similarPosts.length} similar ` +
+                                "posts.\nYou can resume or discard this upload."
+                        );
                         error.uploadable = uploadable;
-                        error.similarPosts = [
-                            {distance: 0, post: searchResult.exactPost}
-                        ];
+                        error.similarPosts = searchResult.similarPosts;
                         return Promise.reject(error);
+                    } else if (uploadable.foundOriginal) {
+                        return this._copyTagsToOriginalAndSave(
+                            uploadable, uploadable.foundOriginal
+                        );
                     }
                 }
 
-                // notify about similar posts
-                if (searchResult.similarPosts.length) {
-                    let error = new Error(
-                        `Found ${searchResult.similarPosts.length} similar ` +
-                        'posts.\nYou can resume or discard this upload.');
-                    error.uploadable = uploadable;
-                    error.similarPosts = searchResult.similarPosts;
-                    return Promise.reject(error);
-                }
-            } else if (uploadable.foundOriginal) {
-                return this._copyTagsToOriginalAndSave(uploadable, uploadable.foundOriginal);
-            }
-
-            // no duplicates, proceed with saving
-            let post = this._uploadableToPost(uploadable);
-            let savePromise = post.save(uploadable.anonymous)
-                .then(() => {
+                // no duplicates, proceed with saving
+                let post = this._uploadableToPost(uploadable);
+                let savePromise = post.save(uploadable.anonymous).then(() => {
                     this._view.removeUploadable(uploadable);
                     return Promise.resolve();
                 });
-            this._lastCancellablePromise = savePromise;
-            return savePromise;
-        }).then(result => {
-            progress.done();
-            return Promise.resolve(result);
-        }, error => {
-            error.uploadable = uploadable;
-            progress.done();
-            return Promise.reject(error);
-        });
+                this._lastCancellablePromise = savePromise;
+                return savePromise;
+            })
+            .then(
+                (result) => {
+                    progress.done();
+                    return Promise.resolve(result);
+                },
+                (error) => {
+                    error.uploadable = uploadable;
+                    progress.done();
+                    return Promise.reject(error);
+                }
+            );
     }
 
     _uploadableToPost(uploadable) {
@@ -164,23 +193,30 @@ class PostUploadController {
         }
         post.relations = uploadable.relations;
         post.newContent = uploadable.url || uploadable.file;
+        // if uploadable.source is ever going to be a valid field (e.g when setting source directly in the upload window)
+        // you'll need to change the line below to `post.source = uploadable.source || uploadable.url;`
+        if (uploadable.url) {
+            post.source = uploadable.url;
+        }
         return post;
     }
 
     _copyTagsToOriginalAndSave(uploadable, original) {
         uploadable.tags.map(tag => original.tags.addByName(tag));
         let savePromise = original.save()
-            .then(() => {
-                this._view.removeUploadable(uploadable);
-                return Promise.resolve();
-            });
+            .then(
+                () => {
+                    this._view.removeUploadable(uploadable);
+                    return Promise.resolve();
+                }
+            );
         this._lastCancellablePromise = savePromise;
         return savePromise;
     }
 }
 
-module.exports = router => {
-    router.enter(['upload'], (ctx, next) => {
+module.exports = (router) => {
+    router.enter(["upload"], (ctx, next) => {
         ctx.controller = new PostUploadController();
     });
 };