oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

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

Browse source
This commit is contained in:
まっちゃとーにゅ 2024-02-01 10:53:22 +09:00
commit 470815ba73
No known key found for this signature in database
GPG key ID: 143DE582A97FE052
4 changed files with 51 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
packages/frontend/src/components/MkUserSelectDialog.vue
View file

@ -101,7 +101,13 @@ function search() {
limit: 10,
detail: false,
}).then(_users => {
users.value = _users;
users.value = _users.filter((u) => {
if (!props.includeSelf) {
return u.id !== $i?.id;
} else {
return true;
}
});
});
}
@ -131,13 +137,22 @@ onMounted(() => {
misskeyApi('users/show', {
userIds: defaultStore.state.recentlyUsedUsers,
}).then(foundUsers => {
const _users = foundUsers.filter((u) => {
if (props.localOnly) {
return u.host == null;
} else {
return true;
}
});
const _users = foundUsers
.filter((u) => {
if (props.localOnly) {
return u.host == null;
} else {
return true;
}
})
.filter((u) => {
if (!props.includeSelf) {
return u.id !== $i?.id;
} else {
return true;
}
});
if (props.includeSelf && $i && !_users.find(x => $i ? x.id === $i.id : true)) {
recentUsers.value = [$i, ..._users];
} else {