summaryrefslogtreecommitdiff
path: root/src/mfm
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/mfm
parentFix bug (diff)
downloadmisskey-987168b863c52d0548050ffbac569782bb9a8cef.tar.gz
misskey-987168b863c52d0548050ffbac569782bb9a8cef.tar.bz2
misskey-987168b863c52d0548050ffbac569782bb9a8cef.zip
strictNullChecks (#4666)
* wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip
Diffstat (limited to 'src/mfm')
-rw-r--r--src/mfm/fromHtml.ts2
-rw-r--r--src/mfm/parse.ts4
-rw-r--r--src/mfm/toHtml.ts2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/mfm/fromHtml.ts b/src/mfm/fromHtml.ts
index 369f9de0ee..5fc4a16416 100644
--- a/src/mfm/fromHtml.ts
+++ b/src/mfm/fromHtml.ts
@@ -3,8 +3,6 @@ import { URL } from 'url';
import { urlRegex } from './prelude';
export function fromHtml(html: string): string {
- if (html == null) return null;
-
const dom = parseFragment(html) as DefaultTreeDocumentFragment;
let text = '';
diff --git a/src/mfm/parse.ts b/src/mfm/parse.ts
index 9d60771708..f8464121f3 100644
--- a/src/mfm/parse.ts
+++ b/src/mfm/parse.ts
@@ -2,7 +2,7 @@ import { mfmLanguage } from './language';
import { MfmForest } from './prelude';
import { normalize } from './normalize';
-export function parse(source: string): MfmForest {
+export function parse(source: string | null): MfmForest | null {
if (source == null || source == '') {
return null;
}
@@ -10,7 +10,7 @@ export function parse(source: string): MfmForest {
return normalize(mfmLanguage.root.tryParse(source));
}
-export function parsePlain(source: string): MfmForest {
+export function parsePlain(source: string | null): MfmForest | null {
if (source == null || source == '') {
return null;
}
diff --git a/src/mfm/toHtml.ts b/src/mfm/toHtml.ts
index 3cd7987624..58976fc2c3 100644
--- a/src/mfm/toHtml.ts
+++ b/src/mfm/toHtml.ts
@@ -4,7 +4,7 @@ import { intersperse } from '../prelude/array';
import { MfmForest, MfmTree } from './prelude';
import { IMentionedRemoteUsers } from '../models/entities/note';
-export function toHtml(tokens: MfmForest, mentionedRemoteUsers: IMentionedRemoteUsers = []) {
+export function toHtml(tokens: MfmForest | null, mentionedRemoteUsers: IMentionedRemoteUsers = []) {
if (tokens == null) {
return null;
}