From c6acc5c09ee87d4a4e850733c096d2673b78e1f2 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 21 Oct 2024 06:54:19 +0300
Subject: vnext: WebFinger tests

---
 vnext/server/db/Mastodon.spec.js          | 21 ---------------------
 vnext/server/db/Users.js                  |  5 ++++-
 vnext/server/db/__testdata__/testdata.sql |  1 +
 3 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 vnext/server/db/Mastodon.spec.js
 create mode 100644 vnext/server/db/__testdata__/testdata.sql

(limited to 'vnext/server/db')

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'))
-- 
cgit v1.2.3