fix: correctly modify updated field on punishment updates (#1703)

Author: confuser

server/graphql/resolvers/mutations/resolve-appeal-update-ban.js

@@ -33,7 +33,7 @@ module.exports = async function resolveAppealUpdateBan (obj, { id, input }, { se
   let commentId
 
   await server.pool.transaction(async trx => {
-    await trx(server.config.tables.playerBans).update({ expires: input.expires, reason: input.reason }).where({ id: data.punishment_id })
+    await trx(server.config.tables.playerBans).update({ expires: input.expires, reason: input.reason, updated: trx.raw('UNIX_TIMESTAMP()') }).where({ id: data.punishment_id })
 
     return await state.dbPool.transaction(async trx => {
       const comment = {

server/graphql/resolvers/mutations/resolve-appeal-update-mute.js

@@ -33,7 +33,7 @@ module.exports = async function resolveAppealUpdateMute (obj, { id, input }, { s
   let commentId
 
   await server.pool.transaction(async trx => {
-    await trx(server.config.tables.playerMutes).update({ expires: input.expires, reason: input.reason, soft: input.soft ? 1 : 0 }).where({ id: data.punishment_id })
+    await trx(server.config.tables.playerMutes).update({ expires: input.expires, reason: input.reason, soft: input.soft ? 1 : 0, updated: trx.raw('UNIX_TIMESTAMP()') }).where({ id: data.punishment_id })
 
     return await state.dbPool.transaction(async trx => {
       const comment = {

server/graphql/resolvers/mutations/update-player-ban.js

@@ -6,16 +6,17 @@ module.exports = async function updatePlayerBan (obj, { id, serverId, input }, {
 
   if (!server) throw new ExposedError('Server does not exist')
 
-  let data = await playerBan(obj, { id, serverId }, { state }, info)
+  const data = await playerBan(obj, { id, serverId }, { state }, info)
 
   if (!data) throw new ExposedError(`Player ban ${id} does not exist`)
 
   const table = server.config.tables.playerBans
-  const updateData = { expires: input.expires, reason: input.reason }
 
-  await server.pool(table).update(updateData).where({ id })
+  await server.pool(table).update({
+    expires: input.expires,
+    reason: input.reason,
+    updated: server.pool.raw('UNIX_TIMESTAMP()')
+  }).where({ id })
 
-  data = { ...data, ...updateData }
-
-  return data
+  return playerBan(obj, { id, serverId }, { state }, info)
 }

server/graphql/resolvers/mutations/update-player-mute.js

@@ -6,16 +6,18 @@ module.exports = async function updatePlayerMute (obj, { id, serverId, input },
 
   if (!server) throw new ExposedError('Server does not exist')
 
-  let data = await playerMute(obj, { id, serverId }, { state }, info)
+  const data = await playerMute(obj, { id, serverId }, { state }, info)
 
   if (!data) throw new ExposedError(`Player mute ${id} does not exist`)
 
   const table = server.config.tables.playerMutes
-  const updateData = { soft: input.soft ? 1 : 0, expires: input.expires, reason: input.reason }
 
-  await server.pool(table).update(updateData).where({ id })
+  await server.pool(table).update({
+    soft: input.soft ? 1 : 0,
+    expires: input.expires,
+    reason: input.reason,
+    updated: server.pool.raw('UNIX_TIMESTAMP()')
+  }).where({ id })
 
-  data = { ...data, ...updateData }
-
-  return data
+  return playerMute(obj, { id, serverId }, { state }, info)
 }

server/test/resolveAppealUpdateBan.mutation.test.js

@@ -56,6 +56,9 @@ describe('Mutation resolveAppealUpdateBan', () => {
     await pool('bm_players').insert(player)
 
     const [id] = await pool('bm_player_bans').insert(punishment, ['id'])
+    const [originalBan] = await pool('bm_player_bans').where({ id })
+    const originalUpdated = originalBan.updated
+
     const data = createAppeal({ ...punishment, id }, 'PlayerBan', server, player)
     const [inserted] = await pool('bm_web_appeals').insert(data, ['id'])
     const appealRole = await setTempRole(setup.dbPool, account, 'player.appeals', 'update.state.any', 'view.any')
@@ -110,6 +113,9 @@ describe('Mutation resolveAppealUpdateBan', () => {
     assert.strictEqual(body.data.resolveAppealUpdateBan.comment.newReason, 'test')
     assert.strictEqual(body.data.resolveAppealUpdateBan.comment.oldExpires, punishment.expires)
     assert.strictEqual(body.data.resolveAppealUpdateBan.comment.newExpires, 1000000000)
+
+    const [updatedBan] = await pool('bm_player_bans').where({ id })
+    assert(updatedBan.updated >= originalUpdated, 'updated timestamp should be updated')
   })
 
   test('should allow update.state.own', async () => {

server/test/resolveAppealUpdateMute.mutation.test.js

@@ -56,6 +56,9 @@ describe('Mutation resolveAppealUpdateMute', () => {
     await pool('bm_players').insert(player)
 
     const [id] = await pool('bm_player_mutes').insert(punishment, ['id'])
+    const [originalMute] = await pool('bm_player_mutes').where({ id })
+    const originalUpdated = originalMute.updated
+
     const data = createAppeal({ ...punishment, id }, 'PlayerMute', server, player)
     const [inserted] = await pool('bm_web_appeals').insert(data, ['id'])
     const appealRole = await setTempRole(setup.dbPool, account, 'player.appeals', 'update.state.any', 'view.any')
@@ -114,6 +117,9 @@ describe('Mutation resolveAppealUpdateMute', () => {
     assert.strictEqual(body.data.resolveAppealUpdateMute.comment.newExpires, 1000000000)
     assert.strictEqual(body.data.resolveAppealUpdateMute.comment.oldSoft, false)
     assert.strictEqual(body.data.resolveAppealUpdateMute.comment.newSoft, true)
+
+    const [updatedMute] = await pool('bm_player_mutes').where({ id })
+    assert(updatedMute.updated >= originalUpdated, 'updated timestamp should be updated')
   })
 
   test('should allow update.state.own', async () => {

server/test/updatePlayerBan.mutation.test.js

@@ -98,6 +98,9 @@ describe('Mutation update player ban', () => {
     await pool('bm_players').insert([player, actor])
     const [inserted] = await pool('bm_player_bans').insert(ban, ['id'])
 
+    const [originalBan] = await pool('bm_player_bans').where({ id: inserted })
+    const originalUpdated = originalBan.updated
+
     const { body, statusCode } = await request
       .post('/graphql')
       .set('Cookie', cookie)
@@ -139,5 +142,8 @@ describe('Mutation update player ban', () => {
     assert.strictEqual(body.data.updatePlayerBan.reason, 'testing updates')
     assert.strictEqual(body.data.updatePlayerBan.expires, 1000000000)
     assert.deepStrictEqual(body.data.updatePlayerBan.acl, { delete: true, update: true, yours: false })
+
+    const [updatedBan] = await pool('bm_player_bans').where({ id: inserted })
+    assert(updatedBan.updated >= originalUpdated, 'updated timestamp should be updated')
   })
 })

server/test/updatePlayerMute.mutation.test.js

@@ -98,6 +98,9 @@ describe('Mutation update player mute', () => {
     await pool('bm_players').insert([player, actor])
     const [inserted] = await pool('bm_player_mutes').insert(mute, ['id'])
 
+    const [originalMute] = await pool('bm_player_mutes').where({ id: inserted })
+    const originalUpdated = originalMute.updated
+
     const { body, statusCode } = await request
       .post('/graphql')
       .set('Cookie', cookie)
@@ -142,5 +145,8 @@ describe('Mutation update player mute', () => {
     assert.strictEqual(body.data.updatePlayerMute.expires, 1000000000)
     assert.strictEqual(body.data.updatePlayerMute.soft, false)
     assert.deepStrictEqual(body.data.updatePlayerMute.acl, { delete: true, update: true, yours: false })
+
+    const [updatedMute] = await pool('bm_player_mutes').where({ id: inserted })
+    assert(updatedMute.updated >= originalUpdated, 'updated timestamp should be updated')
   })
 })