Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	packages/frontend/src/components/MkChannelFollowButton.vue
#	packages/frontend/src/components/MkDrive.folder.vue
#	packages/frontend/src/components/MkDrive.navFolder.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/admin/instance-block.vue
#	packages/frontend/src/pages/avatar-decorations.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/settings/profile.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user/home.vue
This commit is contained in:
mattyatea 2024-01-06 14:24:39 +09:00
commit de3f4ce29c
216 changed files with 758 additions and 568 deletions
Download patch file Download diff file Expand all files Collapse all files

21
packages/frontend/src/components/MkDrive.folder.vue
View file

@ -35,6 +35,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed, defineAsyncComponent, ref } from 'vue';
import * as Misskey from 'misskey-js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js';
import { defaultStore } from '@/store.js';
import { claimAchievement } from '@/scripts/achievements.js';
@ -147,13 +148,13 @@ function onDrop(ev: DragEvent) {
emit('removeFile', file.id);
if (props.selectedFiles.length > 0) {
props.selectedFiles.forEach((e)=>{
os.api('drive/files/update', {
misskeyApi('drive/files/update', {
fileId: e.id,
folderId: props.folder.id,
});
})
}else{
os.api('drive/files/update', {
misskeyApi('drive/files/update', {
fileId: file.id,
folderId: props.folder.id,
});
@ -170,7 +171,7 @@ function onDrop(ev: DragEvent) {
if (folder.id === props.folder.id) return;
emit('removeFolder', folder.id);
os.api('drive/folders/update', {
misskeyApi('drive/folders/update', {
folderId: folder.id,
parentId: props.folder.id,
}).then(() => {
@ -224,7 +225,7 @@ function rename() {
default: props.folder.name,
}).then(({ canceled, result: name }) => {
if (canceled) return;
os.api('drive/folders/update', {
misskeyApi('drive/folders/update', {
folderId: props.folder.id,
name: name,
});
@ -232,7 +233,7 @@ function rename() {
}
function deleteFolder() {
os.api('drive/folders/show', {
misskeyApi('drive/folders/show', {
folderId: props.folder.id,
}).then(async (r) => {
@ -266,7 +267,7 @@ function deleteFolder() {
})
os.api('drive/folders/show', {
misskeyApi('drive/folders/show', {
folderId: props.folder.id,
}).then(async (r) =>{
if (r.filesCount > 0) {
@ -283,7 +284,7 @@ function deleteFolder() {
os.api('drive/files/delete',{fileId: r.id})
})
os.api('drive/folders/delete', {
misskeyApi('drive/folders/delete', {
folderId: props.folder.id,
}).then(() => {
if (defaultStore.state.uploadFolder === props.folder.id) {
@ -306,11 +307,11 @@ function deleteFolder() {
}
});
os.api('drive/folders/delete', {
misskeyApi('drive/folders/delete', {
folderId: props.folder.id,
})
}else{
os.api('drive/folders/delete', {
misskeyApi('drive/folders/delete', {
folderId: props.folder.id,
})
}
@ -318,7 +319,7 @@ function deleteFolder() {
} else {
await os.api('drive/folders/delete', {
await misskeyApi('drive/folders/delete', {
folderId: props.folder.id,
}).then(() => {
if (defaultStore.state.uploadFolder === props.folder.id) {