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

wip

Browse Source
This commit is contained in:
syuilo
2018-06-02 00:15:17 +09:00
parent 924119651a
commit 484d17f53f
14 changed files with 73 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/server/activitypub.ts
View File

@ -7,7 +7,7 @@ const httpSignature = require('http-signature');
import { createHttp } from '../queue';
import pack from '../remote/activitypub/renderer';
import Note from '../models/note';
import User, { isLocalUser } from '../models/user';
import User, { isLocalUser, ILocalUser } from '../models/user';
import renderNote from '../remote/activitypub/renderer/note';
import renderKey from '../remote/activitypub/renderer/key';
import renderPerson from '../remote/activitypub/renderer/person';
@ -69,7 +69,10 @@ router.get('/notes/:note', async (ctx, next) => {
router.get('/users/:user/outbox', async ctx => {
const userId = new mongo.ObjectID(ctx.params.user);
const user = await User.findOne({ _id: userId });
const user = await User.findOne({
_id: userId,
host: null
});
if (user === null) {
ctx.status = 404;
@ -91,7 +94,10 @@ router.get('/users/:user/outbox', async ctx => {
router.get('/users/:user/publickey', async ctx => {
const userId = new mongo.ObjectID(ctx.params.user);
const user = await User.findOne({ _id: userId });
const user = await User.findOne({
_id: userId,
host: null
});
if (user === null) {
ctx.status = 404;
@ -109,14 +115,17 @@ router.get('/users/:user/publickey', async ctx => {
router.get('/users/:user', async ctx => {
const userId = new mongo.ObjectID(ctx.params.user);
const user = await User.findOne({ _id: userId });
const user = await User.findOne({
_id: userId,
host: null
});
if (user === null) {
ctx.status = 404;
return;
}
ctx.body = pack(renderPerson(user));
ctx.body = pack(renderPerson(user as ILocalUser));
});
// follow form

4
src/server/api/endpoints.ts
View File

@ -449,12 +449,12 @@ const endpoints: Endpoint[] = [
kind: 'following-write'
},
{
name: 'following/request/accept',
name: 'following/requests/accept',
withCredential: true,
kind: 'following-write'
},
{
name: 'following/request/reject',
name: 'following/requests/reject',
withCredential: true,
kind: 'following-write'
},

2
src/server/api/endpoints/following/request/accept.ts → src/server/api/endpoints/following/requests/accept.ts
View File

@ -1,5 +1,5 @@
import $ from 'cafy'; import ID from '../../../../../cafy-id';
import acceptFollowRequest from '../../../../../services/user/accept-follow-request';
import acceptFollowRequest from '../../../../../services/following/requests/accept';
import User from '../../../../../models/user';
/**

2
src/server/api/endpoints/following/request/reject.ts → src/server/api/endpoints/following/requests/reject.ts
View File

@ -1,5 +1,5 @@
import $ from 'cafy'; import ID from '../../../../../cafy-id';
import rejectFollowRequest from '../../../../../services/user/reject-follow-request';
import rejectFollowRequest from '../../../../../services/following/requests/reject';
import User from '../../../../../models/user';
/**

2
src/server/api/endpoints/i/update.ts
View File

@ -5,7 +5,7 @@ import $ from 'cafy'; import ID from '../../../../cafy-id';
import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
import event from '../../../../publishers/stream';
import DriveFile from '../../../../models/drive-file';
import acceptAllFollowRequests from '../../../../services/user/accept-all-follow-requests';
import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
/**
* Update myself