summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/renderer/note.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-04-07 21:50:36 +0900
committerGitHub <noreply@github.com>2019-04-07 21:50:36 +0900
commitf0a29721c9fb10f97faf386bc9d6b1b2fad97895 (patch)
treeb5c1d38d698589bb444c0881a431391db91eb5bc /src/remote/activitypub/renderer/note.ts
parentUpdate README.md [AUTOGEN] (#4639) (diff)
downloadmisskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.gz
misskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.bz2
misskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.zip
Use PostgreSQL instead of MongoDB (#4572)
* wip * Update note.ts * Update timeline.ts * Update core.ts * wip * Update generate-visibility-query.ts * wip * wip * wip * wip * wip * Update global-timeline.ts * wip * wip * wip * Update vote.ts * wip * wip * Update create.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update files.ts * wip * wip * Update CONTRIBUTING.md * wip * wip * wip * wip * wip * wip * wip * wip * Update read-notification.ts * wip * wip * wip * wip * wip * wip * wip * Update cancel.ts * wip * wip * wip * Update show.ts * wip * wip * Update gen-id.ts * Update create.ts * Update id.ts * wip * wip * wip * wip * wip * wip * wip * Docker: Update files about Docker (#4599) * Docker: Use cache if files used by `yarn install` was not updated This patch reduces the number of times to installing node_modules. For example, `yarn install` step will be skipped when only ".config/default.yml" is updated. * Docker: Migrate MongoDB to Postgresql Misskey uses Postgresql as a database instead of Mongodb since version 11. * Docker: Uncomment about data persistence This patch will save a lot of databases. * wip * wip * wip * Update activitypub.ts * wip * wip * wip * Update logs.ts * wip * Update drive-file.ts * Update register.ts * wip * wip * Update mentions.ts * wip * wip * wip * Update recommendation.ts * wip * Update index.ts * wip * Update recommendation.ts * Doc: Update docker.ja.md and docker.en.md (#1) (#4608) Update how to set up misskey. * wip * :v: * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * :pizza: * wip * Ad notes * wip * Update api-visibility.ts * Update note.ts * Update add-file.ts * tests * tests * Update postgre.ts * Update utils.ts * wip * wip * Refactor * wip * Refactor * wip * wip * Update show-users.ts * Update update-instance.ts * wip * Update feed.ts * Update outbox.ts * Update outbox.ts * Update user.ts * wip * Update list.ts * Update update-hashtag.ts * wip * Update update-hashtag.ts * Refactor * Update update.ts * wip * wip * :v: * clean up * docs * Update push.ts * wip * Update api.ts * wip * :v: * Update make-pagination-query.ts * :v: * Delete hashtags.ts * Update instances.ts * Update instances.ts * Update create.ts * Update search.ts * Update reversi-game.ts * Update signup.ts * Update user.ts * id * Update example.yml * :art: * objectid * fix * reversi * reversi * Fix bug of chart engine * Add test of chart engine * Improve test * Better testing * Improve chart engine * Refactor * Add test of chart engine * Refactor * Add chart test * Fix bug * コミットし忘れ * Refactoring * :v: * Add tests * Add test * Extarct note tests * Refactor * 存在しないユーザーにメンションできなくなっていた問題を修正 * Fix bug * Update update-meta.ts * Fix bug * Update mention.vue * Fix bug * Update meta.ts * Update CONTRIBUTING.md * Fix bug * Fix bug * Fix bug * Clean up * Clean up * Update notification.ts * Clean up * Add mute tests * Add test * Refactor * Add test * Fix test * Refactor * Refactor * Add tests * Update utils.ts * Update utils.ts * Fix test * Update package.json * Update update.ts * Update manifest.ts * Fix bug * Fix bug * Add test * :art: * Update endpoint permissions * Updaye permisison * Update person.ts #4299 * データベースと同期しないように * Fix bug * Fix bug * Update reversi-game.ts * Use a feature of Node v11.7.0 to extract a public key (#4644) * wip * wip * :v: * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * :sushi: * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * :clock4: * Fix bug * Add test * Add test * rename * Fix bug
Diffstat (limited to 'src/remote/activitypub/renderer/note.ts')
-rw-r--r--src/remote/activitypub/renderer/note.ts89
1 files changed, 40 insertions, 49 deletions
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts
index 8b349526e1..5b36366b28 100644
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@@ -3,29 +3,27 @@ import renderHashtag from './hashtag';
import renderMention from './mention';
import renderEmoji from './emoji';
import config from '../../../config';
-import DriveFile, { IDriveFile } from '../../../models/drive-file';
-import Note, { INote } from '../../../models/note';
-import User from '../../../models/user';
import toHtml from '../misc/get-note-html';
-import Emoji, { IEmoji } from '../../../models/emoji';
+import { Note, IMentionedRemoteUsers } from '../../../models/entities/note';
+import { DriveFile } from '../../../models/entities/drive-file';
+import { DriveFiles, Notes, Users, Emojis, Polls } from '../../../models';
+import { In } from 'typeorm';
+import { Emoji } from '../../../models/entities/emoji';
+import { Poll } from '../../../models/entities/poll';
-export default async function renderNote(note: INote, dive = true): Promise<any> {
- const promisedFiles: Promise<IDriveFile[]> = note.fileIds
- ? DriveFile.find({ _id: { $in: note.fileIds } })
+export default async function renderNote(note: Note, dive = true): Promise<any> {
+ const promisedFiles: Promise<DriveFile[]> = note.fileIds.length > 1
+ ? DriveFiles.find({ id: In(note.fileIds) })
: Promise.resolve([]);
let inReplyTo;
- let inReplyToNote: INote;
+ let inReplyToNote: Note;
if (note.replyId) {
- inReplyToNote = await Note.findOne({
- _id: note.replyId,
- });
+ inReplyToNote = await Notes.findOne(note.replyId);
if (inReplyToNote !== null) {
- const inReplyToUser = await User.findOne({
- _id: inReplyToNote.userId,
- });
+ const inReplyToUser = await Users.findOne(inReplyToNote.userId);
if (inReplyToUser !== null) {
if (inReplyToNote.uri) {
@@ -34,7 +32,7 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
if (dive) {
inReplyTo = await renderNote(inReplyToNote, false);
} else {
- inReplyTo = `${config.url}/notes/${inReplyToNote._id}`;
+ inReplyTo = `${config.url}/notes/${inReplyToNote.id}`;
}
}
}
@@ -46,24 +44,20 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
let quote;
if (note.renoteId) {
- const renote = await Note.findOne({
- _id: note.renoteId,
- });
+ const renote = await Notes.findOne(note.renoteId);
if (renote) {
- quote = renote.uri ? renote.uri : `${config.url}/notes/${renote._id}`;
+ quote = renote.uri ? renote.uri : `${config.url}/notes/${renote.id}`;
}
}
- const user = await User.findOne({
- _id: note.userId
+ const user = await Users.findOne({
+ id: note.userId
});
- const attributedTo = `${config.url}/users/${user._id}`;
+ const attributedTo = `${config.url}/users/${user.id}`;
- const mentions = note.mentionedRemoteUsers && note.mentionedRemoteUsers.length > 0
- ? note.mentionedRemoteUsers.map(x => x.uri)
- : [];
+ const mentions = (JSON.parse(note.mentionedRemoteUsers) as IMentionedRemoteUsers).map(x => x.uri);
let to: string[] = [];
let cc: string[] = [];
@@ -81,10 +75,8 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
to = mentions;
}
- const mentionedUsers = note.mentions ? await User.find({
- _id: {
- $in: note.mentions
- }
+ const mentionedUsers = note.mentions.length > 0 ? await Users.find({
+ id: In(note.mentions)
}) : [];
const hashtagTags = (note.tags || []).map(tag => renderHashtag(tag));
@@ -93,23 +85,28 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
const files = await promisedFiles;
let text = note.text;
+ let poll: Poll;
+
+ if (note.hasPoll) {
+ poll = await Polls.findOne({ noteId: note.id });
+ }
let question: string;
- if (note.poll != null) {
+ if (poll) {
if (text == null) text = '';
- const url = `${config.url}/notes/${note._id}`;
+ const url = `${config.url}/notes/${note.id}`;
// TODO: i18n
text += `\n[リモートで結果を表示](${url})`;
- question = `${config.url}/questions/${note._id}`;
+ question = `${config.url}/questions/${note.id}`;
}
let apText = text;
if (apText == null) apText = '';
// Provides choices as text for AP
- if (note.poll != null) {
- const cs = note.poll.choices.map(c => `${c.id}: ${c.text}`);
+ if (poll) {
+ const cs = poll.choices.map((c, i) => `${i}: ${c}`);
apText += '\n----------------------------------------\n';
apText += cs.join('\n');
apText += '\n----------------------------------------\n';
@@ -135,31 +132,25 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
...apemojis,
];
- const {
- choices = [],
- expiresAt = null,
- multiple = false
- } = note.poll || {};
-
- const asPoll = note.poll ? {
+ const asPoll = poll ? {
type: 'Question',
content: toHtml(Object.assign({}, note, {
text: text
})),
_misskey_fallback_content: content,
- [expiresAt && expiresAt < new Date() ? 'closed' : 'endTime']: expiresAt,
- [multiple ? 'anyOf' : 'oneOf']: choices.map(({ text, votes }) => ({
+ [poll.expiresAt && poll.expiresAt < new Date() ? 'closed' : 'endTime']: poll.expiresAt,
+ [poll.multiple ? 'anyOf' : 'oneOf']: poll.choices.map((text, i) => ({
type: 'Note',
name: text,
replies: {
type: 'Collection',
- totalItems: votes
+ totalItems: poll.votes[i]
}
}))
} : {};
return {
- id: `${config.url}/notes/${note._id}`,
+ id: `${config.url}/notes/${note.id}`,
type: 'Note',
attributedTo,
summary,
@@ -172,17 +163,17 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
cc,
inReplyTo,
attachment: files.map(renderDocument),
- sensitive: files.some(file => file.metadata.isSensitive),
+ sensitive: files.some(file => file.isSensitive),
tag,
...asPoll
};
}
-export async function getEmojis(names: string[]): Promise<IEmoji[]> {
- if (names == null || names.length < 1) return [];
+export async function getEmojis(names: string[]): Promise<Emoji[]> {
+ if (names == null || names.length === 0) return [];
const emojis = await Promise.all(
- names.map(name => Emoji.findOne({
+ names.map(name => Emojis.findOne({
name,
host: null
}))