Merge remote-tracking branch 'misskey-dev/develop' into io

This commit is contained in:
まっちゃとーにゅ 2024-02-02 21:42:42 +09:00
commit a409eb14d6
No known key found for this signature in database
GPG key ID: 143DE582A97FE052
41 changed files with 482 additions and 142 deletions

View file

@ -78,10 +78,13 @@ const emit = defineEmits<{
(ev: 'closed'): void;
}>();
const props = defineProps<{
const props = withDefaults(defineProps<{
includeSelf?: boolean;
localOnly?: boolean;
}>();
}>(), {
includeSelf: false,
localOnly: false,
});
const username = ref('');
const host = ref('');
@ -102,10 +105,10 @@ function search() {
detail: false,
}).then(_users => {
users.value = _users.filter((u) => {
if (!props.includeSelf) {
return u.id !== $i?.id;
} else {
if (props.includeSelf) {
return true;
} else {
return u.id !== $i?.id;
}
});
});
@ -146,10 +149,10 @@ onMounted(() => {
}
})
.filter((u) => {
if (!props.includeSelf) {
return u.id !== $i?.id;
} else {
if (props.includeSelf) {
return true;
} else {
return u.id !== $i?.id;
}
});