parent
90ddbc5dcd
commit
126b3839dd
7 changed files with 198 additions and 0 deletions
|
@ -1981,6 +1981,7 @@ _widgets:
|
||||||
_userList:
|
_userList:
|
||||||
chooseList: "Select a list"
|
chooseList: "Select a list"
|
||||||
clicker: "Clicker"
|
clicker: "Clicker"
|
||||||
|
search: "Search"
|
||||||
_cw:
|
_cw:
|
||||||
hide: "Hide"
|
hide: "Hide"
|
||||||
show: "Show content"
|
show: "Show content"
|
||||||
|
|
1
locales/index.d.ts
vendored
1
locales/index.d.ts
vendored
|
@ -2126,6 +2126,7 @@ export interface Locale {
|
||||||
"chooseList": string;
|
"chooseList": string;
|
||||||
};
|
};
|
||||||
"clicker": string;
|
"clicker": string;
|
||||||
|
"search": string;
|
||||||
};
|
};
|
||||||
"_cw": {
|
"_cw": {
|
||||||
"hide": string;
|
"hide": string;
|
||||||
|
|
|
@ -2030,6 +2030,7 @@ _widgets:
|
||||||
_userList:
|
_userList:
|
||||||
chooseList: "リストを選択"
|
chooseList: "リストを選択"
|
||||||
clicker: "クリッカー"
|
clicker: "クリッカー"
|
||||||
|
search: "検索"
|
||||||
|
|
||||||
_cw:
|
_cw:
|
||||||
hide: "隠す"
|
hide: "隠す"
|
||||||
|
|
|
@ -65,6 +65,13 @@ const props = defineProps<{
|
||||||
edit: boolean;
|
edit: boolean;
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
|
// This will not be available for now as I don't think this is needed
|
||||||
|
// const notesSearchAvailable = (($i == null && instance.policies.canSearchNotes) || ($i != null && $i.policies.canSearchNotes));
|
||||||
|
/* if (!notesSearchAvailable) {
|
||||||
|
const wid = widgetDefs.findIndex(widget => widget === 'search');
|
||||||
|
widgetDefs.splice(wid, 1);
|
||||||
|
} */
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
(ev: 'updateWidgets', widgets: Widget[]): void;
|
(ev: 'updateWidgets', widgets: Widget[]): void;
|
||||||
(ev: 'addWidget', widget: Widget): void;
|
(ev: 'addWidget', widget: Widget): void;
|
||||||
|
|
30
packages/frontend/src/components/SkSearchResultWindow.vue
Normal file
30
packages/frontend/src/components/SkSearchResultWindow.vue
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
<template>
|
||||||
|
<MkWindow ref="window" :initialWidth="600" :initialHeight="450" :canResize="true" @closed="emit('closed')">
|
||||||
|
<template #header>
|
||||||
|
<i class="ph-magnifying-glass ph-bold ph-lg" style="margin-right: 0.5em;"></i>
|
||||||
|
<b>Result</b>
|
||||||
|
</template>
|
||||||
|
<MkNotes :key="props.noteKey" :pagination="props.notePagination"/>
|
||||||
|
</MkWindow>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { } from 'vue';
|
||||||
|
import type { Paging } from '@/components/MkPagination.vue';
|
||||||
|
import MkNotes from '@/components/MkNotes.vue';
|
||||||
|
import MkWindow from '@/components/MkWindow.vue';
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
noteKey: string | number | symbol | undefined;
|
||||||
|
notePagination: Paging;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(ev: 'closed'): void;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" module>
|
||||||
|
|
||||||
|
</style>
|
156
packages/frontend/src/widgets/WidgetSearch.vue
Normal file
156
packages/frontend/src/widgets/WidgetSearch.vue
Normal file
|
@ -0,0 +1,156 @@
|
||||||
|
<!--
|
||||||
|
SPDX-FileCopyrightText: syuilo and other misskey contributors
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
-->
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<MkContainer :showHeader="widgetProps.showHeader" class="skw-search">
|
||||||
|
<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @keydown="onInputKeydown">
|
||||||
|
<template #suffix>
|
||||||
|
<button style="border: none; background: none; margin-right: 0.5em; z-index: 2; pointer-events: auto; position: relative; margin-top: 0 auto;" @click="options"><i class="ph-funnel ph-bold ph-lg"></i></button>
|
||||||
|
<button style="border: none; background: none; z-index: 2; pointer-events: auto; position: relative; margin: 0 auto;" @click="search"><i class="ph-magnifying-glass ph-bold ph-lg"></i></button>
|
||||||
|
</template>
|
||||||
|
</MkInput>
|
||||||
|
</MkContainer>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { computed, defineAsyncComponent, onMounted } from 'vue';
|
||||||
|
import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget.js';
|
||||||
|
import MkInput from '@/components/MkInput.vue';
|
||||||
|
import MkContainer from '@/components/MkContainer.vue';
|
||||||
|
import { i18n } from '@/i18n.js';
|
||||||
|
import * as os from '@/os.js';
|
||||||
|
import { useRouter } from '@/router.js';
|
||||||
|
import { GetFormResultType } from '@/scripts/form.js';
|
||||||
|
|
||||||
|
const name = 'search';
|
||||||
|
|
||||||
|
const widgetPropsDef = {
|
||||||
|
showHeader: {
|
||||||
|
type: 'boolean' as const,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
|
||||||
|
|
||||||
|
const props = defineProps<WidgetComponentProps<WidgetProps>>();
|
||||||
|
const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
|
||||||
|
|
||||||
|
const { widgetProps, configure } = useWidgetPropsManager(name,
|
||||||
|
widgetPropsDef,
|
||||||
|
props,
|
||||||
|
emit,
|
||||||
|
);
|
||||||
|
|
||||||
|
function onInputKeydown(evt: KeyboardEvent) {
|
||||||
|
if (evt.key === 'Enter') {
|
||||||
|
evt.preventDefault();
|
||||||
|
evt.stopPropagation();
|
||||||
|
search();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
let key = $ref(0);
|
||||||
|
let searchQuery = $ref('');
|
||||||
|
let notePagination = $ref();
|
||||||
|
let searchOrigin = $ref('combined');
|
||||||
|
let user = $ref(null);
|
||||||
|
let isLocalOnly = $ref(false);
|
||||||
|
let order = $ref(true);
|
||||||
|
let filetype = $ref(null);
|
||||||
|
|
||||||
|
function options(ev) {
|
||||||
|
os.popupMenu([{
|
||||||
|
type: 'parent',
|
||||||
|
text: 'With File',
|
||||||
|
icon: 'ph-file ph-bold ph-lg',
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
type: 'button',
|
||||||
|
icon: 'ph-image ph-bold ph-lg',
|
||||||
|
text: 'With Images',
|
||||||
|
action: () => {
|
||||||
|
filetype = 'image';
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'button',
|
||||||
|
icon: 'ph-music-notes-simple ph-bold ph-lg',
|
||||||
|
text: 'With Audios',
|
||||||
|
action: () => {
|
||||||
|
filetype = 'audio';
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'button',
|
||||||
|
icon: 'ph-video ph-bold ph-lg',
|
||||||
|
text: 'With Videos',
|
||||||
|
action: () => {
|
||||||
|
filetype = 'video';
|
||||||
|
console.log(filetype);
|
||||||
|
},
|
||||||
|
}],
|
||||||
|
}], ev.currentTarget ?? ev.target);
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectUser() {
|
||||||
|
os.selectUser().then(_user => {
|
||||||
|
user = _user;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function search() {
|
||||||
|
const query = searchQuery.toString().trim();
|
||||||
|
|
||||||
|
if (query == null || query === '') return;
|
||||||
|
|
||||||
|
if (query.startsWith('https://')) {
|
||||||
|
const promise = os.api('ap/show', {
|
||||||
|
uri: query,
|
||||||
|
});
|
||||||
|
|
||||||
|
os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
|
||||||
|
|
||||||
|
const res = await promise;
|
||||||
|
|
||||||
|
if (res.type === 'User') {
|
||||||
|
router.push(`/@${res.object.username}@${res.object.host}`);
|
||||||
|
} else if (res.type === 'Note') {
|
||||||
|
router.push(`/notes/${res.object.id}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
notePagination = {
|
||||||
|
endpoint: 'notes/search',
|
||||||
|
limit: 10,
|
||||||
|
params: {
|
||||||
|
query: searchQuery,
|
||||||
|
userId: user ? user.id : null,
|
||||||
|
order: order ? 'desc' : 'asc',
|
||||||
|
filetype: filetype,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
if (isLocalOnly) notePagination.params.host = '.';
|
||||||
|
|
||||||
|
key++;
|
||||||
|
|
||||||
|
os.popup(defineAsyncComponent(() => import('@/components/SkSearchResultWindow.vue')), {
|
||||||
|
noteKey: key,
|
||||||
|
notePagination: notePagination,
|
||||||
|
}, {
|
||||||
|
}, 'closed');
|
||||||
|
}
|
||||||
|
|
||||||
|
defineExpose<WidgetComponentExpose>({
|
||||||
|
name,
|
||||||
|
configure,
|
||||||
|
id: props.widget ? props.widget.id : null,
|
||||||
|
});
|
||||||
|
</script>
|
|
@ -33,6 +33,7 @@ export default function(app: App) {
|
||||||
app.component('WidgetAichan', defineAsyncComponent(() => import('./WidgetAichan.vue')));
|
app.component('WidgetAichan', defineAsyncComponent(() => import('./WidgetAichan.vue')));
|
||||||
app.component('WidgetUserList', defineAsyncComponent(() => import('./WidgetUserList.vue')));
|
app.component('WidgetUserList', defineAsyncComponent(() => import('./WidgetUserList.vue')));
|
||||||
app.component('WidgetClicker', defineAsyncComponent(() => import('./WidgetClicker.vue')));
|
app.component('WidgetClicker', defineAsyncComponent(() => import('./WidgetClicker.vue')));
|
||||||
|
app.component('WidgetSearch', defineAsyncComponent(() => import('./WidgetSearch.vue')));
|
||||||
}
|
}
|
||||||
|
|
||||||
export const widgets = [
|
export const widgets = [
|
||||||
|
@ -63,4 +64,5 @@ export const widgets = [
|
||||||
'aichan',
|
'aichan',
|
||||||
'userList',
|
'userList',
|
||||||
'clicker',
|
'clicker',
|
||||||
|
'search',
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue