Skip to content

Commit

Permalink
fix requests to work with linted script
Browse files Browse the repository at this point in the history
  • Loading branch information
@JayAgra
JayAgra committed Apr 6, 2023
1 parent 9f5e4a3 commit 1e138ee
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 89 deletions.
33 changes: 15 additions & 18 deletions discord.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,25 +138,24 @@ client.on('interactionCreate', async interaction => {

res.on("end", function(chunk) {
var body = Buffer.concat(chunks);
data = body;
dbody.emit('update');
dbody.emit('update', body);
});

res.on("error", function(error) {
console.error(error);
});
});
req.end();
dbody.on('update', function() {
if (invalidJSON(data)) {
logErrors(data)
dbody.on('update', function(body) {
if (invalidJSON(body)) {
logErrors(body);
interaction.reply({
content: 'invalid input, or i messed it up',
ephemeral: true
});
logErrors(`${opseason} - ${eventcode} - ${teamnum} - ${tlevel}`);
} else {
const outputget = JSON.parse(data);
const outputget = JSON.parse(body);
const matchEmbed = new EmbedBuilder()
.setColor(0x68C3E2)
.setTitle(`${outputget.Schedule[0].description}`)
Expand Down Expand Up @@ -431,25 +430,24 @@ client.on('interactionCreate', async interaction => {

res.on("end", function(chunk) {
var body = Buffer.concat(chunks);
data = body;
dbody.emit('update');
dbody.emit('update', body);
});

res.on("error", function(error) {
console.error(error);
});
});
req.end();
dbody.on('update', function() {
if (invalidJSON(data)) {
logErrors(data);
dbody.on('update', function(body) {
if (invalidJSON(body)) {
logErrors(body);
interaction.reply({
content: `Invalid inputs, or the FRC API failed to respond`,
ephemeral: true
});
logErrors('potential error ' + opseason + eventcode)
} else {
const outputget = JSON.parse(data);
const outputget = JSON.parse(body);
const rankEmbed = new EmbedBuilder()
.setColor(0x68C3E2)
.setTitle(`${eventcode} team rankings`)
Expand Down Expand Up @@ -648,24 +646,23 @@ client.on('interactionCreate', async interaction => {

res.on("end", function(chunk) {
var teambody = Buffer.concat(teamchunks);
teamdata = teambody;
dbodyteam.emit('update');
dbodyteam.emit('update', teambody);
});

res.on("error", function(error) {
console.error(error);
});
});
req.end();
dbodyteam.on('update', function() {
if (invalidJSON(teamdata)) {
logInfo(teamdata);
dbodyteam.on('update', function(teambody) {
if (invalidJSON(teambody)) {
logInfo(teambody);
interaction.reply({
content: 'invalid input, or i messed it up',
ephemeral: true
});
} else {
const outputgetteam = JSON.parse(teamdata);
const outputgetteam = JSON.parse(teambody);
rankno = outputgetteam.Rankings[0].rank - 1;
}
});
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

136 changes: 67 additions & 69 deletions serve.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,6 @@
"use strict";
const { frcapi, myteam, season, scoutteama, scoutteamb, leadscout, drive, pit, clientId, clientSec, redirectURI, teamServerID, baseURLNoPcl, anotherServerID, currentComp, serverSecret } = require('./config.json');

//SETUP OAUTH
const DiscordOauth2 = require("discord-oauth2");
const getOauthData = new DiscordOauth2();
const passport = require('passport');
const Strategy = require('passport-discord').Strategy;
passport.serializeUser(function(user, done) {
"use strict";
done(null, user);
});
passport.deserializeUser(function(obj, done) {
"use strict";
done(null, obj);
});
const scopes = ['identify', 'email', 'guilds', 'guilds.members.read', 'role_connections.write'];
passport.use(new Strategy({
clientID: clientId,
clientSecret: clientSec,
callbackURL: redirectURI,
scope: scopes
}, function(accessToken, refreshToken, profile, done) {
"use strict";
process.nextTick(function() {
return done(null, profile);
});
}));

//SETUP DATABASE
const sqlite3 = require('sqlite3');
let db = new sqlite3.Database('data.db', sqlite3.OPEN_READWRITE, (err) => function(){console.log(err);});
Expand Down Expand Up @@ -81,32 +55,61 @@ app.use('/assets', express.static('src/assets', {
res.set("X-Artist", "Lydia Honerkamp");
}
}))
app.use(session({
secret: serverSecret,
resave: false,
saveUninitialized: false,
maxAge: 24 * 60 * 60 * 1000 * 365, // 183 days
cookie : {
sameSite: 'lax',
secure: 'true'
}
}));
app.use(
session({
secret: serverSecret,
resave: false,
saveUninitialized: false,
maxAge: 31556952000, // 365 days
cookie: {
secure: "true"
},
})
);
var limiter = RateLimit({
windowMs: 10*60*1000, // 10 minutes
max: 1000,
standardHeaders: true,
legacyHeaders: false,
keyGenerator: (req, res) => { return req.connection.remoteAddress }
});
app.use(lusca({
csrf: false,
xframe: 'SAMEORIGIN',
hsts: {maxAge: 31557600000, includeSubDomains: true, preload: true},
xssProtection: true,
nosniff: true,
referrerPolicy: 'same-origin'
}));
app.use(
lusca({
csrf: false,
xframe: "SAMEORIGIN",
hsts: { maxAge: 31556952000, includeSubDomains: true, preload: true },
xssProtection: true,
nosniff: true,
referrerPolicy: "same-origin",
})
);
app.use(limiter);

//SETUP OAUTH
const DiscordOauth2 = require("discord-oauth2");
const getOauthData = new DiscordOauth2();
const passport = require('passport');
const Strategy = require('passport-discord').Strategy;
passport.serializeUser(function(user, done) {
"use strict";
done(null, user);
});
passport.deserializeUser(function(obj, done) {
"use strict";
done(null, obj);
});
const scopes = ['identify', 'email', 'guilds', 'guilds.members.read', 'role_connections.write'];
passport.use(new Strategy({
clientID: clientId,
clientSecret: clientSec,
callbackURL: redirectURI,
scope: scopes
}, function(accessToken, refreshToken, profile, done) {
"use strict";
process.nextTick(function() {
return done(null, profile);
});
}));
app.use(passport.initialize());
app.use(passport.session());

Expand Down Expand Up @@ -886,18 +889,17 @@ app.get('/api/matches/:season/:event/:level/:all', apiCheckAuth, function(req, r

response.on("end", function(chunk) {
var body = Buffer.concat(chunks);
data = body;
dbody.emit('update');
dbody.emit("update", body);
});

response.on("error", function(error) {
console.error(error);
});
});
request.end();
dbody.on('update', function() {
if (invalidJSON(data)) {res.status(500).send('error! invalid data')} else {
const parsedData = JSON.parse(data);
dbody.on('update', function(body) {
if (invalidJSON(body)) {res.status(500).send('error! invalid data')} else {
const parsedData = JSON.parse(body);
var matchesContent = "";
const eventCode = req.params.event
for (let i = 0; i < parsedData.Schedule.length; i++) {
Expand Down Expand Up @@ -1194,18 +1196,17 @@ app.get('/api/events/:event/teams', apiCheckAuth, function(req, res) {

response.on("end", function(chunk) {
var body = Buffer.concat(chunks);
data = body;
dbody.emit('update');
dbody.emit("update", body);
});

response.on("error", function(error) {
console.error(error);
});
});
request.end();
dbody.on('update', function() {
if (invalidJSON(data)) {res.status(500).send('error! invalid data')} else {
const parsedData = JSON.parse(data);
dbody.on('update', function(body) {
if (invalidJSON(body)) {res.status(500).send('error! invalid data')} else {
const parsedData = JSON.parse(body);
var teams = [];
for (var i = 0; i < parsedData.teams.length; i++) {
teams.push(parsedData.teams[i].teamNumber);
Expand Down Expand Up @@ -1236,18 +1237,17 @@ app.get('/api/events/:event/allTeamData', apiCheckAuth, function(req, res) {

response.on("end", function(chunk) {
var body = Buffer.concat(chunks);
data = body;
dbody.emit('update');
dbody.emit("update", body);
});

response.on("error", function(error) {
console.error(error);
});
});
request.end();
dbody.on('update', function() {
if (invalidJSON(data)) {res.status(500).send('error! invalid data')} else {
res.status(200).json(JSON.parse(data))
dbody.on('update', function(body) {
if (invalidJSON(body)) {res.status(500).send('error! invalid data')} else {
res.status(200).json(JSON.parse(body));
}
});
});
Expand All @@ -1273,18 +1273,17 @@ app.get('/api/events/current/allData', apiCheckAuth, function(req, res) {

response.on("end", function(chunk) {
var body = Buffer.concat(chunks);
data = body;
dbody.emit('update');
dbody.emit("update", body);
});

response.on("error", function(error) {
console.error(error);
});
});
request.end();
dbody.on('update', function() {
if (invalidJSON(data)) {res.status(500).send('error! invalid data')} else {
res.status(200).json(JSON.parse(data))
dbody.on('update', function(body) {
if (invalidJSON(body)) {res.status(500).send('error! invalid data')} else {
res.status(200).json(JSON.parse(body));
}
});
});
Expand Down Expand Up @@ -1384,18 +1383,17 @@ app.get('/api/teams/teamdata/:team', apiCheckAuth, function(req, res) {

response.on("end", function(chunk) {
var body = Buffer.concat(chunks);
data = body;
dbody.emit('update');
dbody.emit("update", body);
});

response.on("error", function(error) {
console.error(error);
});
});
request.end();
dbody.on('update', function() {
if (invalidJSON(data)) {res.status(500).send('error! invalid data')} else {
res.status(200).json(JSON.parse(data))
dbody.on('update', function(body) {
if (invalidJSON(body)) {res.status(500).send('error! invalid data')} else {
res.status(200).json(JSON.parse(body));
}
});
});
Expand Down

0 comments on commit 1e138ee

Please sign in to comment.