summaryrefslogtreecommitdiff
path: root/src/models/note.ts
diff options
context:
space:
mode:
authorAcid Chicken (硫酸鶏) <root@acid-chicken.com>2018-09-10 18:02:46 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-09-10 18:02:46 +0900
commitb24f368d3f207554735e4edc5c5a2b7e16a6d281 (patch)
tree97f0167c425fafa38451aecfaeab0c94eb3bf463 /src/models/note.ts
parentOptimize booting script (diff)
downloadsharkey-b24f368d3f207554735e4edc5c5a2b7e16a6d281.tar.gz
sharkey-b24f368d3f207554735e4edc5c5a2b7e16a6d281.tar.bz2
sharkey-b24f368d3f207554735e4edc5c5a2b7e16a6d281.zip
サロゲートペアを字数にカウントしないようにする (#2661)
* Update post-form.vue * Update messaging-message.ts * Update post-form.vue * Update note.ts * Update post-form.vue refs: https://github.com/syuilo/misskey/pull/2661#issuecomment-419579444 * Update post-form.vue refs: https://github.com/syuilo/misskey/pull/2661#issuecomment-419579444 * Update messaging-message.ts refs: https://github.com/syuilo/misskey/pull/2661#issuecomment-419579444 * Update note.ts refs: https://github.com/syuilo/misskey/pull/2661#issuecomment-419579444 * Update post-form.vue refs: https://github.com/syuilo/misskey/pull/2661#discussion_r216175581 * Update post-form.vue * Update post-form.vue refs: https://github.com/syuilo/misskey/pull/2661#discussion_r216242002 * Update post-form.vue refs: https://github.com/syuilo/misskey/pull/2661#discussion_r216242105
Diffstat (limited to 'src/models/note.ts')
-rw-r--r--src/models/note.ts5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/models/note.ts b/src/models/note.ts
index 624bdbdfe8..6530d0b324 100644
--- a/src/models/note.ts
+++ b/src/models/note.ts
@@ -2,6 +2,7 @@ import * as mongo from 'mongodb';
const deepcopy = require('deepcopy');
import rap from '@prezzemolo/rap';
import db from '../db/mongodb';
+import { length } from 'stringz';
import { IUser, pack as packUser } from './user';
import { pack as packApp } from './app';
import PollVote, { deletePollVote } from './poll-vote';
@@ -24,11 +25,11 @@ Note.createIndex({
export default Note;
export function isValidText(text: string): boolean {
- return text.length <= 1000 && text.trim() != '';
+ return length(text.trim()) <= 1000 && text.trim() != '';
}
export function isValidCw(text: string): boolean {
- return text.length <= 100;
+ return length(text.trim()) <= 100;
}
export type INote = {