{{ title }}
Various tools related to managing the site
Choose how many points you want to give. Enter a negative number to take points. You cannot take more points than what the user has, and the free slot cannot be taken away.
Remember, 10 points = 1 slot!
`, @@ -186,15 +186,15 @@ $.Dialog.wait(false, 'Giving points'); - $.API.post(`/user/${userId}/pcg/points`, data, $.mkAjaxHandler(function(){ + $.API.post(`/user/${userId}/pcg/points`, data, function(){ if (!this.status) return $.Dialog.fail(false, this.message); $.Dialog.segway(false, this.message); - })); + }); }); }); }); - })); + }); }); } @@ -225,7 +225,7 @@ $.Dialog.wait(title,`Signing out of ${browser}${platform}`); - $.API.delete(`/user/session/${sessionID}`, $.mkAjaxHandler(function(){ + $.API.delete(`/user/session/${sessionID}`, function(){ if (!this.status) return $.Dialog.fail(title,this.message); if ($li.siblings().length !== 0){ @@ -234,7 +234,7 @@ } $.Navigation.reload(true); - })); + }); }); }); $sessionList.find('button.useragent').on('click', function(e){ @@ -249,11 +249,11 @@ $.Dialog.wait(false, 'Signing out'); - $.API.post('/da-auth/signout?everywhere',{name: username},$.mkAjaxHandler(function(){ + $.API.post('/da-auth/signout?everywhere',{name: username},function(){ if (!this.status) return $.Dialog.fail(false, this.message); $.Navigation.reload(true); - })); + }); }); }); @@ -321,7 +321,7 @@ const { postId, viewonly } = el.dataset; - $.API.get(`/post/${postId}/lazyload`, { viewonly }, $.mkAjaxHandler(({ status, message, html }) => { + $.API.get(`/post/${postId}/lazyload`, { viewonly }, ({ status, message, html }) => { const $el = $(el); if (!status){ $el.trigger('error'); @@ -335,7 +335,7 @@ if (title) $li.children('.label').removeClass('hidden').find('a').text(title); }); - })); + }); }); }); @@ -350,12 +350,12 @@ $.Dialog.wait('Deviation acceptance status', 'Checking'); - $.API.post(`/post/${id}/approval`, $.mkAjaxHandler(function(){ + $.API.post(`/post/${id}/approval`, function(){ if (!this.status) return $.Dialog.fail(false, this.message); $li.remove(); $.Dialog.success(false, this.message, true); - })); + }); }); function settingChanged(which,from,to_what){ @@ -395,7 +395,7 @@ $(`.provider-${from}:not(.avatar-wrap)`).removeClass('provider-'+from).addClass('provider-'+to_what); let error = false; $.each(forUser, (forId, elements) => { - $.API.get(`/user/${forId}/avatar-wrap`, $.mkAjaxHandler(function(){ + $.API.get(`/user/${forId}/avatar-wrap`, function(){ if (!this.status){ error = true; return $.Dialog.fail(`Update avatar elements for ${forId}`, false); @@ -404,7 +404,7 @@ $.each(elements, (_, $el) => { $el.replaceWith(this.html); }); - })); + }); }); if (!error) $.Dialog.close(); @@ -440,7 +440,7 @@ $.Dialog.wait('Saving setting','Please wait'); - $.API.put(endpoint,data,$.mkAjaxHandler(function(){ + $.API.put(endpoint,data,function(){ if (!this.status) return $.Dialog.fail(false, this.message); if ($input.is('[type=number]')) @@ -452,7 +452,7 @@ $input.data('orig', this.value).triggerHandler('change'); settingChanged(endpoint.split('/').pop(), orig, this.value); - })); + }); }); $slbl.children('input[type=number]').each(function(){ let $el = $(this); diff --git a/assets/js/pages/user/suggestion.js b/assets/js/pages/user/suggestion.js index e826f40ac..1616a705e 100644 --- a/assets/js/pages/user/suggestion.js +++ b/assets/js/pages/user/suggestion.js @@ -21,7 +21,7 @@ $btn.disable(); - $.API.get('/post/request/suggestion',{already_loaded: already_loaded.join(',')},$.mkAjaxHandler(function(){ + $.API.get('/post/request/suggestion',{already_loaded: already_loaded.join(',')},function(){ if (!this.status){ $btn.enable(); return $.Dialog.fail(false, this.message); @@ -42,16 +42,16 @@ }); $result.find('.reserve-request').on('click',function(){ let $this = $(this); - $.API.post(`/post/${postID}/reservation`,{from:'suggestion'},$.mkAjaxHandler(function(){ + $.API.post(`/post/${postID}/reservation`,{from:'suggestion'},function(){ if (!this.status) return $.Dialog.fail(false, this.message); $this.replaceWith(this.button); $pendingReservations.html($(this.pendingReservations).children()); - })); + }); }); $output.html($result); $btn.enable(); - })).fail(function(){ + }).fail(function(){ $btn.enable(); }); }); diff --git a/assets/js/react-components.jsx b/assets/js/react-components.jsx index 9e57e5537..b919d2070 100644 --- a/assets/js/react-components.jsx +++ b/assets/js/react-components.jsx @@ -59,11 +59,11 @@ $.Dialog.wait(false, 'Saving changes'); - $.API.put(this.props.endpoint, { ids }, $.mkAjaxHandler(data => { + $.API.put(this.props.endpoint, { ids }, data => { if (!data.status) return $.Dialog.fail(false, data.message); this.props.onSuccess(data); - })); + }); } handleSearch(e){ diff --git a/assets/js/shared-utils.js b/assets/js/shared-utils.js index 6f5ab9610..1ca3b6179 100644 --- a/assets/js/shared-utils.js +++ b/assets/js/shared-utils.js @@ -924,12 +924,12 @@ return; } - $.API.get(this._endpoint.replace('%d', id),this._params,$.mkAjaxHandler(data => { + $.API.get(this._endpoint.replace('%d', id),this._params,data => { if (!data.status) return $.Dialog.fail('Cache entry retrieval', data.message); this._list[id] = data.list; res(this._list[id]); - })).fail(() => rej()); + }).fail(() => rej()); }); } } @@ -963,7 +963,11 @@ $.each(['get','post','put','delete'], (i, el) => { ((method) => { $.API[method] = function(url, ...args) { - return $[method]($.API.API_PATH+url, ...args); + const lastArg = args.slice(-1)[0]; + if (typeof lastArg === 'function'){ + args.splice(-1, 1, $.mkAjaxHandler(lastArg)); + } + return $[method]($.API.API_PATH + url, ...args); }; })(el); }); diff --git a/assets/js/websocket.js b/assets/js/websocket.js index 11aabb6ff..655ef9e2e 100644 --- a/assets/js/websocket.js +++ b/assets/js/websocket.js @@ -3,8 +3,7 @@ "use strict"; const $scriptTag = $('#wss'); - let conn, - connpath = $scriptTag.attr('src').replace(/^(.*?:\d+\/).*$/,'$1'), + let connpath = $scriptTag.attr('src').replace(/^(.*?:\d+\/).*$/,'$1'), wsdecoder = f => data => { if (typeof data === 'string'){ @@ -69,13 +68,13 @@ $notifCnt.empty(); }); } - else $.API.get('/notif',$.mkAjaxHandler(data => { + else $.API.get('/notif', data => { $notifCnt.text(cnt); $notifSbList.html(data.list); Time.update(); this.bindMarkRead(); $notifSb.stop().slideDown(); - })); + }); })); this.conn.on('post-delete', wsdecoder(data => { if (!data.id) @@ -113,7 +112,7 @@ if ($(`.posts #post-${data.id}`).length > 0) return; - $.API.get(`/post/${data.id}/reload`,$.mkAjaxHandler(resp => { + $.API.get(`/post/${data.id}/reload`, resp => { if (!resp.status) return; if ($(`.posts #post-${data.id}`).length > 0) @@ -124,7 +123,7 @@ Time.update(); $newli.rebindHandlers().parent().reorderPosts(); console.log(`[WS] Post added (id=${data.id}) to container ${this.section}`); - })); + }); })); this.conn.on('post-update', wsdecoder(data => { if (!data.id) @@ -281,14 +280,14 @@ send = () => { $el.siblings('.mark-read').addBack().addClass('disabled'); - $.API.post(`/notif/${nid}/mark-read`,data,$.mkAjaxHandler(data => { + $.API.post(`/notif/${nid}/mark-read`,data, data => { if (!data.status) return $.Dialog.fail(title, data.message); if (data.message) return $.Dialog.success(title, data.message, true); $.Dialog.close(); - })).always(() => { + }).always(() => { $el.siblings('.mark-read').addBack().removeClass('disabled'); }); }; diff --git a/config/routes/private_api.php b/config/routes/private_api.php index a4d5a22e0..121fd6275 100644 --- a/config/routes/private_api.php +++ b/config/routes/private_api.php @@ -17,6 +17,7 @@ $private_api_endpoint('/admin/wsdiag/hello', 'AdminController#wshello'); $private_api_endpoint('/admin/mass-approve', 'AdminController#massApprove'); $private_api_endpoint('/admin/notices/[i:id]?', 'AdminController#noticesApi'); +$private_api_endpoint('/admin/stat-cache', 'AdminController#statCacheApi'); $private_api_endpoint('/cg/appearances', 'AppearanceController#autocomplete'); $private_api_endpoint('/cg/appearances/list', 'AppearanceController#listApi'); $private_api_endpoint('/cg/appearance/[i:id]?', 'AppearanceController#api'); diff --git a/templates/admin/index.html.twig b/templates/admin/index.html.twig index 98c2d02a6..5645d1a64 100644 --- a/templates/admin/index.html.twig +++ b/templates/admin/index.html.twig @@ -7,17 +7,21 @@ {% extends "layout/base.html.twig" %} {% block content %} +{% set is_dev = permission('developer') %}Various tools related to managing the site