Leahnaya/juxtaposition-ui
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/juxtaposition-ui.git synced 2026-08-24 02:05:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated grpc package. Bug fixes on 3DS

Browse Source
This commit is contained in:
Jemma
2024-01-02 12:47:48 -06:00
parent 43ce53edef
commit de4498d2ca
9 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
package-lock.json generated
View File

@@ -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",

2
package.json
View File

@@ -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",

2
src/middleware/auth.js
View File

@@ -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;

3
src/services/juxt-web/routes/console/communities.js
View File

@@ -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) {

6
src/util.js
View File

@@ -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');

20
src/webfiles/ctr/js/juxt.js
View File

@@ -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 () {

2
src/webfiles/ctr/js/juxt.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/webfiles/ctr/post.ejs
View File

@@ -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">
<input type="submit" class="post-button fixed-bottom-button" value="Submit" onclick="wiiuBrowser.lockUserOperation(true);">
<input type="submit" class="post-button fixed-bottom-button" value="Submit">
</form>
</div>
</div>

8
src/webfiles/web/partials/post_template.ejs
View File

@@ -1,10 +1,16 @@
<% if(locals.mainPost === undefined) locals.mainPost = false; %>
<% if(locals.moderator === undefined) locals.moderator = false; %>
<div class="posts-wrapper" id="<%= post.id %>">
<% if(post.removed) {%>
<% if(post.removed && !moderator) {%>
<div class="post-body-content removed">
<h3>Post has been removed.</h3>
</div>
<%} else {%>
<% if(post.removed && moderator) {%>
<div class="post-body-content removed">
<h3>Post has been removed.</h3>
</div>
<%}>
<div class="post-user-info-wrapper" id="<%= post.id %>">
<img class="user-icon <%if(post.verified) {%>verified<%}%>" src="https://pretendo-cdn.b-cdn.net<%= post.mii_face_url.substring(post.mii_face_url.lastIndexOf('/mii')) %>" data-pjax="/users/show?pid=<%= post.pid %>">
<div class="post-meta-wrapper">