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:
#	package.json
#	packages/backend/src/server/api/stream/ChannelsService.ts
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/mute-block.vue
This commit is contained in:
mattyatea 2023-12-28 04:42:28 +09:00
commit d19a4ab8a3
208 changed files with 1404 additions and 740 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend/src/pages/user/clips.vue
View file

@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed } from 'vue';
import * as Misskey from 'misskey-js';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkPagination from '@/components/MkPagination.vue';
const props = defineProps<{
user: Misskey.entities.User;
@ -31,7 +31,7 @@ const pagination = {
params: computed(() => ({
userId: props.user.id,
})),
} satisfies Paging;
};
</script>
<style lang="scss" module>

4
packages/frontend/src/pages/user/flashs.vue
View file

@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed } from 'vue';
import * as Misskey from 'misskey-js';
import MkFlashPreview from '@/components/MkFlashPreview.vue';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkPagination from '@/components/MkPagination.vue';
const props = defineProps<{
user: Misskey.entities.User;
@ -27,5 +27,5 @@ const pagination = {
params: computed(() => ({
userId: props.user.id,
})),
} satisfies Paging;
};
</script>

6
packages/frontend/src/pages/user/follow-list.vue
View file

@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed } from 'vue';
import * as Misskey from 'misskey-js';
import MkUserInfo from '@/components/MkUserInfo.vue';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkPagination from '@/components/MkPagination.vue';
const props = defineProps<{
user: Misskey.entities.User;
@ -30,7 +30,7 @@ const followingPagination = {
params: computed(() => ({
userId: props.user.id,
})),
} satisfies Paging;
};
const followersPagination = {
endpoint: 'users/followers' as const,
@ -38,7 +38,7 @@ const followersPagination = {
params: computed(() => ({
userId: props.user.id,
})),
} satisfies Paging;
};
</script>
<style lang="scss" module>

4
packages/frontend/src/pages/user/gallery.vue
View file

@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed } from 'vue';
import * as Misskey from 'misskey-js';
import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkPagination from '@/components/MkPagination.vue';
const props = withDefaults(defineProps<{
user: Misskey.entities.User;
@ -30,7 +30,7 @@ const pagination = {
params: computed(() => ({
userId: props.user.id,
})),
} satisfies Paging;
};
</script>
<style lang="scss" module>

4
packages/frontend/src/pages/user/lists.vue
View file

@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import {} from 'vue';
import * as Misskey from 'misskey-js';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkPagination from '@/components/MkPagination.vue';
import MkStickyContainer from '@/components/global/MkStickyContainer.vue';
import MkSpacer from '@/components/global/MkSpacer.vue';
import MkAvatars from '@/components/MkAvatars.vue';
@ -37,7 +37,7 @@ const pagination = {
params: {
userId: props.user.id,
},
} satisfies Paging;
};
</script>
<style lang="scss" module>

4
packages/frontend/src/pages/user/pages.vue
View file

@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed } from 'vue';
import * as Misskey from 'misskey-js';
import MkPagePreview from '@/components/MkPagePreview.vue';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkPagination from '@/components/MkPagination.vue';
const props = defineProps<{
user: Misskey.entities.User;
@ -27,5 +27,5 @@ const pagination = {
params: computed(() => ({
userId: props.user.id,
})),
} satisfies Paging;
};
</script>

4
packages/frontend/src/pages/user/reactions.vue
View file

@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed } from 'vue';
import * as Misskey from 'misskey-js';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkPagination from '@/components/MkPagination.vue';
import MkNote from '@/components/MkNote.vue';
import MkReactionIcon from '@/components/MkReactionIcon.vue';
@ -35,7 +35,7 @@ const pagination = {
params: computed(() => ({
userId: props.user.id,
})),
} satisfies Paging;
};
</script>
<style lang="scss" module>