sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
syuilo
2019-02-22 14:02:56 +09:00
parent e8d2959717
commit be3298639d
27 changed files with 98 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/api/endpoints/users/get_frequently_replied_users.ts
View File

@ -6,6 +6,7 @@ import define from '../../define';
import { maximum } from '../../../../prelude/array';
import { getHideUserIds } from '../../common/get-hide-users';
import { ApiError } from '../../error';
import { getUser } from '../../common/getters';
export const meta = {
requireCredential: false,
@ -37,18 +38,11 @@ export const meta = {
export default define(meta, async (ps, me) => {
// Lookup user
const user = await User.findOne({
_id: ps.userId
}, {
fields: {
_id: true
}
const user = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (user === null) {
throw new ApiError(meta.errors.noSuchUser);
}
// Fetch recent notes
const recentNotes = await Note.find({
userId: user._id,

10
src/server/api/endpoints/users/lists/pull.ts
View File

@ -5,6 +5,7 @@ import User, { pack as packUser } from '../../../../../models/user';
import { publishUserListStream } from '../../../../../services/stream';
import define from '../../../define';
import { ApiError } from '../../../error';
import { getUser } from '../../../common/getters';
export const meta = {
desc: {
@ -59,14 +60,11 @@ export default define(meta, async (ps, me) => {
}
// Fetch the user
const user = await User.findOne({
_id: ps.userId
const user = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (user == null) {
throw new ApiError(meta.errors.noSuchUser);
}
// Pull the user
await UserList.update({ _id: userList._id }, {
$pull: {

10
src/server/api/endpoints/users/lists/push.ts
View File

@ -8,6 +8,7 @@ import renderFollow from '../../../../../remote/activitypub/renderer/follow';
import { deliver } from '../../../../../queue';
import define from '../../../define';
import { ApiError } from '../../../error';
import { getUser } from '../../../common/getters';
export const meta = {
desc: {
@ -68,14 +69,11 @@ export default define(meta, async (ps, me) => {
}
// Fetch the user
const user = await User.findOne({
_id: ps.userId
const user = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (user == null) {
throw new ApiError(meta.errors.noSuchUser);
}
if (userList.userIds.map(id => id.toHexString()).includes(user._id.toHexString())) {
throw new ApiError(meta.errors.alreadyAdded);
}

12
src/server/api/endpoints/users/notes.ts
View File

@ -5,6 +5,7 @@ import User from '../../../../models/user';
import define from '../../define';
import Following from '../../../../models/following';
import { ApiError } from '../../error';
import { getUser } from '../../common/getters';
export const meta = {
desc: {
@ -135,16 +136,11 @@ export const meta = {
export default define(meta, async (ps, me) => {
// Lookup user
const user = await User.findOne({ _id: ps.userId }, {
fields: {
_id: true
}
const user = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (user === null) {
throw new ApiError(meta.errors.noSuchUser);
}
const isFollowing = me == null ? false : ((await Following.findOne({
followerId: me._id,
followeeId: user._id

10
src/server/api/endpoints/users/report-abuse.ts
View File

@ -5,6 +5,7 @@ import User from '../../../../models/user';
import AbuseUserReport from '../../../../models/abuse-user-report';
import { publishAdminStream } from '../../../../services/stream';
import { ApiError } from '../../error';
import { getUser } from '../../common/getters';
export const meta = {
desc: {
@ -54,14 +55,11 @@ export const meta = {
export default define(meta, async (ps, me) => {
// Lookup user
const user = await User.findOne({
_id: ps.userId
const user = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (user === null) {
throw new ApiError(meta.errors.noSuchUser);
}
if (user._id.equals(me._id)) {
throw new ApiError(meta.errors.cannotReportYourself);
}