mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-14 13:13:08 +02:00
725600da8f
* Start working * WIP: Enhance poll * Fix bug * Use `name` in voting note refs: https://github.com/syuilo/misskey/issues/4407#issuecomment-469057296 * Fix style * Refactor Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com> * WIP: Update poll editor * Fix bug * Fix bug refs: https://github.com/syuilo/misskey/pull/4409#discussion_r * Fix typo * Better design * Beautify poll editor * Fix UI * Fix bug refs: https://github.com/syuilo/misskey/pull/4409#discussion_r262217524 * Add debug logging * Fix bug * Log deliver * fix vote * Update ap/show refs: https://github.com/syuilo/misskey/pull/4409#issuecomment-469652386 * Update poll view * Maybe done * Add tests * Fix path * Fix test * Fix test * Fix test * Fix expired check on AP * Update note.ts * Squashed commit of the following: commit d9a4beabf851893b8992a0f4568265eb9d4f0b8e Author: mei23 <m@m544.net> Date: Wed Mar 6 05:16:14 2019 +0900 tune commit 83ff421a6e978243f80ba9ec820189bc897e6e3b Author: mei23 <m@m544.net> Date: Wed Mar 6 05:01:14 2019 +0900 fallback commit 0b566af973b115ade9e75ea4b8094ee2b329dabc Author: mei23 <m@m544.net> Date: Wed Mar 6 04:40:12 2019 +0900 Note commit cc0296dd6127580ac584c40398db3f762a311f8b Author: mei23 <m@m544.net> Date: Wed Mar 6 04:33:58 2019 +0900 createで送る * Squashed commit of the following: commit ae696b1ed12568b27c27367ac5a77035c97c9a1f Author: mei23 <m@m544.net> Date: Wed Mar 6 06:11:17 2019 +0900 fix commit b735e354e7a9e64534c4f17d04ecbc65fb735c21 Author: mei23 <m@m544.net> Date: Wed Mar 6 06:08:33 2019 +0900 messge commit d9a4beabf851893b8992a0f4568265eb9d4f0b8e Author: mei23 <m@m544.net> Date: Wed Mar 6 05:16:14 2019 +0900 tune commit 83ff421a6e978243f80ba9ec820189bc897e6e3b Author: mei23 <m@m544.net> Date: Wed Mar 6 05:01:14 2019 +0900 fallback commit 0b566af973b115ade9e75ea4b8094ee2b329dabc Author: mei23 <m@m544.net> Date: Wed Mar 6 04:40:12 2019 +0900 Note commit cc0296dd6127580ac584c40398db3f762a311f8b Author: mei23 <m@m544.net> Date: Wed Mar 6 04:33:58 2019 +0900 createで送る * Fix typo * Update vote.ts * Update vote.ts * Update poll-editor.vue * Update tslint.json * Fix layout * Add note * Fix bug * Rename text key * 投票するときに投稿として扱わないように (#4425) * wip * 形式をMastodonと合わせた * Bye something * Use - instead of ~ * Redundancy * Yes! * Refactor * Use moment instead of Date * Fix indent * Refactor if (votes.length) は必要なさそう * Clean up * Bye Date * Clean * Fix timer is not displayed * Fix リモートから無期限pollにvoteできない * Fix vote actor
127 lines
3.1 KiB
TypeScript
127 lines
3.1 KiB
TypeScript
import $ from 'cafy';
|
|
import define from '../../define';
|
|
import config from '../../../../config';
|
|
import * as mongo from 'mongodb';
|
|
import User, { pack as packUser, IUser } from '../../../../models/user';
|
|
import { createPerson } from '../../../../remote/activitypub/models/person';
|
|
import Note, { pack as packNote, INote } from '../../../../models/note';
|
|
import { createNote } from '../../../../remote/activitypub/models/note';
|
|
import Resolver from '../../../../remote/activitypub/resolver';
|
|
import { ApiError } from '../../error';
|
|
|
|
export const meta = {
|
|
tags: ['federation'],
|
|
|
|
desc: {
|
|
'ja-JP': 'URIを指定してActivityPubオブジェクトを参照します。'
|
|
},
|
|
|
|
requireCredential: false,
|
|
|
|
params: {
|
|
uri: {
|
|
validator: $.str,
|
|
desc: {
|
|
'ja-JP': 'ActivityPubオブジェクトのURI'
|
|
}
|
|
},
|
|
},
|
|
|
|
errors: {
|
|
noSuchObject: {
|
|
message: 'No such object.',
|
|
code: 'NO_SUCH_OBJECT',
|
|
id: 'dc94d745-1262-4e63-a17d-fecaa57efc82'
|
|
}
|
|
}
|
|
};
|
|
|
|
export default define(meta, async (ps) => {
|
|
const object = await fetchAny(ps.uri);
|
|
if (object) {
|
|
return object;
|
|
} else {
|
|
throw new ApiError(meta.errors.noSuchObject);
|
|
}
|
|
});
|
|
|
|
/***
|
|
* URIからUserかNoteを解決する
|
|
*/
|
|
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([
|
|
User.findOne({ _id: id }),
|
|
Note.findOne({ _id: id })
|
|
]);
|
|
|
|
const packed = await mergePack(user, note);
|
|
if (packed !== null) return packed;
|
|
}
|
|
|
|
// URI(AP Object id)としてDB検索
|
|
{
|
|
const [user, note] = await Promise.all([
|
|
User.findOne({ uri: uri }),
|
|
Note.findOne({ uri: uri })
|
|
]);
|
|
|
|
const packed = await mergePack(user, note);
|
|
if (packed !== null) return packed;
|
|
}
|
|
|
|
// リモートから一旦オブジェクトフェッチ
|
|
const resolver = new Resolver();
|
|
const object = await resolver.resolve(uri) as any;
|
|
|
|
// /@user のような正規id以外で取得できるURIが指定されていた場合、ここで初めて正規URIが確定する
|
|
// これはDBに存在する可能性があるため再度DB検索
|
|
if (uri !== object.id) {
|
|
const [user, note] = await Promise.all([
|
|
User.findOne({ uri: object.id }),
|
|
Note.findOne({ uri: object.id })
|
|
]);
|
|
|
|
const packed = await mergePack(user, note);
|
|
if (packed !== null) return packed;
|
|
}
|
|
|
|
// それでもみつからなければ新規であるため登録
|
|
if (object.type === 'Person') {
|
|
const user = await createPerson(object.id);
|
|
return {
|
|
type: 'User',
|
|
object: await packUser(user, null, { detail: true })
|
|
};
|
|
}
|
|
|
|
if (['Note', 'Question'].includes(object.type)) {
|
|
const note = await createNote(object.id);
|
|
return {
|
|
type: 'Note',
|
|
object: await packNote(note, null, { detail: true })
|
|
};
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
async function mergePack(user: IUser, note: INote) {
|
|
if (user !== null) {
|
|
return {
|
|
type: 'User',
|
|
object: await packUser(user, null, { detail: true })
|
|
};
|
|
}
|
|
|
|
if (note !== null) {
|
|
return {
|
|
type: 'Note',
|
|
object: await packNote(note, null, { detail: true })
|
|
};
|
|
}
|
|
|
|
return null;
|
|
}
|