From 91172654e4b715198099146d4c442e0787df0785 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 13 Feb 2021 15:33:38 +0900 Subject: refactor: resolve #7139 --- src/server/api/endpoints/notes/delete.ts | 3 +-- src/server/api/endpoints/notes/polls/vote.ts | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/server/api/endpoints/notes') diff --git a/src/server/api/endpoints/notes/delete.ts b/src/server/api/endpoints/notes/delete.ts index 65565ee3ab..5afd911ca9 100644 --- a/src/server/api/endpoints/notes/delete.ts +++ b/src/server/api/endpoints/notes/delete.ts @@ -6,7 +6,6 @@ import * as ms from 'ms'; import { getNote } from '../../common/getters'; import { ApiError } from '../../error'; import { Users } from '../../../../models'; -import { ensure } from '../../../../prelude/ensure'; export const meta = { desc: { @@ -62,5 +61,5 @@ export default define(meta, async (ps, user) => { } // この操作を行うのが投稿者とは限らない(例えばモデレーター)ため - await deleteNote(await Users.findOne(note.userId).then(ensure), note); + await deleteNote(await Users.findOneOrFail(note.userId), note); }); diff --git a/src/server/api/endpoints/notes/polls/vote.ts b/src/server/api/endpoints/notes/polls/vote.ts index 1e6ab472cc..6113d7ea9a 100644 --- a/src/server/api/endpoints/notes/polls/vote.ts +++ b/src/server/api/endpoints/notes/polls/vote.ts @@ -13,7 +13,6 @@ import { PollVotes, NoteWatchings, Users, Polls } from '../../../../../models'; import { Not } from 'typeorm'; import { IRemoteUser } from '../../../../../models/entities/user'; import { genId } from '../../../../../misc/gen-id'; -import { ensure } from '../../../../../prelude/ensure'; export const meta = { desc: { @@ -87,7 +86,7 @@ export default define(meta, async (ps, user) => { throw new ApiError(meta.errors.noPoll); } - const poll = await Polls.findOne({ noteId: note.id }).then(ensure); + const poll = await Polls.findOneOrFail({ noteId: note.id }); if (poll.expiresAt && poll.expiresAt < createdAt) { throw new ApiError(meta.errors.alreadyExpired); @@ -153,7 +152,7 @@ export default define(meta, async (ps, user) => { // リモート投票の場合リプライ送信 if (note.userHost != null) { - const pollOwner = await Users.findOne(note.userId).then(ensure) as IRemoteUser; + const pollOwner = await Users.findOneOrFail(note.userId) as IRemoteUser; deliver(user, renderActivity(await renderVote(user, vote, note, poll, pollOwner)), pollOwner.inbox); } -- cgit v1.2.3-freya From eefbe097c0e810bbda4108b4235b32bf0456b06f Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 19 Feb 2021 21:40:09 +0900 Subject: Resolve #7222 --- locales/ja-JP.yml | 1 + src/client/pages/search.vue | 1 + src/client/ui/chat/index.vue | 14 +++++++++++++- src/server/api/endpoints/notes/search.ts | 15 ++++++++++++++- 4 files changed, 29 insertions(+), 2 deletions(-) (limited to 'src/server/api/endpoints/notes') diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 680e70f61e..51a82a32b9 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -704,6 +704,7 @@ editCode: "コードを編集" apply: "適用" receiveAnnouncementFromInstance: "インスタンスからのお知らせを受け取る" emailNotification: "メール通知" +inChannelSearch: "チャンネル内検索" _email: _follow: diff --git a/src/client/pages/search.vue b/src/client/pages/search.vue index ed92243cd2..5e79531b20 100644 --- a/src/client/pages/search.vue +++ b/src/client/pages/search.vue @@ -28,6 +28,7 @@ export default defineComponent({ limit: 10, params: () => ({ query: this.$route.query.q, + channelId: this.$route.query.channel, }) }, }; diff --git a/src/client/ui/chat/index.vue b/src/client/ui/chat/index.vue index 79c0d53074..44f47447a7 100644 --- a/src/client/ui/chat/index.vue +++ b/src/client/ui/chat/index.vue @@ -99,7 +99,10 @@
{{ instanceName }}
- +