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 * ✌️ * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * 🍕 * 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 * ✌️ * clean up * docs * Update push.ts * wip * Update api.ts * wip * ✌️ * Update make-pagination-query.ts * ✌️ * 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 * 🎨 * 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 * ✌️ * 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 * 🎨 * 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 * ✌️ * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * 🍣 * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * 🕓 * Fix bug * Add test * Add test * rename * Fix bug
This commit is contained in:
syuilo
GitHub
@ -1,25 +1,23 @@
|
||||
import { Feed } from 'feed';
|
||||
import config from '../../config';
|
||||
import Note from '../../models/note';
|
||||
import { IUser } from '../../models/user';
|
||||
import { getOriginalUrl } from '../../misc/get-drive-file-url';
|
||||
import { User } from '../../models/entities/user';
|
||||
import { Notes, DriveFiles } from '../../models';
|
||||
import { In } from 'typeorm';
|
||||
|
||||
export default async function(user: IUser) {
|
||||
export default async function(user: User) {
|
||||
const author: Author = {
|
||||
link: `${config.url}/@${user.username}`,
|
||||
name: user.name || user.username
|
||||
};
|
||||
|
||||
const notes = await Note.find({
|
||||
userId: user._id,
|
||||
renoteId: null,
|
||||
$or: [
|
||||
{ visibility: 'public' },
|
||||
{ visibility: 'home' }
|
||||
]
|
||||
}, {
|
||||
sort: { createdAt: -1 },
|
||||
limit: 20
|
||||
const notes = await Notes.find({
|
||||
where: {
|
||||
userId: user.id,
|
||||
renoteId: null,
|
||||
visibility: In(['public', 'home'])
|
||||
},
|
||||
order: { createdAt: -1 },
|
||||
take: 20
|
||||
});
|
||||
|
||||
const feed = new Feed({
|
||||
@ -38,15 +36,18 @@ export default async function(user: IUser) {
|
||||
} as FeedOptions);
|
||||
|
||||
for (const note of notes) {
|
||||
const file = note._files && note._files.find(file => file.contentType.startsWith('image/'));
|
||||
const files = note.fileIds.length > 0 ? await DriveFiles.find({
|
||||
id: In(note.fileIds)
|
||||
}) : [];
|
||||
const file = files.find(file => file.type.startsWith('image/'));
|
||||
|
||||
feed.addItem({
|
||||
title: `New note by ${author.name}`,
|
||||
link: `${config.url}/notes/${note._id}`,
|
||||
link: `${config.url}/notes/${note.id}`,
|
||||
date: note.createdAt,
|
||||
description: note.cw,
|
||||
content: note.text,
|
||||
image: file && getOriginalUrl(file)
|
||||
image: file ? DriveFiles.getPublicUrl(file) : null
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -9,19 +9,16 @@ import * as Router from 'koa-router';
|
||||
import * as send from 'koa-send';
|
||||
import * as favicon from 'koa-favicon';
|
||||
import * as views from 'koa-views';
|
||||
import { ObjectID } from 'mongodb';
|
||||
|
||||
import docs from './docs';
|
||||
import packFeed from './feed';
|
||||
import User from '../../models/user';
|
||||
import parseAcct from '../../misc/acct/parse';
|
||||
import config from '../../config';
|
||||
import Note, { pack as packNote } from '../../models/note';
|
||||
import getNoteSummary from '../../misc/get-note-summary';
|
||||
import fetchMeta from '../../misc/fetch-meta';
|
||||
import Emoji from '../../models/emoji';
|
||||
import * as pkg from '../../../package.json';
|
||||
import { genOpenapiSpec } from '../api/openapi/gen-spec';
|
||||
import config from '../../config';
|
||||
import { Users, Notes, Emojis } from '../../models';
|
||||
import parseAcct from '../../misc/acct/parse';
|
||||
import getNoteSummary from '../../misc/get-note-summary';
|
||||
|
||||
const client = `${__dirname}/../../client/`;
|
||||
|
||||
@ -100,7 +97,7 @@ router.get('/api.json', async ctx => {
|
||||
|
||||
const getFeed = async (acct: string) => {
|
||||
const { username, host } = parseAcct(acct);
|
||||
const user = await User.findOne({
|
||||
const user = await Users.findOne({
|
||||
usernameLower: username.toLowerCase(),
|
||||
host
|
||||
});
|
||||
@ -148,7 +145,7 @@ router.get('/@:user.json', async ctx => {
|
||||
// User
|
||||
router.get('/@:user', async (ctx, next) => {
|
||||
const { username, host } = parseAcct(ctx.params.user);
|
||||
const user = await User.findOne({
|
||||
const user = await Users.findOne({
|
||||
usernameLower: username.toLowerCase(),
|
||||
host
|
||||
});
|
||||
@ -157,7 +154,7 @@ router.get('/@:user', async (ctx, next) => {
|
||||
const meta = await fetchMeta();
|
||||
await ctx.render('user', {
|
||||
user,
|
||||
instanceName: meta.name
|
||||
instanceName: meta.name || 'Misskey'
|
||||
});
|
||||
ctx.set('Cache-Control', 'public, max-age=180');
|
||||
} else {
|
||||
@ -167,19 +164,12 @@ router.get('/@:user', async (ctx, next) => {
|
||||
});
|
||||
|
||||
router.get('/users/:user', async ctx => {
|
||||
if (!ObjectID.isValid(ctx.params.user)) {
|
||||
ctx.status = 404;
|
||||
return;
|
||||
}
|
||||
|
||||
const userId = new ObjectID(ctx.params.user);
|
||||
|
||||
const user = await User.findOne({
|
||||
_id: userId,
|
||||
const user = await Users.findOne({
|
||||
id: ctx.params.user,
|
||||
host: null
|
||||
});
|
||||
|
||||
if (user === null) {
|
||||
if (user == null) {
|
||||
ctx.status = 404;
|
||||
return;
|
||||
}
|
||||
@ -189,26 +179,24 @@ router.get('/users/:user', async ctx => {
|
||||
|
||||
// Note
|
||||
router.get('/notes/:note', async ctx => {
|
||||
if (ObjectID.isValid(ctx.params.note)) {
|
||||
const note = await Note.findOne({ _id: ctx.params.note });
|
||||
const note = await Notes.findOne(ctx.params.note);
|
||||
|
||||
if (note) {
|
||||
const _note = await packNote(note);
|
||||
const meta = await fetchMeta();
|
||||
await ctx.render('note', {
|
||||
note: _note,
|
||||
summary: getNoteSummary(_note),
|
||||
instanceName: meta.name
|
||||
});
|
||||
if (note) {
|
||||
const _note = await Notes.pack(note);
|
||||
const meta = await fetchMeta();
|
||||
await ctx.render('note', {
|
||||
note: _note,
|
||||
summary: getNoteSummary(_note),
|
||||
instanceName: meta.name || 'Misskey'
|
||||
});
|
||||
|
||||
if (['public', 'home'].includes(note.visibility)) {
|
||||
ctx.set('Cache-Control', 'public, max-age=180');
|
||||
} else {
|
||||
ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
|
||||
}
|
||||
|
||||
return;
|
||||
if (['public', 'home'].includes(note.visibility)) {
|
||||
ctx.set('Cache-Control', 'public, max-age=180');
|
||||
} else {
|
||||
ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
ctx.status = 404;
|
||||
@ -217,10 +205,8 @@ router.get('/notes/:note', async ctx => {
|
||||
|
||||
router.get('/info', async ctx => {
|
||||
const meta = await fetchMeta();
|
||||
const emojis = await Emoji.find({ host: null }, {
|
||||
fields: {
|
||||
_id: false
|
||||
}
|
||||
const emojis = await Emojis.find({
|
||||
where: { host: null }
|
||||
});
|
||||
await ctx.render('info', {
|
||||
version: pkg.version,
|
||||
@ -232,7 +218,9 @@ router.get('/info', async ctx => {
|
||||
cores: os.cpus().length
|
||||
},
|
||||
emojis: emojis,
|
||||
meta: meta
|
||||
meta: meta,
|
||||
originalUsersCount: await Users.count({ host: null }),
|
||||
originalNotesCount: await Notes.count({ userHost: null })
|
||||
});
|
||||
});
|
||||
|
||||
@ -247,7 +235,7 @@ router.get('*', async ctx => {
|
||||
const meta = await fetchMeta();
|
||||
await ctx.render('base', {
|
||||
img: meta.bannerUrl,
|
||||
title: meta.name,
|
||||
title: meta.name || 'Misskey',
|
||||
desc: meta.description,
|
||||
icon: meta.iconUrl
|
||||
});
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
import * as Koa from 'koa';
|
||||
import * as manifest from '../../client/assets/manifest.json';
|
||||
import * as deepcopy from 'deepcopy';
|
||||
import fetchMeta from '../../misc/fetch-meta';
|
||||
|
||||
module.exports = async (ctx: Koa.BaseContext) => {
|
||||
const json = deepcopy(manifest);
|
||||
const json = JSON.parse(JSON.stringify(manifest));
|
||||
|
||||
const instance = await fetchMeta();
|
||||
|
||||
|
||||
@ -70,15 +70,15 @@ html
|
||||
table
|
||||
tr
|
||||
th Instance
|
||||
td= meta.name
|
||||
td= meta.name || 'Misskey'
|
||||
tr
|
||||
th Description
|
||||
td= meta.description
|
||||
tr
|
||||
th Maintainer
|
||||
td
|
||||
= meta.maintainer.name
|
||||
| <#{meta.maintainer.email}>
|
||||
= meta.maintainerName
|
||||
| <#{meta.maintainerEmail}>
|
||||
tr
|
||||
th System
|
||||
td= os
|
||||
@ -93,10 +93,10 @@ html
|
||||
td= cpu.model
|
||||
tr
|
||||
th Original users
|
||||
td= meta.stats.originalUsersCount
|
||||
td= originalUsersCount
|
||||
tr
|
||||
th Original notes
|
||||
td= meta.stats.originalNotesCount
|
||||
td= originalNotesCount
|
||||
tr
|
||||
th Registration
|
||||
td= !meta.disableRegistration ? 'yes' : 'no'
|
||||
|
||||
Reference in New Issue
Block a user