From 75b9f31acf75899a5ca95bdeae9fd0a368626fdf Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 20 Aug 2021 20:18:24 +0900
Subject: [PATCH 1/2] fix: import syslog-pro

---
 src/services/logger.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/logger.ts b/src/services/logger.ts
index 032e43c9ca..229be891e1 100644
--- a/src/services/logger.ts
+++ b/src/services/logger.ts
@@ -8,7 +8,7 @@ import { Log } from '@/models/entities/log';
 import { genId } from '@/misc/gen-id';
 import config from '@/config/index';
 
-import SyslogPro from 'syslog-pro';
+import * as SyslogPro from 'syslog-pro';
 
 type Domain = {
 	name: string;

From 1ffee15b8361d532f48f9f0a8d18789765e4ef0e Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Fri, 20 Aug 2021 13:55:12 +0200
Subject: [PATCH 2/2] fix: use correct query generate function (#7657)

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 src/server/api/endpoints/users.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts
index 130ae30244..930dcc7616 100644
--- a/src/server/api/endpoints/users.ts
+++ b/src/server/api/endpoints/users.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import define from '../define';
 import { Users } from '@/models/index';
 import { generateMutedUserQueryForUsers } from '../common/generate-muted-user-query';
-import { generateBlockedUserQuery } from '../common/generate-block-query';
+import { generateBlockQueryForUsers } from '../common/generate-block-query';
 
 export const meta = {
 	tags: ['users'],
@@ -90,7 +90,7 @@ export default define(meta, async (ps, me) => {
 	}
 
 	if (me) generateMutedUserQueryForUsers(query, me);
-	if (me) generateBlockedUserQuery(query, me);
+	if (me) generateBlockQueryForUsers(query, me);
 
 	query.take(ps.limit!);
 	query.skip(ps.offset);