diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-05-12 09:38:43 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-05-12 09:38:43 +0000 |
| commit | 1eb57201b4ed19a346ad7f488ea2b55af7e893b1 (patch) | |
| tree | 69f14ada78f35b6276743ab47607ac69ffe006e8 /packages/frontend/src/components | |
| parent | merge: Add new role conditions for local/remote followers/followees (!1002) (diff) | |
| parent | refactor following feed to avoid circular dependency (diff) | |
| download | sharkey-1eb57201b4ed19a346ad7f488ea2b55af7e893b1.tar.gz sharkey-1eb57201b4ed19a346ad7f488ea2b55af7e893b1.tar.bz2 sharkey-1eb57201b4ed19a346ad7f488ea2b55af7e893b1.zip | |
merge: Fix circular dependency in following feed (!1013)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1013
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/SkFollowingRecentNotes.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/SkRemoteFollowersWarning.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/frontend/src/components/SkFollowingRecentNotes.vue b/packages/frontend/src/components/SkFollowingRecentNotes.vue index df5e7da5c0..bc8560bbb0 100644 --- a/packages/frontend/src/components/SkFollowingRecentNotes.vue +++ b/packages/frontend/src/components/SkFollowingRecentNotes.vue @@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script setup lang="ts"> import * as Misskey from 'misskey-js'; import { computed, shallowRef } from 'vue'; -import type { FollowingFeedTab } from '@/utility/following-feed-utils.js'; +import type { FollowingFeedTab } from '@/types/following-feed.js'; import type { Paging } from '@/components/MkPagination.vue'; import { infoImageUrl } from '@/instance.js'; import { i18n } from '@/i18n.js'; diff --git a/packages/frontend/src/components/SkRemoteFollowersWarning.vue b/packages/frontend/src/components/SkRemoteFollowersWarning.vue index bc15dd40ba..32d57477de 100644 --- a/packages/frontend/src/components/SkRemoteFollowersWarning.vue +++ b/packages/frontend/src/components/SkRemoteFollowersWarning.vue @@ -11,10 +11,10 @@ SPDX-License-Identifier: AGPL-3.0-only <script setup lang="ts"> import { computed } from 'vue'; -import type { FollowingFeedModel } from '@/utility/following-feed-utils.js'; +import type { FollowingFeedModel } from '@/types/following-feed.js'; import { i18n } from '@/i18n.js'; import MkInfo from '@/components/MkInfo.vue'; -import { followersTab } from '@/utility/following-feed-utils.js'; +import { followersTab } from '@/types/following-feed.js'; const props = defineProps<{ model: FollowingFeedModel, |