diff options
author | Vitaly Takmazov | 2024-10-21 06:54:19 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2024-10-21 06:54:19 +0300 |
commit | c6acc5c09ee87d4a4e850733c096d2673b78e1f2 (patch) | |
tree | 40137224aeb3cebfed27488a954e3643920dc2ee /vnext/server/db | |
parent | 6f7c755dca704ccf880538b7884473c9c829c2b7 (diff) |
vnext: WebFinger tests
Diffstat (limited to 'vnext/server/db')
-rw-r--r-- | vnext/server/db/Mastodon.spec.js | 21 | ||||
-rw-r--r-- | vnext/server/db/Users.js | 5 | ||||
-rw-r--r-- | vnext/server/db/__testdata__/testdata.sql | 1 |
3 files changed, 5 insertions, 22 deletions
diff --git a/vnext/server/db/Mastodon.spec.js b/vnext/server/db/Mastodon.spec.js deleted file mode 100644 index f2edb40b..00000000 --- a/vnext/server/db/Mastodon.spec.js +++ /dev/null @@ -1,21 +0,0 @@ -import request from 'supertest' -import express from 'express' -import { instance } from '../middleware/mastodon' -import db from './index' - -const app = express() -app.get('/instance', instance) - -describe('Mastodon API middleware', () => { - it('Inactive users should not be included in Instance response', async () => { - await db.query('INSERT INTO users(nick,passw,last_seen) \ - VALUES(\'ugnich\', \'12345\', NULL), \ - (\'freefd\', \'12345\', DATETIME(\'now\'))') - return request(app) - .get('/instance') - .expect(200) - .then(response => { - expect(response.body.usage.users.active_month).toStrictEqual(1) - }) - }) -}) diff --git a/vnext/server/db/Users.js b/vnext/server/db/Users.js index a6148497..3f4422e2 100644 --- a/vnext/server/db/Users.js +++ b/vnext/server/db/Users.js @@ -29,10 +29,13 @@ export const getMonthlyActiveUsers = async () => { } export const getUserByName = async (name = '') => { - return User.findOne({ + return await User.findOne({ where: { nick: { [Op.eq]: name + }, + banned: { + [Op.eq]: 0 } } }) diff --git a/vnext/server/db/__testdata__/testdata.sql b/vnext/server/db/__testdata__/testdata.sql new file mode 100644 index 00000000..f2876732 --- /dev/null +++ b/vnext/server/db/__testdata__/testdata.sql @@ -0,0 +1 @@ +INSERT INTO users(nick,passw,last_seen) VALUES('ugnich', '12345', NULL), ('freefd', '12345', DATETIME('now')) |