mirror of
https://github.com/sim1222/misskey.git
synced 2025-08-08 09:43:51 +09:00
Resolve conflicts
This commit is contained in:
@ -15,10 +15,10 @@ import User from '../models/user';
|
||||
* schema:
|
||||
* type: object
|
||||
* properties:
|
||||
* posts_count:
|
||||
* postsCount:
|
||||
* description: count of all posts of misskey
|
||||
* type: number
|
||||
* users_count:
|
||||
* usersCount:
|
||||
* description: count of all users of misskey
|
||||
* type: number
|
||||
*
|
||||
@ -42,7 +42,7 @@ module.exports = params => new Promise(async (res, rej) => {
|
||||
.count();
|
||||
|
||||
res({
|
||||
posts_count: postsCount,
|
||||
users_count: usersCount
|
||||
postsCount: postsCount,
|
||||
usersCount: usersCount
|
||||
});
|
||||
});
|
||||
|
Reference in New Issue
Block a user