feat: 投稿日時の範囲を条件に加えてノート検索出来るようにする

This commit is contained in:
samunohito 2025-05-29 21:20:58 +09:00
parent 4c77f3e597
commit 4131be525b
4 changed files with 84 additions and 12 deletions

View File

@ -38,6 +38,8 @@ export type SearchOpts = {
userId?: MiNote['userId'] | null;
channelId?: MiNote['channelId'] | null;
host?: string | null;
rangeStartAt?: number | null;
rangeEndAt?: number | null;
};
export type SearchPagination = {
@ -233,6 +235,16 @@ export class SearchService {
}
}
if (opts.rangeStartAt) {
const date = this.idService.gen(opts.rangeStartAt);
query.andWhere('note.id >= :rangeStartAt', { rangeStartAt: date });
}
if (opts.rangeEndAt) {
const date = this.idService.gen(opts.rangeEndAt);
query.andWhere('note.id <= :rangeEndAt', { rangeEndAt: date });
}
this.queryService.generateVisibilityQuery(query, me);
this.queryService.generateBaseNoteFilteringQuery(query, me);
@ -254,16 +266,50 @@ export class SearchService {
op: 'and',
qs: [],
};
if (pagination.untilId) filter.qs.push({
op: '<',
k: 'createdAt',
v: this.idService.parse(pagination.untilId).date.getTime(),
});
if (pagination.sinceId) filter.qs.push({
op: '>',
k: 'createdAt',
v: this.idService.parse(pagination.sinceId).date.getTime(),
});
if (pagination.untilId || opts.rangeEndAt) {
let time: number;
if (pagination.untilId && opts.rangeEndAt) {
time = Math.min(
this.idService.parse(pagination.untilId).date.getTime(),
opts.rangeEndAt,
);
} else if (pagination.untilId) {
time = this.idService.parse(pagination.untilId).date.getTime();
} else if (opts.rangeEndAt) {
time = opts.rangeEndAt;
} else {
throw new Error('Either pagination.untilId or opts.rangeEndAt must be provided');
}
filter.qs.push({
op: '<',
k: 'createdAt',
v: time,
});
}
if (pagination.sinceId || opts.rangeStartAt) {
let time: number;
if (pagination.sinceId && opts.rangeStartAt) {
time = Math.max(
this.idService.parse(pagination.sinceId).date.getTime(),
opts.rangeStartAt,
);
} else if (pagination.sinceId) {
time = this.idService.parse(pagination.sinceId).date.getTime();
} else if (opts.rangeStartAt) {
time = opts.rangeStartAt;
} else {
throw new Error('Either pagination.sinceId or opts.rangeStartAt must be provided');
}
filter.qs.push({
op: '>',
k: 'createdAt',
v: time,
});
}
if (opts.userId) filter.qs.push({ op: '=', k: 'userId', v: opts.userId });
if (opts.channelId) filter.qs.push({ op: '=', k: 'channelId', v: opts.channelId });
if (opts.host) {

View File

@ -38,6 +38,8 @@ export const paramDef = {
type: 'object',
properties: {
query: { type: 'string' },
rangeStartAt: { type: 'integer', nullable: true },
rangeEndAt: { type: 'integer', nullable: true },
sinceId: { type: 'string', format: 'misskey:id' },
untilId: { type: 'string', format: 'misskey:id' },
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
@ -71,6 +73,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
userId: ps.userId,
channelId: ps.channelId,
host: ps.host,
rangeStartAt: ps.rangeStartAt,
rangeEndAt: ps.rangeEndAt,
}, {
untilId: ps.untilId,
sinceId: ps.sinceId,

View File

@ -19,6 +19,11 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #header>{{ i18n.ts.options }}</template>
<div class="_gaps_m">
<div style="display: flex; gap: 8px;">
<MkInput v-model="rangeStartAt" type="datetime-local"/>
<MkInput v-model="rangeEndAt" type="datetime-local"/>
</div>
<MkRadios v-model="searchScope">
<option v-if="instance.federation !== 'none' && noteSearchableScope === 'global'" value="all">{{ i18n.ts._search.searchScopeAll }}</option>
<option value="local">{{ instance.federation === 'none' ? i18n.ts._search.searchScopeAll : i18n.ts._search.searchScopeLocal }}</option>
@ -112,10 +117,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, ref, shallowRef, toRef } from 'vue';
import { host as localHost } from '@@/js/config.js';
import type * as Misskey from 'misskey-js';
import type { PagingCtx } from '@/composables/use-pagination.js';
import { $i } from '@/i.js';
import { host as localHost } from '@@/js/config.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import * as os from '@/os.js';
@ -148,6 +153,8 @@ const notePagination = ref<PagingCtx<'notes/search'>>();
const searchQuery = ref(toRef(props, 'query').value);
const hostInput = ref(toRef(props, 'host').value);
const rangeStartAt = ref<string | null>(null);
const rangeEndAt = ref<string | null>(null);
const user = shallowRef<Misskey.entities.UserDetailed | null>(null);
@ -188,6 +195,8 @@ type SearchParams = {
readonly query: string;
readonly host?: string;
readonly userId?: string;
readonly rangeStartAt?: number | null;
readonly rangeEndAt?: number | null;
};
const fixHostIfLocal = (target: string | null | undefined) => {
@ -195,6 +204,13 @@ const fixHostIfLocal = (target: string | null | undefined) => {
return target;
};
const searchRange = () => {
return {
rangeStartAt: rangeStartAt.value ? new Date(rangeStartAt.value).getTime() : null,
rangeEndAt: rangeEndAt.value ? new Date(rangeEndAt.value).getTime() : null,
};
};
const searchParams = computed<SearchParams | null>(() => {
const trimmedQuery = searchQuery.value.trim();
if (!trimmedQuery) return null;
@ -205,6 +221,7 @@ const searchParams = computed<SearchParams | null>(() => {
query: trimmedQuery,
host: fixHostIfLocal(user.value.host),
userId: user.value.id,
...searchRange(),
};
}
@ -219,6 +236,7 @@ const searchParams = computed<SearchParams | null>(() => {
return {
query: trimmedQuery,
host: fixHostIfLocal(trimmedHost),
...searchRange(),
};
}
@ -226,11 +244,13 @@ const searchParams = computed<SearchParams | null>(() => {
return {
query: trimmedQuery,
host: '.',
...searchRange(),
};
}
return {
query: trimmedQuery,
...searchRange(),
};
});
@ -265,7 +285,7 @@ async function search() {
if (res.type === 'User') {
router.push(`/@${res.object.username}@${res.object.host}`);
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
} else if (res.type === 'Note') {
router.push(`/notes/${res.object.id}`);
}

View File

@ -25720,6 +25720,8 @@ export type operations = {
content: {
'application/json': {
query: string;
rangeStartAt?: number | null;
rangeEndAt?: number | null;
/** Format: misskey:id */
sinceId?: string;
/** Format: misskey:id */