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

Merge branch 'develop' of misskey-dev into merge-upstream

Browse source
This commit is contained in:
まっちゃとーにゅ 2024-01-10 03:10:45 +09:00
commit abe95d9b67
No known key found for this signature in database
GPG key ID: 143DE582A97FE052
376 changed files with 5293 additions and 2636 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages/frontend/src/components/MkAbuseReportWindow.vue
View file

@ -73,6 +73,7 @@ import MkButton from '@/components/MkButton.vue';
import MkSelect from '@/components/MkSelect.vue';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
const props = defineProps<{
user: Misskey.entities.User;
@ -106,7 +107,7 @@ function muteUser() {
}
function refreshUserInfo() {
os.api('users/show', { userId: props.user.id })
misskeyApi('users/show', { userId: props.user.id })
.then((res) => {
fullUserInfo.value = res;
});
@ -132,7 +133,7 @@ function send() {
comment: comment.value,
category: category.value,
}, undefined).then(res => {
os.api('users/show', { userId: props.user.id })
misskeyApi('users/show', { userId: props.user.id })
.then((res) => {
fullUserInfo.value = res;
uiWindow.value?.close();