From af06a430ec7ad657a64e8c2648f74fec3dee696b Mon Sep 17 00:00:00 2001 From: Paladin of Ioun <16229400+iounpaladin@users.noreply.github.com> Date: Sun, 7 Sep 2025 18:19:08 -0400 Subject: [PATCH 1/2] Stylised code to pass lint. --- routes/socket/game/policy-powers.js | 4 ++-- routes/socket/routes.js | 2 +- src/frontend-scripts/components/menu/Menu.jsx | 2 -- src/frontend-scripts/components/section-main/Gamechat.jsx | 5 +++-- src/frontend-scripts/components/section-main/GamesList.jsx | 2 -- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/routes/socket/game/policy-powers.js b/routes/socket/game/policy-powers.js index 0df191979..26d56fd8d 100644 --- a/routes/socket/game/policy-powers.js +++ b/routes/socket/game/policy-powers.js @@ -4,6 +4,8 @@ const { sendGameList } = require('../user-requests'); const { completeGame } = require('./end-game.js'); const { assassinateMerlin } = require('./assassination'); +const selectBurnCard = module.exports.selectBurnCard; // site crashes without this line xd + /** * @param {object} game - game to act on. */ @@ -554,8 +556,6 @@ module.exports.selectBurnCard = (passport, game, data, socket) => { } }; -const selectBurnCard = module.exports.selectBurnCard; // site crashes without this line xd - /** * @param {object} game - game to act on. */ diff --git a/routes/socket/routes.js b/routes/socket/routes.js index bd7816abe..49072194e 100644 --- a/routes/socket/routes.js +++ b/routes/socket/routes.js @@ -496,7 +496,7 @@ module.exports.socketRoutes = () => { console.log(passport); console.log(data); console.log(socket); - //handleUpdatedTruncateGame(data); + // handleUpdatedTruncateGame(data); }); socket.on('addNewGameChat', data => { const game = findGame(data); diff --git a/src/frontend-scripts/components/menu/Menu.jsx b/src/frontend-scripts/components/menu/Menu.jsx index fb52e4de8..9bc865709 100644 --- a/src/frontend-scripts/components/menu/Menu.jsx +++ b/src/frontend-scripts/components/menu/Menu.jsx @@ -3,8 +3,6 @@ import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import { viewPatchNotes } from '../../actions/actions'; import { Popup } from 'semantic-ui-react'; -import Swal from 'sweetalert2'; -import socket from '../../socket'; const mapStateToProps = ({ version }) => ({ version }); diff --git a/src/frontend-scripts/components/section-main/Gamechat.jsx b/src/frontend-scripts/components/section-main/Gamechat.jsx index da9c69500..b0869b13b 100644 --- a/src/frontend-scripts/components/section-main/Gamechat.jsx +++ b/src/frontend-scripts/components/section-main/Gamechat.jsx @@ -19,6 +19,7 @@ const mapDispatchToProps = dispatch => ({ const mapStateToProps = ({ notesActive }) => ({ notesActive }); const ClaimButton = ({ cards, onClick }) => { + let i = 0; return (
{['fascist', 'liberal'].includes(cards) ? ( @@ -26,9 +27,9 @@ const ClaimButton = ({ cards, onClick }) => { ) : ( cards.split('').map(card => { if (card === 'r') { - return
; + return
; } else { - return
; + return
; } }) )} diff --git a/src/frontend-scripts/components/section-main/GamesList.jsx b/src/frontend-scripts/components/section-main/GamesList.jsx index 9491e1558..c06f1d9d8 100644 --- a/src/frontend-scripts/components/section-main/GamesList.jsx +++ b/src/frontend-scripts/components/section-main/GamesList.jsx @@ -2,8 +2,6 @@ import React from 'react'; // eslint-disable-line import DisplayLobbies from './DisplayLobbies.jsx'; import PropTypes from 'prop-types'; import { Checkbox } from 'semantic-ui-react'; -import moment from 'moment'; -import { CURRENTSEASONNUMBER } from '../../constants'; import { Message } from 'semantic-ui-react'; import { processEmotes } from '../../emotes'; From 798eabc19fe74ccd21ea6bfc8c3601f46e3543ce Mon Sep 17 00:00:00 2001 From: Paladin of Ioun <16229400+iounpaladin@users.noreply.github.com> Date: Sun, 7 Sep 2025 18:25:55 -0400 Subject: [PATCH 2/2] Changes line separators in 253 files (prettier told me to do it) --- routes/socket/game/start-game.js | 12 ++++---- routes/socket/user-events/flappy-hitler.js | 2 +- routes/socket/user-events/join-game.js | 10 +++---- routes/socket/user-events/moderation.js | 2 +- routes/socket/user-events/settings.js | 32 +++++++++++----------- routes/socket/user-requests.js | 31 ++++++++++----------- src/scss/players.scss | 2 +- 7 files changed, 45 insertions(+), 46 deletions(-) diff --git a/routes/socket/game/start-game.js b/routes/socket/game/start-game.js index acd152090..72871542c 100644 --- a/routes/socket/game/start-game.js +++ b/routes/socket/game/start-game.js @@ -89,8 +89,8 @@ const beginGame = game => { } else if (game.general.avalonSH?.withPercival) { return { cardName: el % 3 === 1 ? 'morgana' : 'fascist', icon: el, team: 'fascist' }; } else if (game.general.monarchistSH) { - if (el % 3 === 0) return { cardName: 'monarchist', icon: undefined, team: 'fascist' }; - return { cardName: 'fascist', icon: el, team: 'fascist' }; + if (el % 3 === 0) return { cardName: 'monarchist', icon: undefined, team: 'fascist' }; + return { cardName: 'fascist', icon: el, team: 'fascist' }; } else { return { cardName: 'fascist', icon: el, team: 'fascist' }; } @@ -155,7 +155,8 @@ const beginGame = game => { { text: '.' } ] }); - } if (game.general.monarchistSH) { + } + if (game.general.monarchistSH) { player.gameChats.push({ gameChat: true, timestamp: new Date(), @@ -757,9 +758,8 @@ const beginGame = game => { fascists.forEach(p => (player.playersState[seatedPlayers.indexOf(p)].nameStatus = 'fascist')); } else if (game.general.avalonSH?.withPercival && cardName === 'percival') { const hasMorgana = seatedPlayers.some(player => player.role.cardName === 'morgana'); - const candidates = seatedPlayers.filter(player => - player.role.cardName === 'merlin' || - (hasMorgana ? player.role.cardName === 'morgana' : player.role.cardName === 'monarchist') + const candidates = seatedPlayers.filter( + player => player.role.cardName === 'merlin' || (hasMorgana ? player.role.cardName === 'morgana' : player.role.cardName === 'monarchist') ); player.gameChats.push({ diff --git a/routes/socket/user-events/flappy-hitler.js b/routes/socket/user-events/flappy-hitler.js index 83654bc09..46b65320b 100644 --- a/routes/socket/user-events/flappy-hitler.js +++ b/routes/socket/user-events/flappy-hitler.js @@ -1,5 +1,5 @@ module.exports.handleFlappyEvent = (data, game) => { -return; + return; if (!io.sockets.adapter.rooms[game.general.uid]) { return; } diff --git a/routes/socket/user-events/join-game.js b/routes/socket/user-events/join-game.js index fd14a027b..6972d8571 100644 --- a/routes/socket/user-events/join-game.js +++ b/routes/socket/user-events/join-game.js @@ -14,12 +14,12 @@ const updateSeatedUser = (socket, passport, data) => { // Authentication Assured in routes.js // In-game Assured in routes.js const game = games[data?.uid]; - + if (!data?.uid) { - console.log("BAD DATA") - console.log(data) - console.log(socket) - console.log(passport) + console.log('BAD DATA'); + console.log(data); + console.log(socket); + console.log(passport); } // prevents race condition between 1) taking a seat and 2) the game starting diff --git a/routes/socket/user-events/moderation.js b/routes/socket/user-events/moderation.js index 4d038d26b..a3d324a7d 100644 --- a/routes/socket/user-events/moderation.js +++ b/routes/socket/user-events/moderation.js @@ -39,7 +39,7 @@ module.exports.handleModerationAction = (socket, passport, data, skipCheck, modU if (!data) { return; } - + if (data.userName) { data.userName = data.userName.trim(); } diff --git a/routes/socket/user-events/settings.js b/routes/socket/user-events/settings.js index a7b9695f4..3133d124b 100644 --- a/routes/socket/user-events/settings.js +++ b/routes/socket/user-events/settings.js @@ -8,25 +8,25 @@ const { sendUserList } = require('../user-requests'); * @param {object} data - from socket emit. */ module.exports.handleUpdatedTheme = (socket, passport, data) => { -console.log(data, 'data') -if (data && typeof data === 'object' && typeof data.field === 'string') { - - const fields = ['primaryColor', 'secondaryColor', 'tertiaryColor', 'backgroundColor', 'textColor']; + console.log(data, 'data'); + if (data && typeof data === 'object' && typeof data.field === 'string') { + const fields = ['primaryColor', 'secondaryColor', 'tertiaryColor', 'backgroundColor', 'textColor']; - Account.findOne({ username: passport && passport.user }).then(account => { - if (!account) { - return; - } + Account.findOne({ username: passport && passport.user }).then(account => { + if (!account) { + return; + } - for (const field of fields) { - if (data[field] && typeof data[field] === 'string') account[field] = data[field]; - else { - console.log("BAD DATA - " + passport.user) } - } + for (const field of fields) { + if (data[field] && typeof data[field] === 'string') account[field] = data[field]; + else { + console.log('BAD DATA - ' + passport.user); + } + } - account.save(); - }); -} + account.save(); + }); + } }; /** diff --git a/routes/socket/user-requests.js b/routes/socket/user-requests.js index 2e2d473c0..084e7151b 100644 --- a/routes/socket/user-requests.js +++ b/routes/socket/user-requests.js @@ -255,17 +255,17 @@ module.exports.sendUserGameSettings = socket => { * @param {object} data - data about the request */ module.exports.sendPlayerNotes = (socket, data) => { -if (data) { - PlayerNote.find({ userName: data?.userName, notedUser: { $in: data?.seatedPlayers } }) - .then(notes => { - if (notes) { - socket.emit('notesUpdate', notes); - } - }) - .catch(err => { - console.log(err, 'err in getting playernotes'); - }); -} + if (data) { + PlayerNote.find({ userName: data?.userName, notedUser: { $in: data?.seatedPlayers } }) + .then(notes => { + if (notes) { + socket.emit('notesUpdate', notes); + } + }) + .catch(err => { + console.log(err, 'err in getting playernotes'); + }); + } }; /** @@ -352,12 +352,11 @@ const updateUserStatus = (module.exports.updateUserStatus = (passport, game, ove * @param {string} uid - uid of game. */ module.exports.sendGameInfo = (socket, uid) => { + if (typeof uid !== 'string') { + return; + } -if (typeof uid !== 'string') { -return; -} - -const game = games[uid]; + const game = games[uid]; const { passport } = socket.handshake.session; if (game && game.publicPlayersState && game.general) { diff --git a/src/scss/players.scss b/src/scss/players.scss index caa2dfc27..a7a8baf35 100644 --- a/src/scss/players.scss +++ b/src/scss/players.scss @@ -113,7 +113,7 @@ $eloValues: (1500 0.3 1 0.3) (1600 0.3 1 0.5) (1849 0 1 0.7) (1850 1 1 0.7) (190 } .player-container.carl { - box-shadow: 0 0 5px 2px #726EFF !important; + box-shadow: 0 0 5px 2px #726eff !important; } .player-container.rose {