diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-02-22 14:47:51 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-22 14:47:51 +0900 |
| commit | b9ee14fe5b185f3533326a15f05056cc8bd685ce (patch) | |
| tree | 986d374413d3915e49ab951af249a29f8c6e955d /packages/frontend/src/components | |
| parent | Update CHANGELOG.md (diff) | |
| download | sharkey-b9ee14fe5b185f3533326a15f05056cc8bd685ce.tar.gz sharkey-b9ee14fe5b185f3533326a15f05056cc8bd685ce.tar.bz2 sharkey-b9ee14fe5b185f3533326a15f05056cc8bd685ce.zip | |
fix: MkUserSelectDialog/search-by-username-and-hostでローカルユーザーを絞って検索できない問題を修正 (#9943)
* fix: MkUserSelectDialog/search-by-username-and-hostでローカルユーザーを絞って検索できない問題を修正
Fix #9627
* update CHANGELOG.md
* clean up
* search-by-username-and-host大改造
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkInput.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkUserSelectDialog.vue | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/frontend/src/components/MkInput.vue b/packages/frontend/src/components/MkInput.vue index 0f99bf9aad..3e3d7354c1 100644 --- a/packages/frontend/src/components/MkInput.vue +++ b/packages/frontend/src/components/MkInput.vue @@ -23,7 +23,7 @@ @input="onInput" > <datalist v-if="datalist" :id="id"> - <option v-for="data in datalist" :value="data"/> + <option v-for="data in datalist" :key="data" :value="data"/> </datalist> <div ref="suffixEl" class="suffix"><slot name="suffix"></slot></div> </div> diff --git a/packages/frontend/src/components/MkUserSelectDialog.vue b/packages/frontend/src/components/MkUserSelectDialog.vue index 981ae56e6c..4ce8c08512 100644 --- a/packages/frontend/src/components/MkUserSelectDialog.vue +++ b/packages/frontend/src/components/MkUserSelectDialog.vue @@ -16,7 +16,7 @@ <template #label>{{ i18n.ts.username }}</template> <template #prefix>@</template> </MkInput> - <MkInput v-model="host" @update:model-value="search"> + <MkInput v-model="host" @update:model-value="search" :datalist="[hostname]"> <template #label>{{ i18n.ts.host }}</template> <template #prefix>@</template> </MkInput> @@ -61,6 +61,7 @@ import * as os from '@/os'; import { defaultStore } from '@/store'; import { i18n } from '@/i18n'; import { $i } from '@/account'; +import { hostname } from '@/config'; const emit = defineEmits<{ (ev: 'ok', selected: misskey.entities.UserDetailed): void; @@ -115,7 +116,7 @@ onMounted(() => { os.api('users/show', { userIds: defaultStore.state.recentlyUsedUsers, }).then(users => { - if (props.includeSelf) { + if (props.includeSelf && users.find(x => $i ? x.id === $i.id : true) == null) { recentUsers = [$i, ...users]; } else { recentUsers = users; |