octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Fix #271

Browse Source 
Added follow as menu option
This commit is contained in:
xmflsct
2023-01-08 16:59:35 +01:00
parent 9e0e8db82a
commit 6ce78e94f8
25 changed files with 611 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
src/components/contextMenu/account.ts
View File

@ -3,6 +3,7 @@ import { displayMessage } from '@components/Message'
import { useNavigation } from '@react-navigation/native'
import { NativeStackNavigationProp } from '@react-navigation/native-stack'
import { useQueryClient } from '@tanstack/react-query'
import apiInstance from '@utils/api/instance'
import { TabSharedStackParamList, useNavState } from '@utils/navigation/navigators'
import { useAccountQuery } from '@utils/queryHooks/account'
import {
@ -14,7 +15,7 @@ import {
MutationVarsTimelineUpdateAccountProperty,
useTimelineMutation
} from '@utils/queryHooks/timeline'
import { useAccountStorage } from '@utils/storage/actions'
import { getAccountStorage, getReadableAccounts, useAccountStorage } from '@utils/storage/actions'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { Alert, Platform } from 'react-native'
@ -29,13 +30,13 @@ const menuAccount = ({
openChange: boolean
account?: Partial<Mastodon.Account> & Pick<Mastodon.Account, 'id' | 'username' | 'acct' | 'url'>
status?: Mastodon.Status
}): ContextMenu[][] => {
}): ContextMenu => {
const navigation =
useNavigation<NativeStackNavigationProp<TabSharedStackParamList, any, undefined>>()
const navState = useNavState()
const { t } = useTranslation(['common', 'componentContextMenu', 'componentRelationship'])
const menus: ContextMenu[][] = [[]]
const menus: ContextMenu = [[]]
const [enabled, setEnabled] = useState(openChange)
useEffect(() => {
@ -135,8 +136,9 @@ const menuAccount = ({
if (!ownAccount && Platform.OS !== 'android' && type !== 'account') {
menus[0].push({
type: 'item',
key: 'account-following',
item: {
props: {
onSelect: () =>
data &&
actualAccount &&
@ -165,8 +167,9 @@ const menuAccount = ({
if (!ownAccount) {
menus[0].push({
type: 'item',
key: 'account-list',
item: {
props: {
onSelect: () => navigation.navigate('Tab-Shared-Account-In-Lists', { account }),
disabled: Platform.OS !== 'android' ? !data || !isFetched : false,
destructive: false,
@ -176,8 +179,9 @@ const menuAccount = ({
icon: 'checklist'
})
menus[0].push({
type: 'item',
key: 'account-show-boosts',
item: {
props: {
onSelect: () =>
actualAccount &&
relationshipMutation.mutate({
@ -196,8 +200,9 @@ const menuAccount = ({
icon: data?.showing_reblogs ? 'rectangle.on.rectangle.slash' : 'rectangle.on.rectangle'
})
menus[0].push({
type: 'item',
key: 'account-mute',
item: {
props: {
onSelect: () =>
actualAccount &&
timelineMutation.mutate({
@ -216,58 +221,139 @@ const menuAccount = ({
icon: data?.muting ? 'eye' : 'eye.slash'
})
const followAs = () => {
if (type !== 'account') return
const accounts = getReadableAccounts()
menus[0].push({
type: 'sub',
key: 'account-follow-as',
trigger: {
key: 'account-follow-as',
props: { destructive: false, disabled: false, hidden: !accounts.length },
title: t('componentContextMenu:account.followAs.trigger'),
icon: 'person.badge.plus'
},
items: accounts.map(a => ({
key: `account-${a.key}`,
props: {
onSelect: async () => {
const lookup = await apiInstance<Mastodon.Account>({
account: a.key,
method: 'get',
url: 'accounts/lookup',
params: {
acct:
account.acct === account.username
? `${account.acct}@${getAccountStorage.string('auth.account.domain')}`
: account.acct
}
}).then(res => res.body)
await apiInstance({
account: a.key,
method: 'post',
url: `accounts/${lookup.id}/follow`
})
.then(() =>
displayMessage({
type: 'success',
message: t('componentContextMenu:account.followAs.succeed', {
context: account.locked ? 'locked' : 'default',
defaultValue: 'default',
target: account.acct,
source: a.acct
})
})
)
.catch(err =>
displayMessage({
type: 'error',
message: t('common:message.error.message', {
function: t('componentContextMenu:account.followAs.failed')
}),
...(err.status &&
typeof err.status === 'number' &&
err.data &&
err.data.error &&
typeof err.data.error === 'string' && {
description: err.data.error
})
})
)
},
disabled: false,
destructive: false,
hidden: a.active
},
title: a.acct
}))
})
}
followAs()
menus.push([
{
key: 'account-block',
item: {
onSelect: () =>
Alert.alert(
t('componentContextMenu:account.block.alert.title', {
username: actualAccount?.username
}),
undefined,
[
{
text: t('common:buttons.confirm'),
style: 'destructive',
onPress: () =>
actualAccount &&
timelineMutation.mutate({
type: 'updateAccountProperty',
id: actualAccount.id,
payload: { property: 'block', currentValue: data?.blocking }
})
},
{
text: t('common:buttons.cancel')
}
]
),
disabled: Platform.OS !== 'android' ? !data || !isFetched : false,
destructive: !data?.blocking,
hidden: false
type: 'sub',
key: 'account-block-report',
trigger: {
key: 'account-block-report',
props: { destructive: true, disabled: false, hidden: false },
title: t('componentContextMenu:account.blockReport'),
icon: 'hand.raised'
},
title: t('componentContextMenu:account.block.action', {
defaultValue: 'false',
context: (data?.blocking || false).toString()
}),
icon: data?.blocking ? 'checkmark.circle' : 'xmark.circle'
},
{
key: 'account-reports',
item: {
onSelect: () =>
actualAccount &&
navigation.navigate('Tab-Shared-Report', {
account: actualAccount,
status
items: [
{
key: 'account-block',
props: {
onSelect: () =>
Alert.alert(
t('componentContextMenu:account.block.alert.title', {
username: actualAccount?.username
}),
undefined,
[
{
text: t('common:buttons.confirm'),
style: 'destructive',
onPress: () =>
actualAccount &&
timelineMutation.mutate({
type: 'updateAccountProperty',
id: actualAccount.id,
payload: { property: 'block', currentValue: data?.blocking }
})
},
{
text: t('common:buttons.cancel')
}
]
),
disabled: Platform.OS !== 'android' ? !data || !isFetched : false,
destructive: !data?.blocking,
hidden: false
},
title: t('componentContextMenu:account.block.action', {
defaultValue: 'false',
context: (data?.blocking || false).toString()
}),
disabled: Platform.OS !== 'android' ? !data || !isFetched : false,
destructive: true,
hidden: false
},
title: t('componentContextMenu:account.reports.action'),
icon: 'flag'
icon: data?.blocking ? 'checkmark.circle' : 'xmark.circle'
},
{
key: 'account-reports',
props: {
onSelect: () =>
actualAccount &&
navigation.navigate('Tab-Shared-Report', {
account: actualAccount,
status
}),
disabled: Platform.OS !== 'android' ? !data || !isFetched : false,
destructive: true,
hidden: false
},
title: t('componentContextMenu:account.reports.action'),
icon: 'flag'
}
]
}
])
}

80
src/components/contextMenu/at.ts
View File

@ -3,51 +3,51 @@ import { NativeStackNavigationProp } from '@react-navigation/native-stack'
import { RootStackParamList, useNavState } from '@utils/navigation/navigators'
import { useTranslation } from 'react-i18next'
const menuAt = ({ account }: { account: Mastodon.Account }): ContextMenu[][] => {
const menuAt = ({ account }: { account: Mastodon.Account }): ContextMenu => {
const { t } = useTranslation('componentContextMenu')
const navigation = useNavigation<NativeStackNavigationProp<RootStackParamList>>()
const navigationState = useNavState()
const menus: ContextMenu[][] = []
menus.push([
{
key: 'at-direct',
item: {
onSelect: () =>
navigation.navigate('Screen-Compose', {
type: 'conversation',
accts: [account.acct],
visibility: 'direct',
navigationState
}),
disabled: false,
destructive: false,
hidden: false
return [
[
{
type: 'item',
key: 'at-direct',
props: {
onSelect: () =>
navigation.navigate('Screen-Compose', {
type: 'conversation',
accts: [account.acct],
visibility: 'direct',
navigationState
}),
disabled: false,
destructive: false,
hidden: false
},
title: t('at.direct'),
icon: 'envelope'
},
title: t('at.direct'),
icon: 'envelope'
},
{
key: 'at-public',
item: {
onSelect: () =>
navigation.navigate('Screen-Compose', {
type: 'conversation',
accts: [account.acct],
visibility: 'public',
navigationState
}),
disabled: false,
destructive: false,
hidden: false
},
title: t('at.public'),
icon: 'at'
}
])
return menus
{
type: 'item',
key: 'at-public',
props: {
onSelect: () =>
navigation.navigate('Screen-Compose', {
type: 'conversation',
accts: [account.acct],
visibility: 'public',
navigationState
}),
disabled: false,
destructive: false,
hidden: false
},
title: t('at.public'),
icon: 'at'
}
]
]
}
export default menuAt

53
src/components/contextMenu/index.d.ts vendored
View File

@ -1,6 +1,53 @@
type ContextMenu = {
// type ContextMenu = (
// | {
// type: 'group'
// key: string
// items: ContextMenuItem[]
// }
// | {
// type: 'sub'
// key: string
// trigger: {
// key: string
// props: {
// disabled: boolean
// destructive: boolean
// hidden: boolean
// }
// title: string
// icon?: string
// }
// items: ContextMenuItem[]
// }
// )[]
type ContextMenu = (ContextMenuItem | ContextMenuSub)[][]
type ContextMenuItem = {
type: 'item'
key: string
item: { onSelect: () => void; disabled: boolean; destructive: boolean; hidden: boolean }
props: {
onSelect: () => void
disabled: boolean
destructive: boolean
hidden: boolean
}
title: string
icon: string
icon?: string
}
type ContextMenuSub = {
type: 'sub'
key: string
trigger: {
key: string
props: {
disabled: boolean
destructive: boolean
hidden: boolean
}
title: string
icon?: string
}
items: Omit<ContextMenuItem, 'type'>[]
}

7
src/components/contextMenu/instance.ts
View File

@ -12,7 +12,7 @@ const menuInstance = ({
}: {
status?: Mastodon.Status
queryKey?: QueryKeyTimeline
}): ContextMenu[][] => {
}): ContextMenu => {
if (!status || !queryKey) return []
const { t } = useTranslation(['common', 'componentContextMenu'])
@ -30,15 +30,16 @@ const menuInstance = ({
}
})
const menus: ContextMenu[][] = []
const menus: ContextMenu = []
const instance = parse(status.uri).hostname
if (instance !== getAccountStorage.string('auth.domain')) {
menus.push([
{
type: 'item',
key: 'instance-block',
item: {
props: {
onSelect: () =>
Alert.alert(
t('componentContextMenu:instance.block.alert.title', { instance }),

10
src/components/contextMenu/share.ts
View File

@ -15,18 +15,19 @@ const menuShare = (
type: 'account'
url?: string
}
): ContextMenu[][] => {
): ContextMenu => {
if (params.type === 'status' && params.visibility === 'direct') return []
const { t } = useTranslation('componentContextMenu')
const menus: ContextMenu[][] = [[]]
const menus: ContextMenu = [[]]
if (params.url) {
const url = params.url
menus[0].push({
type: 'item',
key: 'share',
item: {
props: {
onSelect: () => {
switch (Platform.OS) {
case 'ios':
@ -47,8 +48,9 @@ const menuShare = (
}
if (params.type === 'status')
menus[0].push({
type: 'item',
key: 'copy',
item: {
props: {
onSelect: () => {
Clipboard.setString(params.rawContent?.current.join(`\n\n`) || '')
displayMessage({ type: 'success', message: t(`copy.succeed`) })

19
src/components/contextMenu/status.ts
View File

@ -21,7 +21,7 @@ const menuStatus = ({
}: {
status?: Mastodon.Status
queryKey?: QueryKeyTimeline
}): ContextMenu[][] => {
}): ContextMenu => {
if (!status || !queryKey) return []
const navigation = useNavigation<NativeStackNavigationProp<RootStackParamList, 'Screen-Tabs'>>()
@ -55,7 +55,7 @@ const menuStatus = ({
}
})
const menus: ContextMenu[][] = []
const menus: ContextMenu = []
const [accountId] = useAccountStorage.string('auth.account.id')
const ownAccount = accountId === status.account?.id
@ -64,8 +64,9 @@ const menuStatus = ({
menus.push([
{
type: 'item',
key: 'status-edit',
item: {
props: {
onSelect: async () => {
let replyToStatus: Mastodon.Status | undefined = undefined
if (status.in_reply_to_id) {
@ -102,8 +103,9 @@ const menuStatus = ({
icon: 'square.and.pencil'
},
{
type: 'item',
key: 'status-delete-edit',
item: {
props: {
onSelect: () =>
Alert.alert(
t('componentContextMenu:status.deleteEdit.alert.title'),
@ -145,8 +147,9 @@ const menuStatus = ({
icon: 'pencil.and.outline'
},
{
type: 'item',
key: 'status-delete',
item: {
props: {
onSelect: () =>
Alert.alert(
t('componentContextMenu:status.delete.alert.title'),
@ -176,8 +179,9 @@ const menuStatus = ({
menus.push([
{
type: 'item',
key: 'status-mute',
item: {
props: {
onSelect: () =>
mutation.mutate({
type: 'updateStatusProperty',
@ -198,8 +202,9 @@ const menuStatus = ({
icon: status.muted ? 'speaker' : 'speaker.slash'
},
{
type: 'item',
key: 'status-pin',
item: {
props: {
onSelect: () =>
// Also note that reblogs cannot be pinned.
mutation.mutate({