diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | public/assets/js/lib/views/details/settings.js | 501 | ||||
| -rw-r--r-- | yarn.lock | 136 |
3 files changed, 343 insertions, 296 deletions
diff --git a/package.json b/package.json index 351c15c..32996e3 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "mongodb": "^2.2.36", "multer": "^1.4.2", "multiparty": "^4.2.1", - "mysql2": "^0.15.8", + "mysql2": "^3.14.3", "node-fetch": "^1.7.3", "node-uuid": "^1.4.8", "passport": "^0.3.0", diff --git a/public/assets/js/lib/views/details/settings.js b/public/assets/js/lib/views/details/settings.js index c2ff078..fd23c46 100644 --- a/public/assets/js/lib/views/details/settings.js +++ b/public/assets/js/lib/views/details/settings.js @@ -1,9 +1,8 @@ var ThreadSettingsForm = FormView.extend({ - el: "#thread_settings", events: { - "click": "hide", + // click: "hide", "click .inner": "stopPropagation", "click .thread_delete": "deleteThread", "click .file_delete": "deleteFile", @@ -20,152 +19,174 @@ var ThreadSettingsForm = FormView.extend({ }, action: "", - method: 'put', + method: "put", - initialize: function(){ - this.__super__.initialize.call(this) - this.template = this.$(".template").html() - this.allowedTemplate = this.$(".allowedTemplate").html() - this.filesTemplate = this.$(".settingsFilesTemplate").html() + initialize: function () { + this.__super__.initialize.call(this); + this.template = this.$(".template").html(); + this.allowedTemplate = this.$(".allowedTemplate").html(); + this.filesTemplate = this.$(".settingsFilesTemplate").html(); }, - populate: function(){ - var data = this.options.parent.data - var keywords = data.keywords - var keyword = data.keyword - var thread = data.thread - var comments = data.comments - var files = data.files - var settings = thread.settings - var display = thread.display + populate: function () { + var data = this.options.parent.data; + var keywords = data.keywords; + var keyword = data.keyword; + var thread = data.thread; + var comments = data.comments; + var files = data.files; + var settings = thread.settings; + var display = thread.display; - this.thread = thread - this.files = data.files - this.action = "/api/thread/" + thread.id - this.allowed = (this.thread.allowed || "").split(" ").map(s => s.trim()).filter(s => !! s) + this.thread = thread; + this.files = data.files; + this.action = "/api/thread/" + thread.id; + this.allowed = (this.thread.allowed || "") + .split(" ") + .map((s) => s.trim()) + .filter((s) => !!s); - this.$(".close_link").attr("href", "/details/" + thread.id) - this.$(".metadata").html(metadata(thread)) - this.$("[name=title]").val(thread.title) + this.$(".close_link").attr("href", "/details/" + thread.id); + this.$(".metadata").html(metadata(thread)); + this.$("[name=title]").val(thread.title); - this.$("[name=hootbox]").prop("checked", !!thread.settings.hootbox) - this.$("[name=shorturls]").prop("checked", !!thread.settings.shorturls) - this.$("[name=noupload]").prop("checked", !!thread.settings.noupload) - this.$("[name=privacy]").prop("checked", !!thread.privacy) + this.$("[name=hootbox]").prop("checked", !!thread.settings.hootbox); + this.$("[name=shorturls]").prop("checked", !!thread.settings.shorturls); + this.$("[name=noupload]").prop("checked", !!thread.settings.noupload); + this.$("[name=privacy]").prop("checked", !!thread.privacy); - var $color = this.$('[name=color]') + var $color = this.$("[name=color]"); Object.keys(COLORS).forEach((color) => { - var option = document.createElement('option') - option.value = color - option.innerHTML = color - $color.append(option) - }) - $color.val(thread && thread.color? thread.color: keyword? keyword.color: "") + var option = document.createElement("option"); + option.value = color; + option.innerHTML = color; + $color.append(option); + }); + $color.val( + thread && thread.color ? thread.color : keyword ? keyword.color : "", + ); - var $sort = this.$('[name=sort]') + var $sort = this.$("[name=sort]"); FILE_SORTS.forEach((sort) => { - var option = document.createElement('option') - option.value = sort.key - option.innerHTML = sort.label - $sort.append(option) - }) - $sort.val(thread.settings.sort || "name_asc") + var option = document.createElement("option"); + option.value = sort.key; + option.innerHTML = sort.label; + $sort.append(option); + }); + $sort.val(thread.settings.sort || "name_asc"); - this.toggleAllowed() - this.fetchKeywords() + this.toggleAllowed(); + this.fetchKeywords(); - var $files = this.$(".files") - $files.empty() - files.sort((a,b) => cmp(a.filename, b.filename)) - .forEach(file => { - var size = hush_size(file.size) - var datetime = verbose_date(file.date, true) - var date_class = carbon_date(file.date) - var link = make_link(file) - var t = this.filesTemplate.replace(/{{username}}/g, file.username) - .replace(/{{link}}/g, link) - .replace(/{{filename}}/g, file.filename) - .replace(/{{date_class}}/g, date_class) - .replace(/{{date}}/g, datetime[0]) - .replace(/{{time}}/g, datetime[1]) - .replace(/{{size_class}}/g, size[0]) - .replace(/{{size}}/g, size[1]) - .replace(/{{id}}/g, file.id) - var $t = $(t) - $files.append($t) - }) + var $files = this.$(".files"); + $files.empty(); + files + .sort((a, b) => cmp(a.filename, b.filename)) + .forEach((file) => { + var size = hush_size(file.size); + var datetime = verbose_date(file.date, true); + var date_class = carbon_date(file.date); + var link = make_link(file); + var t = this.filesTemplate + .replace(/{{username}}/g, file.username) + .replace(/{{link}}/g, link) + .replace(/{{filename}}/g, file.filename) + .replace(/{{date_class}}/g, date_class) + .replace(/{{date}}/g, datetime[0]) + .replace(/{{time}}/g, datetime[1]) + .replace(/{{size_class}}/g, size[0]) + .replace(/{{size}}/g, size[1]) + .replace(/{{id}}/g, file.id); + var $t = $(t); + $files.append($t); + }); - $("body").removeClass("loading") + $("body").removeClass("loading"); }, - fetchKeywords: function(thread){ - $.get('/api/keywords', function(data){ - var $keyword = this.$('[name=keyword]') - data.keywords - .map( (a) => a.keyword) - .sort( (a,b) => a < b ? -1 : a === b ? 0 : 1 ) - .forEach((keyword) => { - var option = document.createElement('option') - option.value = keyword - option.innerHTML = keyword - $keyword.append(option) - }) - $keyword.val(this.thread.keyword) - }.bind(this)) + fetchKeywords: function (thread) { + $.get( + "/api/keywords", + function (data) { + var $keyword = this.$("[name=keyword]"); + data.keywords + .map((a) => a.keyword) + .sort((a, b) => (a < b ? -1 : a === b ? 0 : 1)) + .forEach((keyword) => { + var option = document.createElement("option"); + option.value = keyword; + option.innerHTML = keyword; + $keyword.append(option); + }); + $keyword.val(this.thread.keyword); + }.bind(this), + ); }, - loadThreads: function(threads){ + loadThreads: function (threads) { // update the dropdown list of threads - var $thread_select = this.$('[name=thread]') + var $thread_select = this.$("[name=thread]"); if (!threads || !threads.length) { - $thread_select.parent().hide() - return + $thread_select.parent().hide(); + return; } - $thread_select.parent().show() + $thread_select.parent().show(); threads - .map( (a) => [a.title.toLowerCase(), a]) - .sort( (a,b) => a[0].localeCompare(b[0]) ) - .forEach((pair) => { - const thread = pair[1] - var option = document.createElement('option') - option.value = thread.id - // console.log(thread, get_revision(thread)) - option.innerHTML = '[' + thread.id + get_revision(thread) + '] ' + sanitize(thread.title) - $thread_select.append(option) - }) + .map((a) => [a.title.toLowerCase(), a]) + .sort((a, b) => a[0].localeCompare(b[0])) + .forEach((pair) => { + const thread = pair[1]; + var option = document.createElement("option"); + option.value = thread.id; + // console.log(thread, get_revision(thread)) + option.innerHTML = + "[" + + thread.id + + get_revision(thread) + + "] " + + sanitize(thread.title); + $thread_select.append(option); + }); // console.log(threads) }, - toggleAllowed: function(e){ - var checked = this.$('[name=privacy]').prop('checked') - this.$(".allowed_field_container").toggle(checked) - this.$(".allowed_names").toggle(checked) - if (! checked) return - this.$("[name=allowed_field]").focus() - this.displayAllowed() + toggleAllowed: function (e) { + var checked = this.$("[name=privacy]").prop("checked"); + this.$(".allowed_field_container").toggle(checked); + this.$(".allowed_names").toggle(checked); + if (!checked) return; + this.$("[name=allowed_field]").focus(); + this.displayAllowed(); }, - displayAllowed: function(e){ - var $allowedNames = this.$(".allowed_names").empty() - this.allowed.forEach(username => { - var t = this.allowedTemplate.replace(/{{username}}/g, username) - $allowedNames.append(t) - }) + displayAllowed: function (e) { + var $allowedNames = this.$(".allowed_names").empty(); + this.allowed.forEach((username) => { + var t = this.allowedTemplate.replace(/{{username}}/g, username); + $allowedNames.append(t); + }); }, - keydownAllowed: function(e){ - if (e.keyCode === 13) { // enter - e.preventDefault() - e.stopPropagation() - this.updateAllowed() + keydownAllowed: function (e) { + if (e.keyCode === 13) { + // enter + e.preventDefault(); + e.stopPropagation(); + this.updateAllowed(); } }, - updateAllowed: function(){ - var usernames = this.$('[name=allowed_field]').val().replace(/,/g, ' ').split(' ').map(s => s.trim()).filter(s => !! s) - this.$('[name=allowed_field]').val('') - usernames = usernames.filter( (name) => this.allowed.indexOf(name) === -1 ) - .map( (name) => sanitizeHTML(name) ) + updateAllowed: function () { + var usernames = this.$("[name=allowed_field]") + .val() + .replace(/,/g, " ") + .split(" ") + .map((s) => s.trim()) + .filter((s) => !!s); + this.$("[name=allowed_field]").val(""); + usernames = usernames + .filter((name) => this.allowed.indexOf(name) === -1) + .map((name) => sanitizeHTML(name)); $.ajax({ method: "PUT", url: "/api/checkUsernames", @@ -173,31 +194,33 @@ var ThreadSettingsForm = FormView.extend({ data: JSON.stringify({ csrf: csrf(), usernames: usernames }), contentType: "application/json", dataType: "json", - success: function(data){ - if (! data.usernames || ! data.usernames.length) return - this.allowed = this.allowed.concat(data.usernames) - this.displayAllowed() + success: function (data) { + if (!data.usernames || !data.usernames.length) return; + this.allowed = this.allowed.concat(data.usernames); + this.displayAllowed(); }.bind(this), - }) + }); }, - removeAllowed: function(){ - this.allowed = this.$("#allowed_names input[type=checkbox]:checked").map(function(){ - return $(this).val() - }) - this.displayAllowed() + removeAllowed: function () { + this.allowed = this.$("#allowed_names input[type=checkbox]:checked").map( + function () { + return $(this).val(); + }, + ); + this.displayAllowed(); }, - validate: function(){ - var errors = [] - var title = $("[name=title]").val() - if (! title || ! title.length) { - errors.push("Please enter a title.") + validate: function () { + var errors = []; + var title = $("[name=title]").val(); + if (!title || !title.length) { + errors.push("Please enter a title."); } - return errors.length ? errors : null + return errors.length ? errors : null; }, - serialize: function(){ + serialize: function () { var data = { title: $("[name=title]").val(), keyword: $("[name=keyword]").val(), @@ -208,115 +231,127 @@ var ThreadSettingsForm = FormView.extend({ hootbox: $("[name=hootbox]:checked").val() ? true : false, shorturls: $("[name=shorturls]:checked").val() ? true : false, noupload: $("[name=noupload]:checked").val() ? true : false, - sort: $("[name=sort]").val() + sort: $("[name=sort]").val(), }, - } - return JSON.stringify(data) + }; + return JSON.stringify(data); }, - success: function(data){ - console.log(data) - window.location.href = "/details/" + this.options.parent.data.thread.id + success: function (data) { + console.log(data); + window.location.href = "/details/" + this.options.parent.data.thread.id; }, visible: false, - show: function(){ - this.visible = true - app.typing = true - this.populate() - this.$el.addClass('visible') - app.router.pushState("/details/" + this.options.parent.data.thread.id + "/settings") + show: function () { + this.visible = true; + app.typing = true; + this.populate(); + this.$el.addClass("visible"); + app.router.pushState( + "/details/" + this.options.parent.data.thread.id + "/settings", + ); }, - hide: function(e){ - e && e.preventDefault() - this.visible = false - app.typing = false - this.$el.removeClass('visible') - app.router.pushState("/details/" + this.options.parent.data.thread.id) + hide: function (e) { + e && e.preventDefault(); + this.visible = false; + app.typing = false; + this.$el.removeClass("visible"); + app.router.pushState("/details/" + this.options.parent.data.thread.id); }, - toggle: function(){ - if (this.visible) this.hide() - else this.show() + toggle: function () { + if (this.visible) this.hide(); + else this.show(); }, - changeColor: function(){ - var color_name = this.$("[name=color]").val() - set_background_color(color_name) + changeColor: function () { + var color_name = this.$("[name=color]").val(); + set_background_color(color_name); }, - changeSort: function(){ - var sort_name = this.$("[name=sort]").val() - console.log(">", sort_name) - app.view.files.resort(sort_name) + changeSort: function () { + var sort_name = this.$("[name=sort]").val(); + console.log(">", sort_name); + app.view.files.resort(sort_name); }, - toggleFile: function(e){ + toggleFile: function (e) { // e.preventDefault() - e.stopPropagation() - const $input = $(e.currentTarget) - const $tr = $input.closest('tr.file') - const value = e.currentTarget.checked + e.stopPropagation(); + const $input = $(e.currentTarget); + const $tr = $input.closest("tr.file"); + const value = e.currentTarget.checked; // $(e.currentTarget).prop('checked', value) // console.log('check', $input, value) - this.toggleFileChecked($tr, null, value) + this.toggleFileChecked($tr, null, value); }, - toggleFileRow: function(e){ + toggleFileRow: function (e) { // e.preventDefault() - e.stopPropagation() - const $tr = $(e.currentTarget) - const $input = $tr.find('input[type="checkbox"]') - const value = ! $input.prop('checked') - this.toggleFileChecked($tr, $input, value) + e.stopPropagation(); + const $tr = $(e.currentTarget); + const $input = $tr.find('input[type="checkbox"]'); + const value = !$input.prop("checked"); + this.toggleFileChecked($tr, $input, value); }, - toggleFileChecked: function($tr, $input, value){ - $tr.toggleClass('checked', value) - if ($input) $input.prop('checked', value) + toggleFileChecked: function ($tr, $input, value) { + $tr.toggleClass("checked", value); + if ($input) $input.prop("checked", value); }, - moveFiles: function(){ - var thread_id = this.$("[name=thread]").val() + moveFiles: function () { + var thread_id = this.$("[name=thread]").val(); // if (!thread_id) return alert("Please choose a thread") - var file_ids = toArray(this.el.querySelectorAll("[name=file_id]:checked")).map(input => input.value) - console.log("thread:", thread_id) - console.log("files:", file_ids) - var promises = file_ids.map(file_id => { + var file_ids = toArray( + this.el.querySelectorAll("[name=file_id]:checked"), + ).map((input) => input.value); + console.log("thread:", thread_id); + console.log("files:", file_ids); + var promises = file_ids.map((file_id) => { return new Promise((resolve, reject) => { $.ajax({ method: "GET", - url: '/api/file/' + file_id + '/move/' + thread_id, + url: "/api/file/" + file_id + "/move/" + thread_id, headers: { "csrf-token": $("[name=_csrf]").attr("value") }, dataType: "json", - success: function(data){ - console.log('moved', file_id) - resolve(data) + success: function (data) { + console.log("moved", file_id); + resolve(data); }, - error: function(){ - console.log('error moving', file_id) - reject() - } - }) + error: function () { + console.log("error moving", file_id); + reject(); + }, + }); + }); + }); + Promise.all(promises) + .then(() => { + window.location.href = "/details/" + thread_id; }) - }) - Promise.all(promises).then( () => { - window.location.href = '/details/' + thread_id - }).catch(() =>{ - console.error('whaaaaa') - alert('there was a problem moving the files...') - }) + .catch(() => { + console.error("whaaaaa"); + alert("there was a problem moving the files..."); + }); }, - deleteThread: function(e){ - var data = this.options.parent.data - var id = data.thread.id - var comment_count = (data.comments || []).length - var file_count = (data.files || []).length - var msg = "Are you sure you want to delete this thread?\n\n#" + id + ' "' + sanitizeHTML(data.thread.title) + '"' - msg += " + " + comment_count + " comment" + courtesy_s(comment_count) - if ( file_count) msg += " + " + file_count + " file" + courtesy_s(file_count) - var should_remove = confirm(msg) + deleteThread: function (e) { + var data = this.options.parent.data; + var id = data.thread.id; + var comment_count = (data.comments || []).length; + var file_count = (data.files || []).length; + var msg = + "Are you sure you want to delete this thread?\n\n#" + + id + + ' "' + + sanitizeHTML(data.thread.title) + + '"'; + msg += " + " + comment_count + " comment" + courtesy_s(comment_count); + if (file_count) + msg += " + " + file_count + " file" + courtesy_s(file_count); + var should_remove = confirm(msg); if (should_remove) { $.ajax({ method: "DELETE", @@ -324,25 +359,30 @@ var ThreadSettingsForm = FormView.extend({ headers: { "csrf-token": $("[name=_csrf]").attr("value") }, data: JSON.stringify({ csrf: csrf() }), dataType: "json", - success: function(){ - window.location.href = "/" - } - }) + success: function () { + window.location.href = "/"; + }, + }); } }, - deleteFile: function(e){ - e.preventDefault() - e.stopPropagation() - var $el = $(e.currentTarget) - var $parent = $el.closest('.file') - var file_id = $el.data('id') - if (! file_id) return - var data = this.options.parent.data - var file = data.files.find(f => f.id === file_id) - if (! file) return - var msg = "Are you sure you want to delete this file?\n\n#" + file_id + ' "' + sanitizeHTML(file.filename) + '"' - var should_remove = confirm(msg) + deleteFile: function (e) { + e.preventDefault(); + e.stopPropagation(); + var $el = $(e.currentTarget); + var $parent = $el.closest(".file"); + var file_id = $el.data("id"); + if (!file_id) return; + var data = this.options.parent.data; + var file = data.files.find((f) => f.id === file_id); + if (!file) return; + var msg = + "Are you sure you want to delete this file?\n\n#" + + file_id + + ' "' + + sanitizeHTML(file.filename) + + '"'; + var should_remove = confirm(msg); if (should_remove) { $.ajax({ method: "DELETE", @@ -350,12 +390,11 @@ var ThreadSettingsForm = FormView.extend({ headers: { "csrf-token": $("[name=_csrf]").attr("value") }, data: JSON.stringify({ csrf: csrf() }), dataType: "json", - success: function(data){ - console.log(data) - $parent.remove() - } - }) + success: function (data) { + console.log(data); + $parent.remove(); + }, + }); } }, - -}) +}); @@ -144,11 +144,6 @@ ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -ansicolors@~0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef" - integrity sha512-tOIuy1/SK/dr94ZA0ckDohKXNeBNqZ4us6PjMVLs5h1w2GBB6uPtOknp2+VF4F/zcy9LI70W+Z+pE2Soajky1w== - anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" @@ -215,6 +210,11 @@ async@^3.2.0, async@~3.2.0: resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== +aws-ssl-profiles@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641" + integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g== + axios@^0.21.0: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" @@ -242,11 +242,6 @@ bluebird@^3.7.2: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -bn.js@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-2.0.0.tgz#825c4107f7fa789378ee1b0d86be0503d7ac743b" - integrity sha512-NmOLApC80+n+P28y06yHgwGlOCkq/X4jRh5s590959FZXSrM+I/61h0xxuIaYsg0mD44mEAZYG/rnclWuRoz+A== - bodec@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/bodec/-/bodec-0.1.0.tgz#bc851555430f23c9f7650a75ef64c6a94c3418cc" @@ -352,14 +347,6 @@ call-bind@^1.0.0: function-bind "^1.1.1" get-intrinsic "^1.0.2" -cardinal@0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.4.4.tgz#ca5bb68a5b511b90fe93b9acea49bdee5c32bfe2" - integrity sha512-3MxV0o9wOpQcobrcSrRpaSxlYkohCcZu0ytOjJUww/Yo/223q4Ecloo7odT+M0SI5kPgb1JhvSaF4EEuVXOLAQ== - dependencies: - ansicolors "~0.2.1" - redeyed "~0.4.0" - chalk@3.0.0, chalk@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" @@ -604,6 +591,11 @@ denque@^1.4.1: resolved "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz" integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ== +denque@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1" + integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw== + depd@1.1.1, depd@~1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz" @@ -642,11 +634,6 @@ dotenv@^1.2.0: resolved "https://registry.npmjs.org/dotenv/-/dotenv-1.2.0.tgz" integrity sha1-fNc+FuB/BXyAchR6W8OoZ38KtcY= -double-ended-queue@2.0.0-0: - version "2.0.0-0" - resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.0.0-0.tgz#7847fda1c00fb722245aff83643a4887670efd2c" - integrity sha512-t5ouWOpItmHrm0J0+bX/cFrIjBFWnJkk5LbIJq6bbU/M4aLX2c3LrM4QYsBptwvlPe3WzdpQefQ0v1pe/A5wjg== - ee-first@1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" @@ -725,11 +712,6 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esprima@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad" - integrity sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA== - estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" @@ -945,6 +927,13 @@ function-bind@^1.1.1: resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +generate-function@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" + integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ== + dependencies: + is-property "^1.0.2" + get-intrinsic@^1.0.2: version "1.1.3" resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz" @@ -1114,6 +1103,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.4: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + inflection@^1.12.0: version "1.13.4" resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.4.tgz#65aa696c4e2da6225b148d7a154c449366633a32" @@ -1193,6 +1189,11 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +is-property@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" + integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g== + is-stream@^1.0.1: version "1.1.0" resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" @@ -1318,10 +1319,10 @@ log-driver@^1.2.7: resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8" integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg== -lru-cache@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.5.0.tgz#d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb" - integrity sha512-dVmQmXPBlTgFw77hm60ud//l2bCuDKkqC2on1EBoM7s9Urm9IQDrnujwZ93NFnAq0dVZ0HBXTS7PwEG+YE7+EQ== +long@^5.2.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/long/-/long-5.3.2.tgz#1d84463095999262d7d7b7f8bfd4a8cc55167f83" + integrity sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA== lru-cache@^5.1.1: version "5.1.1" @@ -1337,6 +1338,16 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.14.1: + version "7.18.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" + integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== + +lru.min@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/lru.min/-/lru.min-1.1.2.tgz#01ce1d72cc50c7faf8bd1f809ebf05d4331021eb" + integrity sha512-Nv9KddBcQSlQopmBHXSsZVY5xsdlZkdH/Iey0BlcBYggMd4two7cZnKOK9vmy3nY0O5RGH99z1PCeTpPqszUYg== + media-typer@0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" @@ -1479,23 +1490,27 @@ mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mysql2@^0.15.8: - version "0.15.8" - resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-0.15.8.tgz#f16650b6f7c5bb568b34511e21bafe36d5a89ef1" - integrity sha512-3x5o6C20bfwJYPSoT74MOoad7/chJoq4qXHDL5VAuRBBrIyErovLoj04Dz/5EY9X2kTxWSGNiTegtxpROTd2YQ== +mysql2@^3.14.3: + version "3.14.3" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.14.3.tgz#52aa6266b416d8b629bf398ba2be9840492b9b08" + integrity sha512-fD6MLV8XJ1KiNFIF0bS7Msl8eZyhlTDCDl75ajU5SJtpdx9ZPEACulJcqJWr1Y8OYyxsFc4j3+nflpmhxCU5aQ== dependencies: - bn.js "2.0.0" - cardinal "0.4.4" - double-ended-queue "2.0.0-0" - named-placeholders "0.1.3" - readable-stream "1.0.33" + aws-ssl-profiles "^1.1.1" + denque "^2.1.0" + generate-function "^2.3.1" + iconv-lite "^0.6.3" + long "^5.2.1" + lru.min "^1.0.0" + named-placeholders "^1.1.3" + seq-queue "^0.0.5" + sqlstring "^2.3.2" -named-placeholders@0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-0.1.3.tgz#353776ee259ad105227e13852eef4215ac631e84" - integrity sha512-Mt79RtxZ6MYTIEemPGv/YDKpbuavcAyGHb0r37xB2mnE5jej3uBzc4+nzOeoZ4nZiii1M32URKt9IjkSTZAmTA== +named-placeholders@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.3.tgz#df595799a36654da55dda6152ba7a137ad1d9351" + integrity sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w== dependencies: - lru-cache "2.5.0" + lru-cache "^7.14.1" needle@2.4.0: version "2.4.0" @@ -1871,16 +1886,6 @@ read@^1.0.4: dependencies: mute-stream "~0.0.4" -readable-stream@1.0.33: - version "1.0.33" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.33.tgz#3a360dd66c1b1d7fd4705389860eda1d0f61126c" - integrity sha512-72KxhcKi8bAvHP/cyyWSP+ODS5ef0DIRs0OzrhGXw31q41f19aoELCbvd42FjhpyEDxQMRiiC5rq9rfE5PzTqg== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@1.1.x: version "1.1.14" resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" @@ -1918,13 +1923,6 @@ rechoir@^0.8.0: dependencies: resolve "^1.20.0" -redeyed@~0.4.0: - version "0.4.4" - resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.4.4.tgz#37e990a6f2b21b2a11c2e6a48fd4135698cba97f" - integrity sha512-pnk1vsaNLu1UAAClKsImKz9HjBvg9i8cbRqTRzJbiCjGF0fZSMqpdcA5W3juO3c4etFvTrabECkq9wjC45ZyxA== - dependencies: - esprima "~1.0.4" - redis-commands@^1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz" @@ -2025,7 +2023,7 @@ safe-buffer@5.2.1, safe-buffer@^5.2.1: resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -"safer-buffer@>= 2.1.2 < 3": +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -2081,6 +2079,11 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.1" +seq-queue@^0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" + integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q== + serve-favicon@^2.5.0: version "2.5.0" resolved "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz" @@ -2223,6 +2226,11 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== +sqlstring@^2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c" + integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg== + statuses@2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" |