monkee.ch/monkeeShark
1
0
Fork 0
Code Pull requests Activity

Resolve #7149

Browse source
This commit is contained in:
syuilo 2021-02-07 10:43:34 +09:00
parent 823a0c86d3
commit 0a64d121d9
10 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/services/note/create.ts
View file

@ -33,6 +33,7 @@ import { addNoteToAntenna } from '../add-note-to-antenna';
import { countSameRenotes } from '../../misc/count-same-renotes';
import { deliverToRelays } from '../relay';
import { Channel } from '../../models/entities/channel';
import { normalizeForSearch } from '../../misc/normalize-for-search';
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
@ -460,7 +461,7 @@ async function insertNote(user: User, data: Option, tags: string[], emojis: stri
text: data.text,
hasPoll: data.poll != null,
cw: data.cw == null ? null : data.cw,
tags: tags.map(tag => tag.toLowerCase()),
tags: tags.map(tag => normalizeForSearch(tag)),
emojis,
userId: user.id,
viaMobile: data.viaMobile!,
@ -547,7 +548,7 @@ function index(note: Note) {
index: config.elasticsearch.index || 'misskey_note',
id: note.id.toString(),
body: {
text: note.text.toLowerCase(),
text: normalizeForSearch(note.text),
userId: note.userId,
userHost: note.userHost
}

3
src/services/update-hashtag.ts
View file

@ -3,6 +3,7 @@ import { Hashtags, Users } from '../models';
import { hashtagChart } from './chart';
import { genId } from '../misc/gen-id';
import { Hashtag } from '../models/entities/hashtag';
import { normalizeForSearch } from '../misc/normalize-for-search';
export async function updateHashtags(user: User, tags: string[]) {
for (const tag of tags) {
@ -21,7 +22,7 @@ export async function updateUsertags(user: User, tags: string[]) {
}
export async function updateHashtag(user: User, tag: string, isUserAttached = false, inc = true) {
tag = tag.toLowerCase();
tag = normalizeForSearch(tag);
const index = await Hashtags.findOne({ name: tag });