forked from misskey-dev/misskey
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add channel search * move channel search to channel list page --------- Co-authored-by: tamaina <tamaina@hotmail.co.jp> Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> Co-authored-by: atsuchan <83960488+atsu1125@users.noreply.github.com> Co-authored-by: Masaya Suzuki <15100604+massongit@users.noreply.github.com> Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com> Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com> Co-authored-by: xianon <xianon@hotmail.co.jp> Co-authored-by: kabo2468 <28654659+kabo2468@users.noreply.github.com> Co-authored-by: YS <47836716+yszkst@users.noreply.github.com> Co-authored-by: Khsmty <me@khsmty.com> Co-authored-by: Soni L <EnderMoneyMod@gmail.com> Co-authored-by: mei23 <m@m544.net> Co-authored-by: daima3629 <52790780+daima3629@users.noreply.github.com> Co-authored-by: Windymelt <1113940+windymelt@users.noreply.github.com>
- Loading branch information
Showing
6 changed files
with
166 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
packages/backend/src/server/api/endpoints/channels/search.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import { Inject, Injectable } from '@nestjs/common'; | ||
| import { Brackets } from 'typeorm'; | ||
| import { Endpoint } from '@/server/api/endpoint-base.js'; | ||
| import { QueryService } from '@/core/QueryService.js'; | ||
| import type { ChannelsRepository } from '@/models/index.js'; | ||
| import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; | ||
| import { DI } from '@/di-symbols.js'; | ||
| import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; | ||
|
|
||
| export const meta = { | ||
| tags: ['channels'], | ||
|
|
||
| requireCredential: false, | ||
|
|
||
| res: { | ||
| type: 'array', | ||
| optional: false, nullable: false, | ||
| items: { | ||
| type: 'object', | ||
| optional: false, nullable: false, | ||
| ref: 'Channel', | ||
| }, | ||
| }, | ||
| } as const; | ||
|
|
||
| export const paramDef = { | ||
| type: 'object', | ||
| properties: { | ||
| query: { type: 'string' }, | ||
| type: { type: 'string', enum: ['nameAndDescription', 'nameOnly'], default: 'nameAndDescription' }, | ||
| sinceId: { type: 'string', format: 'misskey:id' }, | ||
| untilId: { type: 'string', format: 'misskey:id' }, | ||
| limit: { type: 'integer', minimum: 1, maximum: 100, default: 5 }, | ||
| }, | ||
| required: ['query'], | ||
| } as const; | ||
|
|
||
| // eslint-disable-next-line import/no-default-export | ||
| @Injectable() | ||
| export default class extends Endpoint<typeof meta, typeof paramDef> { | ||
| constructor( | ||
| @Inject(DI.channelsRepository) | ||
| private channelsRepository: ChannelsRepository, | ||
|
|
||
| private channelEntityService: ChannelEntityService, | ||
| private queryService: QueryService, | ||
| ) { | ||
| super(meta, paramDef, async (ps, me) => { | ||
| const query = this.queryService.makePaginationQuery(this.channelsRepository.createQueryBuilder('channel'), ps.sinceId, ps.untilId); | ||
|
|
||
| if (ps.type === 'nameAndDescription') { | ||
| query.andWhere(new Brackets(qb => { qb | ||
| .where('channel.name ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` }) | ||
| .orWhere('channel.description ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` }); | ||
| })); | ||
| } else { | ||
| query.andWhere('channel.name ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` }); | ||
| } | ||
|
|
||
| const channels = await query | ||
| .take(ps.limit) | ||
| .getMany(); | ||
|
|
||
| return await Promise.all(channels.map(x => this.channelEntityService.pack(x, me))); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <template> | ||
| <MkPagination :pagination="pagination"> | ||
| <template #empty> | ||
| <div class="_fullinfo"> | ||
| <img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/> | ||
| <div>{{ i18n.ts.notFound }}</div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <template #default="{ items }"> | ||
| <MkChannelPreview v-for="item in items" :key="item.id" class="_margin" :channel="extractor(item)"/> | ||
| </template> | ||
| </MkPagination> | ||
| </template> | ||
|
|
||
| <script lang="ts" setup> | ||
| import MkChannelPreview from '@/components/MkChannelPreview.vue'; | ||
| import MkPagination, { Paging } from '@/components/MkPagination.vue'; | ||
| import { i18n } from '@/i18n'; | ||
| const props = withDefaults(defineProps<{ | ||
| pagination: Paging; | ||
| noGap?: boolean; | ||
| extractor?: (item: any) => any; | ||
| }>(), { | ||
| extractor: (item) => item, | ||
| }); | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters