summaryrefslogtreecommitdiff
path: root/src/server/web
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-04-13 01:43:22 +0900
committerGitHub <noreply@github.com>2019-04-13 01:43:22 +0900
commit987168b863c52d0548050ffbac569782bb9a8cef (patch)
treec9aa2243dcdcbd044688d201a51c601574bff259 /src/server/web
parentFix bug (diff)
downloadsharkey-987168b863c52d0548050ffbac569782bb9a8cef.tar.gz
sharkey-987168b863c52d0548050ffbac569782bb9a8cef.tar.bz2
sharkey-987168b863c52d0548050ffbac569782bb9a8cef.zip
strictNullChecks (#4666)
* wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip
Diffstat (limited to 'src/server/web')
-rw-r--r--src/server/web/docs.ts6
-rw-r--r--src/server/web/feed.ts9
-rw-r--r--src/server/web/index.ts5
-rw-r--r--src/server/web/url-preview.ts2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts
index d9ba14a8ed..374dbf3bd2 100644
--- a/src/server/web/docs.ts
+++ b/src/server/web/docs.ts
@@ -34,14 +34,14 @@ async function genVars(lang: string): Promise<{ [key: string]: any }> {
const docs = glob.sync(`src/docs/**/*.${lang}.md`, { cwd });
vars['docs'] = {};
for (const x of docs) {
- const [, name] = x.match(/docs\/(.+?)\.(.+?)\.md$/);
+ const [, name] = x.match(/docs\/(.+?)\.(.+?)\.md$/)!;
if (vars['docs'][name] == null) {
vars['docs'][name] = {
name,
title: {}
};
}
- vars['docs'][name]['title'][lang] = fs.readFileSync(cwd + x, 'utf-8').match(/^# (.+?)\r?\n/)[1];
+ vars['docs'][name]['title'][lang] = fs.readFileSync(cwd + x, 'utf-8').match(/^# (.+?)\r?\n/)![1];
}
vars['kebab'] = (string: string) => string.replace(/([a-z])([A-Z])/g, '$1-$2').replace(/\s+/g, '-').toLowerCase();
@@ -97,7 +97,7 @@ router.get('/*/*', async ctx => {
await ctx.render('../../../../src/docs/article', Object.assign({
id: doc,
html: conv.makeHtml(md),
- title: md.match(/^# (.+?)\r?\n/)[1],
+ title: md.match(/^# (.+?)\r?\n/)![1],
src: `https://github.com/syuilo/misskey/tree/master/src/docs/${doc}.${lang}.md`
}, await genVars(lang)));
diff --git a/src/server/web/feed.ts b/src/server/web/feed.ts
index 94f0643f75..285c20fcdb 100644
--- a/src/server/web/feed.ts
+++ b/src/server/web/feed.ts
@@ -3,6 +3,7 @@ import config from '../../config';
import { User } from '../../models/entities/user';
import { Notes, DriveFiles, UserProfiles } from '../../models';
import { In } from 'typeorm';
+import { ensure } from '../../prelude/ensure';
export default async function(user: User) {
const author: Author = {
@@ -10,7 +11,7 @@ export default async function(user: User) {
name: user.name || user.username
};
- const profile = await UserProfiles.findOne({ userId: user.id });
+ const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
const notes = await Notes.find({
where: {
@@ -47,9 +48,9 @@ export default async function(user: User) {
title: `New note by ${author.name}`,
link: `${config.url}/notes/${note.id}`,
date: note.createdAt,
- description: note.cw,
- content: note.text,
- image: file ? DriveFiles.getPublicUrl(file) : null
+ description: note.cw || undefined,
+ content: note.text || undefined,
+ image: file ? DriveFiles.getPublicUrl(file) : undefined
});
}
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index d1a15e3929..5cadf1b124 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -19,6 +19,7 @@ import config from '../../config';
import { Users, Notes, Emojis, UserProfiles } from '../../models';
import parseAcct from '../../misc/acct/parse';
import getNoteSummary from '../../misc/get-note-summary';
+import { ensure } from '../../prelude/ensure';
const client = `${__dirname}/../../client/`;
@@ -149,11 +150,9 @@ router.get('/@:user', async (ctx, next) => {
usernameLower: username.toLowerCase(),
host
});
- const profile = await UserProfiles.findOne({
- userId: user.id
- });
if (user != null) {
+ const profile = await UserProfiles.findOne(user.id).then(ensure);
const meta = await fetchMeta();
await ctx.render('user', {
user, profile,
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index aed475e6ff..7d0080b4d2 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -43,7 +43,7 @@ module.exports = async (ctx: Koa.BaseContext) => {
}
};
-function wrap(url: string): string {
+function wrap(url?: string): string | null {
return url != null
? url.match(/^https?:\/\//)
? `${config.url}/proxy/preview.jpg?${query({