Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
mirror of https://github.com/h3poteto/whalebird-desktop synced 2025-02-05 11:48:08 +01:00
Code Issues Releases Wiki Activity

refs #4257 Check followRequests in SideMenu

Browse Source
This commit is contained in:
AkiraFukushima 2023-06-03 16:43:59 +09:00
parent c756e2e232
commit c32560c05c
No known key found for this signature in database
GPG Key ID: B6E51BAC4DE1A957
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/renderer/components/TimelineSpace/SideMenu.vue
View File

@ -89,7 +89,7 @@
</template> </template>
</el-menu-item> </el-menu-item>
<el-menu-item <el-menu-item
v-if="unreadFollowRequests" v-if="followRequests.length > 0"
:index="`/${id}/follow-requests`" :index="`/${id}/follow-requests`"
role="menuitem" role="menuitem"
:title="$t('side_menu.follow_requests')" :title="$t('side_menu.follow_requests')"
@ -271,6 +271,7 @@ export default defineComponent({
const lists = ref<Array<Entity.List>>([]) const lists = ref<Array<Entity.List>>([])
const tags = ref<Array<LocalTag>>([]) const tags = ref<Array<LocalTag>>([])
const followRequests = ref<Array<Entity.FollowRequest | Entity.Account>>([])
const enabledTimelines = reactive({ const enabledTimelines = reactive({
home: true, home: true,
notification: true, notification: true,
@ -292,7 +293,6 @@ export default defineComponent({
const unreadLocalTimeline = computed(() => store.state.TimelineSpace.SideMenu.unreadLocalTimeline) const unreadLocalTimeline = computed(() => store.state.TimelineSpace.SideMenu.unreadLocalTimeline)
const unreadDirectMessagesTimeline = computed(() => store.state.TimelineSpace.SideMenu.unreadDirectMessagesTimeline) const unreadDirectMessagesTimeline = computed(() => store.state.TimelineSpace.SideMenu.unreadDirectMessagesTimeline)
const unreadPublicTimeline = computed(() => store.state.TimelineSpace.SideMenu.unreadPublicTimeline) const unreadPublicTimeline = computed(() => store.state.TimelineSpace.SideMenu.unreadPublicTimeline)
const unreadFollowRequests = computed(() => store.state.TimelineSpace.SideMenu.unreadFollowRequests)
const collapse = computed(() => store.state.TimelineSpace.SideMenu.collapse) const collapse = computed(() => store.state.TimelineSpace.SideMenu.collapse)
const themeColor = computed(() => store.state.App.theme.side_menu_color) const themeColor = computed(() => store.state.App.theme.side_menu_color)
const hideGlobalHeader = computed(() => store.state.GlobalHeader.hide) const hideGlobalHeader = computed(() => store.state.GlobalHeader.hide)
@ -307,11 +307,17 @@ export default defineComponent({
account.server = s account.server = s
const client = generator(s.sns, s.baseURL, a.accessToken, userAgent.value) const client = generator(s.sns, s.baseURL, a.accessToken, userAgent.value)
await fetchFollowRequests(client)
await fetchLists(client) await fetchLists(client)
await fetchTags(a) await fetchTags(a)
await confirmTimelines(client) await confirmTimelines(client)
}) })
const fetchFollowRequests = async (client: MegalodonInterface) => {
const res = await client.getFollowRequests()
followRequests.value = res.data
}
const fetchLists = async (client: MegalodonInterface) => { const fetchLists = async (client: MegalodonInterface) => {
const res = await client.getLists() const res = await client.getLists()
lists.value = res.data lists.value = res.data
@ -391,7 +397,7 @@ export default defineComponent({
unreadLocalTimeline, unreadLocalTimeline,
unreadDirectMessagesTimeline, unreadDirectMessagesTimeline,
unreadPublicTimeline, unreadPublicTimeline,
unreadFollowRequests, followRequests,
lists, lists,
tags, tags,
collapse, collapse,

6
src/renderer/store/TimelineSpace/SideMenu.ts
View File

@ -10,7 +10,6 @@ export type SideMenuState = {
unreadLocalTimeline: boolean unreadLocalTimeline: boolean
unreadDirectMessagesTimeline: boolean unreadDirectMessagesTimeline: boolean
unreadPublicTimeline: boolean unreadPublicTimeline: boolean
unreadFollowRequests: boolean
collapse: boolean collapse: boolean
} }
@ -20,7 +19,6 @@ const state = (): SideMenuState => ({
unreadLocalTimeline: false, unreadLocalTimeline: false,
unreadDirectMessagesTimeline: false, unreadDirectMessagesTimeline: false,
unreadPublicTimeline: false, unreadPublicTimeline: false,
unreadFollowRequests: false,
collapse: false collapse: false
}) })
@ -30,7 +28,6 @@ export const MUTATION_TYPES = {
CHANGE_UNREAD_LOCAL_TIMELINE: 'changeUnreadLocalTimeline', CHANGE_UNREAD_LOCAL_TIMELINE: 'changeUnreadLocalTimeline',
CHANGE_UNREAD_DIRECT_MESSAGES_TIMELINE: 'changeUnreadDirectMessagesTimeline', CHANGE_UNREAD_DIRECT_MESSAGES_TIMELINE: 'changeUnreadDirectMessagesTimeline',
CHANGE_UNREAD_PUBLIC_TIMELINE: 'changeUnreadPublicTimeline', CHANGE_UNREAD_PUBLIC_TIMELINE: 'changeUnreadPublicTimeline',
CHANGE_UNREAD_FOLLOW_REQUESTS: 'changeUnreadFollowRequests',
CHANGE_COLLAPSE: 'changeCollapse' CHANGE_COLLAPSE: 'changeCollapse'
} }
@ -50,9 +47,6 @@ const mutations: MutationTree<SideMenuState> = {
[MUTATION_TYPES.CHANGE_UNREAD_PUBLIC_TIMELINE]: (state, value: boolean) => { [MUTATION_TYPES.CHANGE_UNREAD_PUBLIC_TIMELINE]: (state, value: boolean) => {
state.unreadPublicTimeline = value state.unreadPublicTimeline = value
}, },
[MUTATION_TYPES.CHANGE_UNREAD_FOLLOW_REQUESTS]: (state, value: boolean) => {
state.unreadFollowRequests = value
},
[MUTATION_TYPES.CHANGE_COLLAPSE]: (state, collapse: boolean) => { [MUTATION_TYPES.CHANGE_COLLAPSE]: (state, collapse: boolean) => {
state.collapse = collapse state.collapse = collapse
} }