graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 13:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Format

Browse source
This commit is contained in:
syuilo 2018-10-29 21:38:09 +09:00
parent 13acf570e7
commit 0d86eef3d7
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/server/api/endpoints/ap/show.ts
View file

@ -41,7 +41,7 @@ async function fetchAny(uri: string) {
// URIがこのサーバーを指しているなら、ローカルユーザーIDとしてDBからフェッチ
if (uri.startsWith(config.url + '/')) {
const id = new mongo.ObjectID(uri.split('/').pop());
const [ user, note ] = await Promise.all([
const [user, note] = await Promise.all([
User.findOne({ _id: id }),
Note.findOne({ _id: id })
]);
@ -52,7 +52,7 @@ async function fetchAny(uri: string) {
// URI(AP Object id)としてDB検索
{
const [ user, note ] = await Promise.all([
const [user, note] = await Promise.all([
User.findOne({ uri: uri }),
Note.findOne({ uri: uri })
]);
@ -68,7 +68,7 @@ async function fetchAny(uri: string) {
// /@user のような正規id以外で取得できるURIが指定されていた場合、ここで初めて正規URIが確定する
// これはDBに存在する可能性があるため再度DB検索
if (uri !== object.id) {
const [ user, note ] = await Promise.all([
const [user, note] = await Promise.all([
User.findOne({ uri: object.id }),
Note.findOne({ uri: object.id })
]);

2
src/services/following/create.ts
View file

@ -13,7 +13,7 @@ import perUserFollowingChart from '../../chart/per-user-following';
export default async function(follower: IUser, followee: IUser, requestId?: string) {
// check blocking
const [ blocking, blocked ] = await Promise.all([
const [blocking, blocked] = await Promise.all([
Blocking.findOne({
blockerId: follower._id,
blockeeId: followee._id,

2
src/services/following/requests/create.ts
View file

@ -9,7 +9,7 @@ import Blocking from '../../../models/blocking';
export default async function(follower: IUser, followee: IUser, requestId?: string) {
// check blocking
const [ blocking, blocked ] = await Promise.all([
const [blocking, blocked] = await Promise.all([
Blocking.findOne({
blockerId: follower._id,
blockeeId: followee._id,