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

merge: upstream

Browse source
This commit is contained in:
Marie 2023-12-23 02:09:23 +01:00
commit 5db583a3eb
701 changed files with 50809 additions and 13660 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/frontend/src/pages/my-lists/index.vue
View file

@ -29,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
import { onActivated } from 'vue';
import { onActivated, computed } from 'vue';
import MkButton from '@/components/MkButton.vue';
import MkAvatars from '@/components/MkAvatars.vue';
import * as os from '@/os.js';
@ -39,7 +39,7 @@ import { userListsCache } from '@/cache';
import { infoImageUrl } from '@/instance.js';
import { $i } from '@/account.js';
const items = $computed(() => userListsCache.value.value ?? []);
const items = computed(() => userListsCache.value.value ?? []);
function fetch() {
userListsCache.fetch();
@ -57,7 +57,7 @@ async function create() {
fetch();
}
const headerActions = $computed(() => [{
const headerActions = computed(() => [{
asFullButton: true,
icon: 'ph-arrows-counter-clockwise ph-bold ph-lg',
text: i18n.ts.reload,
@ -67,7 +67,7 @@ const headerActions = $computed(() => [{
},
}]);
const headerTabs = $computed(() => []);
const headerTabs = computed(() => []);
definePageMetadata({
title: i18n.ts.manageLists,

42
packages/frontend/src/pages/my-lists/list.vue
View file

@ -68,7 +68,7 @@ import MkInput from '@/components/MkInput.vue';
import { userListsCache } from '@/cache.js';
import { $i } from '@/account.js';
import { defaultStore } from '@/store.js';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkPagination from '@/components/MkPagination.vue';
const {
enableInfiniteScroll,
@ -79,7 +79,7 @@ const props = defineProps<{
}>();
const paginationEl = ref<InstanceType<typeof MkPagination>>();
let list = $ref<Misskey.entities.UserList | null>(null);
const list = ref<Misskey.entities.UserList | null>(null);
const isPublic = ref(false);
const name = ref('');
const membershipsPagination = {
@ -94,17 +94,17 @@ function fetchList() {
os.api('users/lists/show', {
listId: props.listId,
}).then(_list => {
list = _list;
name.value = list.name;
isPublic.value = list.isPublic;
list.value = _list;
name.value = list.value.name;
isPublic.value = list.value.isPublic;
});
}
function addUser() {
os.selectUser().then(user => {
if (!list) return;
if (!list.value) return;
os.apiWithDialog('users/lists/push', {
listId: list.id,
listId: list.value.id,
userId: user.id,
}).then(() => {
paginationEl.value.reload();
@ -118,9 +118,9 @@ async function removeUser(item, ev) {
icon: 'ph-x ph-bold ph-lg',
danger: true,
action: async () => {
if (!list) return;
if (!list.value) return;
os.api('users/lists/pull', {
listId: list.id,
listId: list.value.id,
userId: item.userId,
}).then(() => {
paginationEl.value.removeItem(item.id);
@ -135,7 +135,7 @@ async function showMembershipMenu(item, ev) {
icon: item.withReplies ? 'ph-envelope-open ph-bold ph-lg' : 'ph-envelope ph-bold ph-lg',
action: async () => {
os.api('users/lists/update-membership', {
listId: list.id,
listId: list.value.id,
userId: item.userId,
withReplies: !item.withReplies,
}).then(() => {
@ -149,42 +149,42 @@ async function showMembershipMenu(item, ev) {
}
async function deleteList() {
if (!list) return;
if (!list.value) return;
const { canceled } = await os.confirm({
type: 'warning',
text: i18n.t('removeAreYouSure', { x: list.name }),
text: i18n.t('removeAreYouSure', { x: list.value.name }),
});
if (canceled) return;
await os.apiWithDialog('users/lists/delete', {
listId: list.id,
listId: list.value.id,
});
userListsCache.delete();
mainRouter.push('/my/lists');
}
async function updateSettings() {
if (!list) return;
if (!list.value) return;
await os.apiWithDialog('users/lists/update', {
listId: list.id,
listId: list.value.id,
name: name.value,
isPublic: isPublic.value,
});
userListsCache.delete();
list.name = name.value;
list.isPublic = isPublic.value;
list.value.name = name.value;
list.value.isPublic = isPublic.value;
}
watch(() => props.listId, fetchList, { immediate: true });
const headerActions = $computed(() => []);
const headerActions = computed(() => []);
const headerTabs = $computed(() => []);
const headerTabs = computed(() => []);
definePageMetadata(computed(() => list ? {
title: list.name,
definePageMetadata(computed(() => list.value ? {
title: list.value.name,
icon: 'ph-list ph-bold ph-lg',
} : null));
</script>