etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-12-22 16:30:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

disable the per-user feed on mobile

Browse source
This commit is contained in:
Hazel K 2024-10-02 00:45:41 -04:00
parent 09b0de13bf
commit 93a4008d42
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend/src/components/FollowingFeedEntry.vue
View file

@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
--> -->
<template> <template>
<div :class="$style.root" @click="$emit('select', note.userId)"> <div :class="$style.root" @click="$emit('select', note.user)">
<div :class="$style.avatar"> <div :class="$style.avatar">
<MkAvatar :class="$style.icon" :user="note.user" indictor/> <MkAvatar :class="$style.icon" :user="note.user" indictor/>
</div> </div>
@ -35,7 +35,7 @@ defineProps<{
}>(); }>();
defineEmits<{ defineEmits<{
(event: 'select', userId: string): void (event: 'select', user: Misskey.entities.UserLite): void
}>(); }>();
</script> </script>

31
packages/frontend/src/pages/following-feed.vue
View file

@ -20,13 +20,13 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #default="{ items: notes }"> <template #default="{ items: notes }">
<MkDateSeparatedList v-slot="{ item: note }" :items="notes" :class="$style.panel" :noGap="true"> <MkDateSeparatedList v-slot="{ item: note }" :items="notes" :class="$style.panel" :noGap="true">
<FollowingFeedEntry :note="note" @select="selectUser"/> <FollowingFeedEntry :note="note" @select="userSelected"/>
</MkDateSeparatedList> </MkDateSeparatedList>
</template> </template>
</MkPagination> </MkPagination>
</MkPullToRefresh> </MkPullToRefresh>
<MkPullToRefresh :refresher="() => reloadUserNotes()"> <MkPullToRefresh v-if="isDesktop" :refresher="() => reloadUserNotes()">
<div v-if="selectedUser" :class="$style.userInfo"> <div v-if="selectedUser" :class="$style.userInfo">
<MkUserInfo class="user" :user="selectedUser"/> <MkUserInfo class="user" :user="selectedUser"/>
<MkNotes :noGap="true" :pagination="userNotesPagination"/> <MkNotes :noGap="true" :pagination="userNotesPagination"/>
@ -62,6 +62,7 @@ import FollowingFeedEntry from '@/components/FollowingFeedEntry.vue';
import MkNotes from '@/components/MkNotes.vue'; import MkNotes from '@/components/MkNotes.vue';
import MkUserInfo from '@/components/MkUserInfo.vue'; import MkUserInfo from '@/components/MkUserInfo.vue';
import { misskeyApi } from '@/scripts/misskey-api.js'; import { misskeyApi } from '@/scripts/misskey-api.js';
import {useRouter} from "@/router/supplier.js";
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
initialTab?: FollowingFeedTab, initialTab?: FollowingFeedTab,
@ -69,17 +70,37 @@ const props = withDefaults(defineProps<{
initialTab: followingTab, initialTab: followingTab,
}); });
const router = useRouter();
// Vue complains, but we *want* to lose reactivity here. // Vue complains, but we *want* to lose reactivity here.
// Otherwise, the user would be unable to change the tab. // Otherwise, the user would be unable to change the tab.
// eslint-disable-next-line vue/no-setup-props-reactivity-loss // eslint-disable-next-line vue/no-setup-props-reactivity-loss
const currentTab: Ref<FollowingFeedTab> = ref(props.initialTab); const currentTab: Ref<FollowingFeedTab> = ref(props.initialTab);
const mutualsOnly: Ref<boolean> = computed(() => currentTab.value === mutualsTab); const mutualsOnly: Ref<boolean> = computed(() => currentTab.value === mutualsTab);
// We have to disable the per-user feed on small displays, and it must be done through JS instead of CSS.
// Otherwise, the second column will resources in the background.
const desktopMediaQuery = window.matchMedia('(min-width: 750px)');
const isDesktop: Ref<boolean> = ref(desktopMediaQuery.matches);
desktopMediaQuery.addEventListener('change', () => isDesktop.value = desktopMediaQuery.matches);
const selectedUserError: Ref<string> = ref(''); const selectedUserError: Ref<string> = ref('');
const selectedUserId: Ref<string> = ref(''); const selectedUserId: Ref<string> = ref('');
const selectedUser: Ref<Misskey.entities.UserDetailed | null> = ref(null); const selectedUser: Ref<Misskey.entities.UserDetailed | null> = ref(null);
async function selectUser(userId: string): Promise<void> { async function userSelected(user: Misskey.entities.UserLite): Promise<void> {
if (isDesktop.value) {
await showUserNotes(user.id);
} else {
if (user.host) {
router.push(`/@${user.username}@${user.host}`);
} else {
router.push(`/@${user.username}`);
}
}
}
async function showUserNotes(userId: string): Promise<void> {
selectedUserError.value = ''; selectedUserError.value = '';
selectedUserId.value = userId; selectedUserId.value = userId;
selectedUser.value = null; selectedUser.value = null;
@ -103,7 +124,7 @@ async function reloadLatestNotes() {
} }
async function reloadUserNotes() { async function reloadUserNotes() {
await selectUser(selectedUserId.value); await showUserNotes(selectedUserId.value);
} }
async function reload() { async function reload() {
@ -121,7 +142,7 @@ async function onListReady(): Promise<void> {
// Wait for 1 second to match the animation effects. // Wait for 1 second to match the animation effects.
// Otherwise, the page appears to load "backwards". // Otherwise, the page appears to load "backwards".
await new Promise(resolve => setTimeout(resolve, 1000)); await new Promise(resolve => setTimeout(resolve, 1000));
await selectUser(selectedNote.userId); await showUserNotes(selectedNote.userId);
} }
} }