sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

トランザクションを使うようにしたり

Browse Source
This commit is contained in:
syuilo
2019-04-12 01:52:25 +09:00
parent 4198246351
commit 2ff3069d23
12 changed files with 117 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/web/index.ts
View File

@ -16,7 +16,7 @@ import fetchMeta from '../../misc/fetch-meta';
import * as pkg from '../../../package.json';
import { genOpenapiSpec } from '../api/openapi/gen-spec';
import config from '../../config';
import { Users, Notes, Emojis } from '../../models';
import { Users, Notes, Emojis, UserProfiles } from '../../models';
import parseAcct from '../../misc/acct/parse';
import getNoteSummary from '../../misc/get-note-summary';
@ -149,11 +149,14 @@ router.get('/@:user', async (ctx, next) => {
usernameLower: username.toLowerCase(),
host
});
const profile = await UserProfiles.findOne({
userId: user.id
});
if (user != null) {
const meta = await fetchMeta();
await ctx.render('user', {
user,
user, profile,
instanceName: meta.name || 'Misskey'
});
ctx.set('Cache-Control', 'public, max-age=180');

14
src/server/web/views/user.pug
View File

@ -9,12 +9,12 @@ block title
= `${title} | ${instanceName}`
block desc
meta(name='description' content= user.description)
meta(name='description' content= profile.description)
block og
meta(property='og:type' content='blog')
meta(property='og:title' content= title)
meta(property='og:description' content= user.description)
meta(property='og:description' content= profile.description)
meta(property='og:url' content= url)
meta(property='og:image' content= img)
@ -24,12 +24,12 @@ block meta
meta(name='twitter:card' content='summary')
if user.twitter
meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
if profile.twitter
meta(name='twitter:creator' content=`@${profile.twitter.screenName}`)
if !user.host
link(rel='alternate' href=`${config.url}/users/${user._id}` type='application/activity+json')
link(rel='alternate' href=`${config.url}/users/${user.id}` type='application/activity+json')
if user.uri
link(rel='alternate' href=user.uri type='application/activity+json')
if user.url
link(rel='alternate' href=user.url type='text/html')
if profile.url
link(rel='alternate' href=profile.url type='text/html')