From de4498d2cae52a44e504dd63eb413b8438404b42 Mon Sep 17 00:00:00 2001 From: Jemma Date: Tue, 2 Jan 2024 12:47:48 -0600 Subject: [PATCH] Updated grpc package. Bug fixes on 3DS --- package-lock.json | 63 +++++++++---------- package.json | 2 +- src/middleware/auth.js | 2 +- .../juxt-web/routes/console/communities.js | 3 + src/util.js | 6 +- src/webfiles/ctr/js/juxt.js | 20 +++--- src/webfiles/ctr/js/juxt.min.js | 2 +- src/webfiles/ctr/post.ejs | 2 +- src/webfiles/web/partials/post_template.ejs | 8 ++- 9 files changed, 58 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4043411..9c8f6ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "@pretendonetwork/grpc": "^1.0.6", "aws-sdk": "^2.1192.0", "body-parser": "^1.19.0", "colors": "^1.4.0", @@ -31,7 +32,6 @@ "node-snowflake": "0.0.1", "pako": "^2.0.2", "pngjs": "^6.0.0", - "pretendo-grpc": "github:PretendoNetwork/grpc-ts", "sharp": "^0.31.3", "tga": "^1.0.4", "xml2js": "^0.4.23", @@ -985,6 +985,20 @@ "node": ">=8.0" } }, + "node_modules/@pretendonetwork/grpc": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@pretendonetwork/grpc/-/grpc-1.0.6.tgz", + "integrity": "sha512-kTK4lO8AdrQ5GOvYdJ7sqvIP3ubn5TGqGGqjVpgCTSiVBvBmlnz3fQkoDHmYw2WeA0CNtUx2dROG3Juiy5t7BQ==", + "dependencies": { + "long": "^5.2.1", + "protobufjs": "^7.2.3" + } + }, + "node_modules/@pretendonetwork/grpc/node_modules/long": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", + "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" + }, "node_modules/@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -5637,22 +5651,6 @@ "node": ">= 0.8.0" } }, - "node_modules/pretendo-grpc": { - "name": "pretendo-grpc-ts", - "version": "1.0.0", - "resolved": "git+ssh://git@github.com/PretendoNetwork/grpc-ts.git#b7bcb0d691cec3f88ff0627cb7431c14dd2d2d1d", - "hasInstallScript": true, - "license": "ISC", - "dependencies": { - "long": "^5.2.1", - "protobufjs": "^7.2.3" - } - }, - "node_modules/pretendo-grpc/node_modules/long": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", - "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" - }, "node_modules/primitive-pool": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/primitive-pool/-/primitive-pool-1.1.0.tgz", @@ -7771,6 +7769,22 @@ "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-8.3.8.tgz", "integrity": "sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==" }, + "@pretendonetwork/grpc": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@pretendonetwork/grpc/-/grpc-1.0.6.tgz", + "integrity": "sha512-kTK4lO8AdrQ5GOvYdJ7sqvIP3ubn5TGqGGqjVpgCTSiVBvBmlnz3fQkoDHmYw2WeA0CNtUx2dROG3Juiy5t7BQ==", + "requires": { + "long": "^5.2.1", + "protobufjs": "^7.2.3" + }, + "dependencies": { + "long": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", + "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" + } + } + }, "@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -11274,21 +11288,6 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==" }, - "pretendo-grpc": { - "version": "git+ssh://git@github.com/PretendoNetwork/grpc-ts.git#b7bcb0d691cec3f88ff0627cb7431c14dd2d2d1d", - "from": "pretendo-grpc@github:PretendoNetwork/grpc-ts", - "requires": { - "long": "^5.2.1", - "protobufjs": "^7.2.3" - }, - "dependencies": { - "long": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", - "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" - } - } - }, "primitive-pool": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/primitive-pool/-/primitive-pool-1.1.0.tgz", diff --git a/package.json b/package.json index 0e99efd..35d4c7b 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ }, "homepage": "https://github.com/PretendoNetwork/juxt-web#readme", "dependencies": { + "@pretendonetwork/grpc": "^1.0.6", "aws-sdk": "^2.1192.0", "body-parser": "^1.19.0", "colors": "^1.4.0", @@ -43,7 +44,6 @@ "node-snowflake": "0.0.1", "pako": "^2.0.2", "pngjs": "^6.0.0", - "pretendo-grpc": "github:PretendoNetwork/grpc-ts", "sharp": "^0.31.3", "tga": "^1.0.4", "xml2js": "^0.4.23", diff --git a/src/middleware/auth.js b/src/middleware/auth.js index 8b965cc..9bb0ff4 100644 --- a/src/middleware/auth.js +++ b/src/middleware/auth.js @@ -56,7 +56,7 @@ async function auth(request, response, next) { // return response.send('No access. Must be tester or dev'); //} // Set moderator status - request.moderator = request.user.accessLevel >= 2; + request.moderator = request.user.accessLevel == 2 || request.user.accessLevel == 3; const user = await db.getUserSettings(request.pid); if (user && moment(user.ban_lift_date) <= moment() && user.account_status !== 3) { user.account_status = 0; diff --git a/src/services/juxt-web/routes/console/communities.js b/src/services/juxt-web/routes/console/communities.js index a6dd75b..14d5e2e 100644 --- a/src/services/juxt-web/routes/console/communities.js +++ b/src/services/juxt-web/routes/console/communities.js @@ -46,6 +46,9 @@ router.get('/all', async function (req, res) { }); router.get('/:communityID', async function (req, res) { + if (req.params.communityID === '0') { + console.log(req.paramPackData); + } if (req.query.title_id) { const community = await database.getCommunityByTitleID(req.query.title_id); if (!community) { diff --git a/src/util.js b/src/util.js index 0f90ff6..16eb910 100644 --- a/src/util.js +++ b/src/util.js @@ -9,9 +9,9 @@ const { SETTINGS } = require('./models/settings'); const { CONTENT } = require('./models/content'); const { NOTIFICATION } = require('./models/notifications'); const { COMMUNITY } = require('./models/communities'); -const { AccountDefinition } = require('pretendo-grpc/dist/account/account_service'); -const { FriendsDefinition } = require('pretendo-grpc/dist/friends/friends_service'); -const { APIDefinition } = require('pretendo-grpc/dist/api/api_service'); +const { AccountDefinition } = require('@pretendonetwork/grpc/account/account_service'); +const { FriendsDefinition } = require('@pretendonetwork/grpc/friends/friends_service'); +const { APIDefinition } = require('@pretendonetwork/grpc/api/api_service'); const translations = require('./translations'); const HashMap = require('hashmap'); const TGA = require('tga'); diff --git a/src/webfiles/ctr/js/juxt.js b/src/webfiles/ctr/js/juxt.js index 19de68e..4a14549 100644 --- a/src/webfiles/ctr/js/juxt.js +++ b/src/webfiles/ctr/js/juxt.js @@ -403,16 +403,16 @@ function GET(url, callback) { xhttp.send(); } function DELETE(url, callback) { - wiiuBrowser.showLoadingIcon(true); - var xhttp = new XMLHttpRequest(); - xhttp.onreadystatechange = function() { - if(this.readyState === 4) { - wiiuBrowser.showLoadingIcon(false); - return callback(this); - } - }; - xhttp.open("DELETE", url, true); - xhttp.send(); + cave.transition_begin(); + var xhttp = new XMLHttpRequest(); + xhttp.onreadystatechange = function() { + if (this.readyState === 4) { + cave.transition_end(); + return callback(this); + } + }; + xhttp.open('DELETE', url, true); + xhttp.send(); } document.addEventListener('DOMContentLoaded', function () { diff --git a/src/webfiles/ctr/js/juxt.min.js b/src/webfiles/ctr/js/juxt.min.js index 0c22d8e..5784380 100644 --- a/src/webfiles/ctr/js/juxt.min.js +++ b/src/webfiles/ctr/js/juxt.min.js @@ -1 +1 @@ -function initPostModules(){function e(e){function t(){document.getElementById("close-modal-button").click()}var a=e.currentTarget,o=a.getAttribute("data-module-show"),n=a.getAttribute("data-module-hide"),s=a.getAttribute("data-header"),r=a.getAttribute("data-sound"),c=a.getAttribute("data-message"),l=a.getAttribute("data-screenshot");if(r&&cave.snd_playSe(r),o&&n){if(document.getElementById(n).style.display="none",document.getElementById(o).style.display="block",document.getElementById("header").style.display="true"===s?"block":"none",l){var i=document.getElementById("screenshot-button");cave.capture_isEnabled()||(classList.add(i,"none"),i.onclick=null)}c?(cave.toolbar_setWideButtonMessage(c),cave.toolbar_setMode(1),cave.toolbar_setButtonType(1),cave.toolbar_setCallback(1,t),cave.toolbar_setCallback(99,t),cave.toolbar_setCallback(8,function(){cave.toolbar_setMode(0),cave.toolbar_setButtonType(0),document.getElementById("submit").click()})):(cave.toolbar_setMode(0),cave.toolbar_setButtonType(0),cave.toolbar_setCallback(1,back),cave.toolbar_setCallback(99,back)),cave.transition_end(),initNewPost()}}var t=document.querySelectorAll("[data-module-show]");if(t)for(var a=0;a0)for(var a in t){var o=JSON.parse(cave.lls_getItem(a)).screenShotKey;o&&!PostStorage.hasKey(o)&&cave.lls_removeItem(a)}}},classList={contains:function(e,t){return-1!==e.className.indexOf(t)},add:function(e,t){e.className+=" "+t},remove:function(e,t){e.className=e.className.replace(t,"")}};document.addEventListener("DOMContentLoaded",function(){pjax=Pjax.init({elements:"a[data-pjax]",selectors:["title","#body"]}),console.debug("Pjax initialized.",pjax),initAll(),stopLoading()}),document.addEventListener("PjaxRequest",function(e){console.log(e),cave.transition_begin()}),document.addEventListener("PjaxLoaded",function(e){console.log(e)}),document.addEventListener("PjaxDone",function(e){initAll(),cave.brw_scrollImmediately(0,0),pjax.canGoBack()?cave.toolbar_setButtonType(1):cave.toolbar_setButtonType(0),cave.transition_end()}); \ No newline at end of file +function initPostModules(){function e(e){function t(){document.getElementById("close-modal-button").click()}var a=e.currentTarget,n=a.getAttribute("data-module-show"),o=a.getAttribute("data-module-hide"),s=a.getAttribute("data-header"),r=a.getAttribute("data-sound"),c=a.getAttribute("data-message"),l=a.getAttribute("data-screenshot");if(r&&cave.snd_playSe(r),n&&o){if(document.getElementById(o).style.display="none",document.getElementById(n).style.display="block",document.getElementById("header").style.display="true"===s?"block":"none",l){var i=document.getElementById("screenshot-button");cave.capture_isEnabled()||(classList.add(i,"none"),i.onclick=null)}c?(cave.toolbar_setWideButtonMessage(c),cave.toolbar_setMode(1),cave.toolbar_setButtonType(1),cave.toolbar_setCallback(1,t),cave.toolbar_setCallback(99,t),cave.toolbar_setCallback(8,function(){cave.toolbar_setMode(0),cave.toolbar_setButtonType(0),document.getElementById("submit").click()})):(cave.toolbar_setMode(0),cave.toolbar_setButtonType(0),cave.toolbar_setCallback(1,back),cave.toolbar_setCallback(99,back)),cave.transition_end(),initNewPost()}}var t=document.querySelectorAll("[data-module-show]");if(t)for(var a=0;a0)for(var a in t){var n=JSON.parse(cave.lls_getItem(a)).screenShotKey;n&&!PostStorage.hasKey(n)&&cave.lls_removeItem(a)}}},classList={contains:function(e,t){return-1!==e.className.indexOf(t)},add:function(e,t){e.className+=" "+t},remove:function(e,t){e.className=e.className.replace(t,"")}};document.addEventListener("DOMContentLoaded",function(){pjax=Pjax.init({elements:"a[data-pjax]",selectors:["title","#body"]}),console.debug("Pjax initialized.",pjax),initAll(),stopLoading()}),document.addEventListener("PjaxRequest",function(e){console.log(e),cave.transition_begin()}),document.addEventListener("PjaxLoaded",function(e){console.log(e)}),document.addEventListener("PjaxDone",function(e){initAll(),cave.brw_scrollImmediately(0,0),pjax.canGoBack()?cave.toolbar_setButtonType(1):cave.toolbar_setButtonType(0),cave.transition_end()}); \ No newline at end of file diff --git a/src/webfiles/ctr/post.ejs b/src/webfiles/ctr/post.ejs index d967702..c59b098 100644 --- a/src/webfiles/ctr/post.ejs +++ b/src/webfiles/ctr/post.ejs @@ -61,7 +61,7 @@ value="Cancel" data-sound="SE_WAVE_CANCEL" data-module-show="post" data-module-hide="report-post-page" data-header="true" data-menu="true"> - + diff --git a/src/webfiles/web/partials/post_template.ejs b/src/webfiles/web/partials/post_template.ejs index 0fb2470..e99c0c3 100644 --- a/src/webfiles/web/partials/post_template.ejs +++ b/src/webfiles/web/partials/post_template.ejs @@ -1,10 +1,16 @@ <% if(locals.mainPost === undefined) locals.mainPost = false; %> +<% if(locals.moderator === undefined) locals.moderator = false; %>
-<% if(post.removed) {%> +<% if(post.removed && !moderator) {%>

Post has been removed.

<%} else {%> + <% if(post.removed && moderator) {%> +
+

Post has been removed.

+
+ <%}>