Merge branch 'master' into production

This commit is contained in:
HF 2020-05-02 21:41:17 +02:00
commit 1e5d7863b9

View File

@ -27,11 +27,11 @@ class Ranks {
// recalculate ranking column
await Model.query(
// eslint-disable-next-line max-len
'SET @r=0; UPDATE Users SET ranking= @r:= (@r + 1) WHERE NOT id= 18 ORDER BY totalPixels DESC;',
'SET @r=0; UPDATE Users SET ranking= @r:= (@r + 1) ORDER BY totalPixels DESC;',
);
await Model.query(
// eslint-disable-next-line max-len
'SET @r=0; UPDATE Users SET dailyRanking= @r:= (@r + 1) WHERE NOT id= 18 ORDER BY dailyTotalPixels DESC;',
'SET @r=0; UPDATE Users SET dailyRanking= @r:= (@r + 1) ORDER BY dailyTotalPixels DESC;',
);
// populate dictionaries
const ranking = await RegUser.findAll({