mirror of https://github.com/tooot-app/app
Fixed #118
This commit is contained in:
parent
8aa84f7568
commit
a023ad58f1
|
@ -4,7 +4,7 @@
|
||||||
"native": "210511",
|
"native": "210511",
|
||||||
"major": 2,
|
"major": 2,
|
||||||
"minor": 0,
|
"minor": 0,
|
||||||
"patch": 1,
|
"patch": 2,
|
||||||
"expo": "41.0.0"
|
"expo": "41.0.0"
|
||||||
},
|
},
|
||||||
"description": "tooot app for Mastodon",
|
"description": "tooot app for Mastodon",
|
||||||
|
|
|
@ -261,6 +261,15 @@ declare namespace Mastodon {
|
||||||
verified_at: string | null
|
verified_at: string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Filter = {
|
||||||
|
id: string
|
||||||
|
phrase: string
|
||||||
|
context: ('home' | 'notifications' | 'public' | 'thread' | 'account')[]
|
||||||
|
expires_at?: string
|
||||||
|
irreversible: boolean
|
||||||
|
whole_word: boolean
|
||||||
|
}
|
||||||
|
|
||||||
type List = {
|
type List = {
|
||||||
id: string
|
id: string
|
||||||
title: string
|
title: string
|
||||||
|
|
|
@ -13,6 +13,7 @@ import pushUseReceive from '@utils/push/useReceive'
|
||||||
import pushUseRespond from '@utils/push/useRespond'
|
import pushUseRespond from '@utils/push/useRespond'
|
||||||
import { updatePreviousTab } from '@utils/slices/contextsSlice'
|
import { updatePreviousTab } from '@utils/slices/contextsSlice'
|
||||||
import { updateAccountPreferences } from '@utils/slices/instances/updateAccountPreferences'
|
import { updateAccountPreferences } from '@utils/slices/instances/updateAccountPreferences'
|
||||||
|
import { updateFilters } from '@utils/slices/instances/updateFilters'
|
||||||
import { getInstanceActive, getInstances } from '@utils/slices/instancesSlice'
|
import { getInstanceActive, getInstances } from '@utils/slices/instancesSlice'
|
||||||
import { useTheme } from '@utils/styles/ThemeManager'
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
import { themes } from '@utils/styles/themes'
|
import { themes } from '@utils/styles/themes'
|
||||||
|
@ -106,6 +107,7 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
|
||||||
// Lazily update users's preferences, for e.g. composing default visibility
|
// Lazily update users's preferences, for e.g. composing default visibility
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (instanceActive !== -1) {
|
if (instanceActive !== -1) {
|
||||||
|
dispatch(updateFilters())
|
||||||
dispatch(updateAccountPreferences())
|
dispatch(updateAccountPreferences())
|
||||||
}
|
}
|
||||||
}, [instanceActive])
|
}, [instanceActive])
|
||||||
|
|
|
@ -10,14 +10,16 @@ import TimelinePoll from '@components/Timeline/Shared/Poll'
|
||||||
import { useNavigation } from '@react-navigation/native'
|
import { useNavigation } from '@react-navigation/native'
|
||||||
import { StackNavigationProp } from '@react-navigation/stack'
|
import { StackNavigationProp } from '@react-navigation/stack'
|
||||||
import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
|
import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
|
||||||
import { getInstanceAccount } from '@utils/slices/instancesSlice'
|
import { getInstance, getInstanceAccount } from '@utils/slices/instancesSlice'
|
||||||
import { StyleConstants } from '@utils/styles/constants'
|
import { StyleConstants } from '@utils/styles/constants'
|
||||||
import { useTheme } from '@utils/styles/ThemeManager'
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
|
import htmlparser2 from 'htmlparser2-without-node-native'
|
||||||
import { uniqBy } from 'lodash'
|
import { uniqBy } from 'lodash'
|
||||||
import React, { useCallback } from 'react'
|
import React, { useCallback } from 'react'
|
||||||
import { Pressable, StyleSheet, View } from 'react-native'
|
import { Pressable, StyleSheet, View } from 'react-native'
|
||||||
import { useSelector } from 'react-redux'
|
import { useSelector } from 'react-redux'
|
||||||
import TimelineActionsUsers from './Shared/ActionsUsers'
|
import TimelineActionsUsers from './Shared/ActionsUsers'
|
||||||
|
import TimelineFiltered, { shouldFilter } from './Shared/Filtered'
|
||||||
import TimelineFullConversation from './Shared/FullConversation'
|
import TimelineFullConversation from './Shared/FullConversation'
|
||||||
import TimelineTranslate from './Shared/Translate'
|
import TimelineTranslate from './Shared/Translate'
|
||||||
|
|
||||||
|
@ -49,6 +51,16 @@ const TimelineDefault: React.FC<Props> = ({
|
||||||
|
|
||||||
let actualStatus = item.reblog ? item.reblog : item
|
let actualStatus = item.reblog ? item.reblog : item
|
||||||
|
|
||||||
|
const ownAccount = actualStatus.account.id === instanceAccount?.id
|
||||||
|
|
||||||
|
if (
|
||||||
|
!highlighted &&
|
||||||
|
queryKey &&
|
||||||
|
shouldFilter({ status: actualStatus, queryKey })
|
||||||
|
) {
|
||||||
|
return <TimelineFiltered />
|
||||||
|
}
|
||||||
|
|
||||||
const onPress = useCallback(() => {
|
const onPress = useCallback(() => {
|
||||||
analytics('timeline_default_press', {
|
analytics('timeline_default_press', {
|
||||||
page: queryKey ? queryKey[1].page : origin
|
page: queryKey ? queryKey[1].page : origin
|
||||||
|
@ -118,7 +130,7 @@ const TimelineDefault: React.FC<Props> = ({
|
||||||
statusId={actualStatus.id}
|
statusId={actualStatus.id}
|
||||||
poll={actualStatus.poll}
|
poll={actualStatus.poll}
|
||||||
reblog={item.reblog ? true : false}
|
reblog={item.reblog ? true : false}
|
||||||
sameAccount={actualStatus.account.id === instanceAccount?.id}
|
sameAccount={ownAccount}
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
{!disableDetails &&
|
{!disableDetails &&
|
||||||
|
|
|
@ -17,6 +17,7 @@ import { uniqBy } from 'lodash'
|
||||||
import React, { useCallback } from 'react'
|
import React, { useCallback } from 'react'
|
||||||
import { Pressable, StyleSheet, View } from 'react-native'
|
import { Pressable, StyleSheet, View } from 'react-native'
|
||||||
import { useSelector } from 'react-redux'
|
import { useSelector } from 'react-redux'
|
||||||
|
import TimelineFiltered, { shouldFilter } from './Shared/Filtered'
|
||||||
import TimelineFullConversation from './Shared/FullConversation'
|
import TimelineFullConversation from './Shared/FullConversation'
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
|
@ -30,6 +31,13 @@ const TimelineNotifications: React.FC<Props> = ({
|
||||||
queryKey,
|
queryKey,
|
||||||
highlighted = false
|
highlighted = false
|
||||||
}) => {
|
}) => {
|
||||||
|
if (
|
||||||
|
notification.status &&
|
||||||
|
shouldFilter({ status: notification.status, queryKey })
|
||||||
|
) {
|
||||||
|
return <TimelineFiltered />
|
||||||
|
}
|
||||||
|
|
||||||
const { theme } = useTheme()
|
const { theme } = useTheme()
|
||||||
const instanceAccount = useSelector(
|
const instanceAccount = useSelector(
|
||||||
getInstanceAccount,
|
getInstanceAccount,
|
||||||
|
@ -38,6 +46,7 @@ const TimelineNotifications: React.FC<Props> = ({
|
||||||
const navigation = useNavigation<
|
const navigation = useNavigation<
|
||||||
StackNavigationProp<Nav.TabLocalStackParamList>
|
StackNavigationProp<Nav.TabLocalStackParamList>
|
||||||
>()
|
>()
|
||||||
|
|
||||||
const actualAccount = notification.status
|
const actualAccount = notification.status
|
||||||
? notification.status.account
|
? notification.status.account
|
||||||
: notification.account
|
: notification.account
|
||||||
|
|
|
@ -0,0 +1,105 @@
|
||||||
|
import { store } from '@root/store'
|
||||||
|
import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
|
||||||
|
import { getInstance, getInstanceAccount } from '@utils/slices/instancesSlice'
|
||||||
|
import { StyleConstants } from '@utils/styles/constants'
|
||||||
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
|
import htmlparser2 from 'htmlparser2-without-node-native'
|
||||||
|
import React from 'react'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import { Text, View } from 'react-native'
|
||||||
|
|
||||||
|
const TimelineFiltered = React.memo(
|
||||||
|
() => {
|
||||||
|
const { theme } = useTheme()
|
||||||
|
const { t } = useTranslation('componentTimeline')
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={{ backgroundColor: theme.backgroundDefault }}>
|
||||||
|
<Text
|
||||||
|
style={{
|
||||||
|
...StyleConstants.FontStyle.S,
|
||||||
|
color: theme.secondary,
|
||||||
|
textAlign: 'center',
|
||||||
|
paddingVertical: StyleConstants.Spacing.S,
|
||||||
|
paddingLeft: StyleConstants.Avatar.M + StyleConstants.Spacing.S
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{t('shared.filtered')}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
},
|
||||||
|
() => true
|
||||||
|
)
|
||||||
|
|
||||||
|
export const shouldFilter = ({
|
||||||
|
status,
|
||||||
|
queryKey
|
||||||
|
}: {
|
||||||
|
status: Mastodon.Status
|
||||||
|
queryKey: QueryKeyTimeline
|
||||||
|
}) => {
|
||||||
|
const instance = getInstance(store.getState())
|
||||||
|
const ownAccount =
|
||||||
|
getInstanceAccount(store.getState())?.id === status.account.id
|
||||||
|
|
||||||
|
let shouldFilter = false
|
||||||
|
if (queryKey && !ownAccount) {
|
||||||
|
const parser = new htmlparser2.Parser({
|
||||||
|
ontext (text: string) {
|
||||||
|
const checkFilter = (filter: Mastodon.Filter) => {
|
||||||
|
switch (filter.whole_word) {
|
||||||
|
case true:
|
||||||
|
if (new RegExp('\\b' + filter.phrase + '\\b').test(text)) {
|
||||||
|
shouldFilter = true
|
||||||
|
}
|
||||||
|
break
|
||||||
|
case false:
|
||||||
|
if (new RegExp(filter.phrase).test(text)) {
|
||||||
|
shouldFilter = true
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
instance?.filters.forEach(filter => {
|
||||||
|
if (filter.expires_at) {
|
||||||
|
if (new Date().getTime() > new Date(filter.expires_at).getTime()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (queryKey[1].page) {
|
||||||
|
case 'Following':
|
||||||
|
case 'Local':
|
||||||
|
case 'List':
|
||||||
|
case 'Account_Default':
|
||||||
|
if (filter.context.includes('home')) {
|
||||||
|
checkFilter(filter)
|
||||||
|
}
|
||||||
|
break
|
||||||
|
case 'Notifications':
|
||||||
|
if (filter.context.includes('notifications')) {
|
||||||
|
checkFilter(filter)
|
||||||
|
}
|
||||||
|
break
|
||||||
|
case 'LocalPublic':
|
||||||
|
if (filter.context.includes('public')) {
|
||||||
|
checkFilter(filter)
|
||||||
|
}
|
||||||
|
break
|
||||||
|
case 'Toot':
|
||||||
|
if (filter.context.includes('thread')) {
|
||||||
|
checkFilter(filter)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
parser.write(status.content)
|
||||||
|
parser.end()
|
||||||
|
}
|
||||||
|
|
||||||
|
return shouldFilter
|
||||||
|
}
|
||||||
|
|
||||||
|
export default TimelineFiltered
|
|
@ -73,6 +73,7 @@
|
||||||
"content": {
|
"content": {
|
||||||
"expandHint": "hidden content"
|
"expandHint": "hidden content"
|
||||||
},
|
},
|
||||||
|
"filtered": "Filtered",
|
||||||
"fullConversation": "Read conversations",
|
"fullConversation": "Read conversations",
|
||||||
"translate": {
|
"translate": {
|
||||||
"default": "Translate",
|
"default": "Translate",
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
import apiInstance from '@api/instance'
|
||||||
|
import { createAsyncThunk } from '@reduxjs/toolkit'
|
||||||
|
|
||||||
|
export const updateFilters = createAsyncThunk(
|
||||||
|
'instances/updateFilters',
|
||||||
|
async (): Promise<Mastodon.Filter[]> => {
|
||||||
|
return apiInstance<Mastodon.Filter[]>({
|
||||||
|
method: 'get',
|
||||||
|
url: `filters`
|
||||||
|
}).then(res => res.body)
|
||||||
|
}
|
||||||
|
)
|
|
@ -6,6 +6,7 @@ import { findIndex } from 'lodash'
|
||||||
import addInstance from './instances/add'
|
import addInstance from './instances/add'
|
||||||
import removeInstance from './instances/remove'
|
import removeInstance from './instances/remove'
|
||||||
import { updateAccountPreferences } from './instances/updateAccountPreferences'
|
import { updateAccountPreferences } from './instances/updateAccountPreferences'
|
||||||
|
import { updateFilters } from './instances/updateFilters'
|
||||||
import { updateInstancePush } from './instances/updatePush'
|
import { updateInstancePush } from './instances/updatePush'
|
||||||
import { updateInstancePushAlert } from './instances/updatePushAlert'
|
import { updateInstancePushAlert } from './instances/updatePushAlert'
|
||||||
import { updateInstancePushDecode } from './instances/updatePushDecode'
|
import { updateInstancePushDecode } from './instances/updatePushDecode'
|
||||||
|
@ -29,6 +30,7 @@ export type Instance = {
|
||||||
avatarStatic: Mastodon.Account['avatar_static']
|
avatarStatic: Mastodon.Account['avatar_static']
|
||||||
preferences: Mastodon.Preferences
|
preferences: Mastodon.Preferences
|
||||||
}
|
}
|
||||||
|
filters: Mastodon.Filter[]
|
||||||
notifications_filter: {
|
notifications_filter: {
|
||||||
follow: boolean
|
follow: boolean
|
||||||
favourite: boolean
|
favourite: boolean
|
||||||
|
@ -236,6 +238,15 @@ const instancesSlice = createSlice({
|
||||||
console.error(action.error)
|
console.error(action.error)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Update Instance Account Filters
|
||||||
|
.addCase(updateFilters.fulfilled, (state, action) => {
|
||||||
|
const activeIndex = findInstanceActive(state.instances)
|
||||||
|
state.instances[activeIndex].filters = action.payload
|
||||||
|
})
|
||||||
|
.addCase(updateFilters.rejected, (_, action) => {
|
||||||
|
console.error(action.error)
|
||||||
|
})
|
||||||
|
|
||||||
// Update Instance Account Preferences
|
// Update Instance Account Preferences
|
||||||
.addCase(updateAccountPreferences.fulfilled, (state, action) => {
|
.addCase(updateAccountPreferences.fulfilled, (state, action) => {
|
||||||
const activeIndex = findInstanceActive(state.instances)
|
const activeIndex = findInstanceActive(state.instances)
|
||||||
|
|
Loading…
Reference in New Issue