ai/at
1
0
Fork 0
Code Wiki Activity

fix

Browse Source
This commit is contained in:
syui
2025-12-07 23:15:31 +09:00
parent 7d2d140172
commit 6556438b82
5 changed files with 85 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ios/patching/008-social-app-ios-policy-tos-error.patch
View File

@@ -1,8 +1,8 @@
diff --git a/src/view/screens/PrivacyPolicy.tsx b/src/view/screens/PrivacyPolicy.tsx
index a89eaadc4..045f660ef 100644
index a89eaadc4..1da393f03 100644
--- a/src/view/screens/PrivacyPolicy.tsx
+++ b/src/view/screens/PrivacyPolicy.tsx
@@ -1,51 +1,28 @@
@@ -1,52 +1,13 @@
import React from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
@@ -19,7 +19,7 @@ index a89eaadc4..045f660ef 100644
-import {TextLink} from '#/view/com/util/Link'
-import {Text} from '#/view/com/util/text/Text'
-import {ScrollView} from '#/view/com/util/Views'
+import {ScrollView} from 'react-native'
+import { WebView } from 'react-native-webview'
import * as Layout from '#/components/Layout'
-import {ViewHeader} from '../com/util/ViewHeader'
-
@@ -28,19 +28,16 @@ index a89eaadc4..045f660ef 100644
- const pal = usePalette('default')
- const {_} = useLingui()
- const setMinimalShellMode = useSetMinimalShellMode()
+import {useSetTitle} from '#/lib/hooks/useSetTitle'
+import {atoms as a, useTheme} from '#/alf'
+import {Text} from '#/components/Typography'
-
- useFocusEffect(
- React.useCallback(() => {
- setMinimalShellMode(false)
- }, [setMinimalShellMode]),
- )
+import {useSetTitle} from '#/lib/hooks/useSetTitle'
+export function PrivacyPolicyScreen() {
+ useSetTitle('Privacy Policy')
+ const t = useTheme()
return (
<Layout.Screen>
- <ViewHeader title={_(msg`Privacy Policy`)} />
@@ -58,26 +55,16 @@ index a89eaadc4..045f660ef 100644
- </Text>
- </View>
- <View style={s.footerSpacer} />
+ <ScrollView
+ style={[a.flex_1, {backgroundColor: t.palette.white}]}
+ contentContainerStyle={[a.p_lg, a.pt_5xl, a.pb_5xl]}>
+ <Text style={[a.text_2xl, a.font_bold, a.mb_lg]}>Privacy Policy</Text>
+
+ <Text style={[a.mb_md]}>
+ Please refer to the following page for the Privacy Policy.
+ </Text>
+
+ <Text style={[a.text_md, a.mb_md, {color: t.palette.primary_500}]}>
+ https://syu.is/about/support/privacy-policy
+ </Text>
</ScrollView>
- </ScrollView>
+ <WebView source={{ uri: 'https://syu.is/about/support/privacy-policy' }} style={{ flex: 1 }} />
</Layout.Screen>
)
}
diff --git a/src/view/screens/TermsOfService.tsx b/src/view/screens/TermsOfService.tsx
index d843c713c..324b270af 100644
index d843c713c..b81767bd5 100644
--- a/src/view/screens/TermsOfService.tsx
+++ b/src/view/screens/TermsOfService.tsx
@@ -1,49 +1,28 @@
@@ -1,50 +1,13 @@
import React from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
@@ -94,7 +81,7 @@ index d843c713c..324b270af 100644
-import {TextLink} from '#/view/com/util/Link'
-import {Text} from '#/view/com/util/text/Text'
-import {ScrollView} from '#/view/com/util/Views'
+import {ScrollView} from 'react-native'
+import { WebView } from 'react-native-webview'
import * as Layout from '#/components/Layout'
-import {ViewHeader} from '../com/util/ViewHeader'
-
@@ -103,19 +90,16 @@ index d843c713c..324b270af 100644
- const pal = usePalette('default')
- const setMinimalShellMode = useSetMinimalShellMode()
- const {_} = useLingui()
+import {useSetTitle} from '#/lib/hooks/useSetTitle'
+import {atoms as a, useTheme} from '#/alf'
+import {Text} from '#/components/Typography'
-
- useFocusEffect(
- React.useCallback(() => {
- setMinimalShellMode(false)
- }, [setMinimalShellMode]),
- )
+import {useSetTitle} from '#/lib/hooks/useSetTitle'
+export function TermsOfServiceScreen() {
+ useSetTitle('Terms of Service')
+ const t = useTheme()
return (
<Layout.Screen>
- <ViewHeader title={_(msg`Terms of Service`)} />
@@ -131,18 +115,8 @@ index d843c713c..324b270af 100644
- </Text>
- </View>
- <View style={s.footerSpacer} />
+ <ScrollView
+ style={[a.flex_1, {backgroundColor: t.palette.white}]}
+ contentContainerStyle={[a.p_lg, a.pt_5xl, a.pb_5xl]}>
+ <Text style={[a.text_2xl, a.font_bold, a.mb_lg]}>Terms of Service</Text>
+
+ <Text style={[a.mb_md]}>
+ Please refer to the following page for the Terms of Service.
+ </Text>
+
+ <Text style={[a.text_md, a.mb_md, {color: t.palette.primary_500}]}>
+ https://syu.is/about/support/tos
+ </Text>
</ScrollView>
- </ScrollView>
+ <WebView source={{ uri: 'https://syu.is/about/support/tos' }} style={{ flex: 1 }} />
</Layout.Screen>
)
}

35
ios/patching/009-social-app-ios-license.patch
View File

@@ -91,7 +91,7 @@ index 000000000..f98cd6afc
+ )
+}
diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx
index ed2a6cfb7..0eba4edc4 100644
index ed2a6cfb7..2f387b4a8 100644
--- a/src/view/shell/Drawer.tsx
+++ b/src/view/shell/Drawer.tsx
@@ -1,60 +1,50 @@
@@ -665,8 +665,12 @@ index ed2a6cfb7..0eba4edc4 100644
]}>
<View
style={[
@@ -689,21 +447,25 @@ function ExtraLinks() {
const {_} = useLingui()
@@ -686,37 +444,23 @@ function MenuItem({icon, label, count, bold, onPress}: MenuItemProps) {
}
function ExtraLinks() {
- const {_} = useLingui()
+ const { _ } = useLingui()
const t = useTheme()
const kawaii = useKawaiiMode()
+ const navigation = useNavigation<NavigationProp>()
@@ -685,21 +689,28 @@ index ed2a6cfb7..0eba4edc4 100644
- label={_(msg`Privacy Policy`)}>
- <Trans>Privacy Policy</Trans>
- </InlineLinkText>
- {kawaii && (
- <Text style={t.atoms.text_contrast_medium}>
- <Trans>
- Logo by{' '}
- <InlineLinkText
- style={[a.text_md]}
- to="/profile/sawaratsuki.bsky.social"
- label="@sawaratsuki.bsky.social">
- @sawaratsuki.bsky.social
- </InlineLinkText>
- </Trans>
+ <TouchableOpacity onPress={() => navigation.navigate('TermsOfService')}>
+ <Text style={[a.text_md, t.atoms.text_contrast_medium]}>
+ <Trans>Terms of Service</Trans>
+ </Text>
</Text>
- )}
+ </TouchableOpacity>
+ <TouchableOpacity onPress={() => navigation.navigate('PrivacyPolicy')}>
+ <Text style={[a.text_md, t.atoms.text_contrast_medium]}>
+ <Trans>Privacy Policy</Trans>
+ </Text>
+ </TouchableOpacity>
+ <TouchableOpacity onPress={() => navigation.navigate('License')}>
+ <Text style={[a.text_md, t.atoms.text_contrast_medium]}>
+ <Trans>License</Trans>
+ </Text>
+ </TouchableOpacity>
{kawaii && (
<Text style={t.atoms.text_contrast_medium}>
<Trans>
</View>
)
}

127
ios/patching/012-social-app-ios-settings-about-help.patch
View File

@@ -1,73 +1,16 @@
diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx
index 6b8257b91..db64d6a69 100644
index 6b8257b91..88a181dcb 100644
--- a/src/screens/Settings/AboutSettings.tsx
+++ b/src/screens/Settings/AboutSettings.tsx
@@ -1,40 +1,40 @@
-import {useMemo} from 'react'
-import {Platform} from 'react-native'
-import {setStringAsync} from 'expo-clipboard'
+import { useMemo } from 'react'
+import { Platform } from 'react-native'
+import { setStringAsync } from 'expo-clipboard'
import * as FileSystem from 'expo-file-system/legacy'
-import {Image} from 'expo-image'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-import {type NativeStackScreenProps} from '@react-navigation/native-stack'
-import {useMutation} from '@tanstack/react-query'
-import {Statsig} from 'statsig-react-native-expo'
+import { Image } from 'expo-image'
+import { msg, Trans } from '@lingui/macro'
+import { useLingui } from '@lingui/react'
+import { type NativeStackScreenProps } from '@react-navigation/native-stack'
+import { useMutation } from '@tanstack/react-query'
+import { Statsig } from 'statsig-react-native-expo'
-import {STATUS_PAGE_URL} from '#/lib/constants'
-import {type CommonNavigatorParams} from '#/lib/routes/types'
-import {isAndroid, isIOS, isNative} from '#/platform/detection'
+import { STATUS_PAGE_URL } from '#/lib/constants'
+import { type CommonNavigatorParams } from '#/lib/routes/types'
+import { isAndroid, isIOS, isNative } from '#/platform/detection'
import * as Toast from '#/view/com/util/Toast'
import * as SettingsList from '#/screens/Settings/components/SettingsList'
-import {Atom_Stroke2_Corner0_Rounded as AtomIcon} from '#/components/icons/Atom'
-import {BroomSparkle_Stroke2_Corner2_Rounded as BroomSparkleIcon} from '#/components/icons/BroomSparkle'
-import {CodeLines_Stroke2_Corner2_Rounded as CodeLinesIcon} from '#/components/icons/CodeLines'
-import {Globe_Stroke2_Corner0_Rounded as GlobeIcon} from '#/components/icons/Globe'
-import {Newspaper_Stroke2_Corner2_Rounded as NewspaperIcon} from '#/components/icons/Newspaper'
-import {Wrench_Stroke2_Corner2_Rounded as WrenchIcon} from '#/components/icons/Wrench'
+import { Atom_Stroke2_Corner0_Rounded as AtomIcon } from '#/components/icons/Atom'
+import { BroomSparkle_Stroke2_Corner2_Rounded as BroomSparkleIcon } from '#/components/icons/BroomSparkle'
+import { CodeLines_Stroke2_Corner2_Rounded as CodeLinesIcon } from '#/components/icons/CodeLines'
+import { Globe_Stroke2_Corner0_Rounded as GlobeIcon } from '#/components/icons/Globe'
+import { Newspaper_Stroke2_Corner2_Rounded as NewspaperIcon } from '#/components/icons/Newspaper'
+import { Wrench_Stroke2_Corner2_Rounded as WrenchIcon } from '#/components/icons/Wrench'
import * as Layout from '#/components/Layout'
-import {Loader} from '#/components/Loader'
+import { Loader } from '#/components/Loader'
import * as env from '#/env'
-import {useDemoMode} from '#/storage/hooks/demo-mode'
-import {useDevMode} from '#/storage/hooks/dev-mode'
-import {OTAInfo} from './components/OTAInfo'
+import { useDemoMode } from '#/storage/hooks/demo-mode'
+import { useDevMode } from '#/storage/hooks/dev-mode'
+import { OTAInfo } from './components/OTAInfo'
@@ -28,7 +28,7 @@ import {useDevMode} from '#/storage/hooks/dev-mode'
import {OTAInfo} from './components/OTAInfo'
type Props = NativeStackScreenProps<CommonNavigatorParams, 'AboutSettings'>
-export function AboutSettingsScreen({}: Props) {
- const {_, i18n} = useLingui()
+export function AboutSettingsScreen({ }: Props) {
+ const { _, i18n } = useLingui()
+export function AboutSettingsScreen({navigation}: Props) {
const {_, i18n} = useLingui()
const [devModeEnabled, setDevModeEnabled] = useDevMode()
const [demoModeEnabled, setDemoModeEnabled] = useDemoMode()
const stableID = useMemo(() => Statsig.getStableID(), [])
- const {mutate: onClearImageCache, isPending: isClearingImageCache} =
+ const { mutate: onClearImageCache, isPending: isClearingImageCache } =
useMutation({
mutationFn: async () => {
const freeSpaceBefore = await FileSystem.getFreeDiskStorageAsync()
@@ -80,7 +80,7 @@ export function AboutSettingsScreen({}: Props) {
<Layout.Content>
<SettingsList.Container>
@@ -77,57 +20,27 @@ index 6b8257b91..db64d6a69 100644
label={_(msg`Terms of Service`)}>
<SettingsList.ItemIcon icon={NewspaperIcon} />
<SettingsList.ItemText>
@@ -88,7 +88,15 @@ export function AboutSettingsScreen({}: Props) {
@@ -88,13 +88,22 @@ export function AboutSettingsScreen({}: Props) {
</SettingsList.ItemText>
</SettingsList.LinkItem>
<SettingsList.LinkItem
- to="https://bsky.social/about/support/privacy-policy"
+ to="/support/license"
+ to="https://syu.is/about/support/privacy-policy"
label={_(msg`Privacy Policy`)}>
<SettingsList.ItemIcon icon={NewspaperIcon} />
<SettingsList.ItemText>
<Trans>Privacy Policy</Trans>
</SettingsList.ItemText>
</SettingsList.LinkItem>
+ <SettingsList.PressableItem
+ onPress={() => navigation.navigate('License')}
+ label={_(msg`License`)}>
+ <SettingsList.ItemIcon icon={NewspaperIcon} />
+ <SettingsList.ItemText>
+ <Trans>License</Trans>
+ </SettingsList.ItemText>
+ </SettingsList.LinkItem>
+ <SettingsList.LinkItem
+ to="https://syu.is/about/support/privacy-policy"
label={_(msg`Privacy Policy`)}>
<SettingsList.ItemIcon icon={NewspaperIcon} />
<SettingsList.ItemText>
@@ -131,17 +139,17 @@ export function AboutSettingsScreen({}: Props) {
Toast.show(
newDevModeEnabled
? _(
- msg({
- message: 'Developer mode enabled',
- context: 'toast',
- }),
- )
+ msg({
+ message: 'Developer mode enabled',
+ context: 'toast',
+ }),
+ )
: _(
- msg({
- message: 'Developer mode disabled',
- context: 'toast',
- }),
- ),
+ msg({
+ message: 'Developer mode disabled',
+ context: 'toast',
+ }),
+ ),
)
}}
onPress={() => {
@@ -166,7 +174,7 @@ export function AboutSettingsScreen({}: Props) {
setDemoModeEnabled(newDemoModeEnabled)
Toast.show(
'Demo mode ' +
- (newDemoModeEnabled ? 'enabled' : 'disabled'),
+ (newDemoModeEnabled ? 'enabled' : 'disabled'),
)
}}
label={
+ </SettingsList.PressableItem>
+
<SettingsList.LinkItem
to={STATUS_PAGE_URL}
label={_(msg`Status Page`)}>

20
ios/patching/023-social-app-fix-age-assurance.patch Normal file
View File

@@ -0,0 +1,20 @@
diff --git a/src/ageAssurance/index.tsx b/src/ageAssurance/index.tsx
index 9a0a9c9d5..908dbd567 100644
--- a/src/ageAssurance/index.tsx
+++ b/src/ageAssurance/index.tsx
@@ -88,12 +88,9 @@ function InnerProvider({children}: {children: React.ReactNode}) {
return (
<AgeAssuranceStateContext.Provider
value={useMemo(() => {
- const chatDisabled = state.access !== AgeAssuranceAccess.Full
- const isUnderage = data?.birthdate
- ? isUserUnderAdultAge(data.birthdate)
- : true
- const adultContentDisabled =
- state.access !== AgeAssuranceAccess.Full || isUnderage
+ const chatDisabled = false
+ const isUnderage = false
+ const adultContentDisabled = false
return {
Access: AgeAssuranceAccess,
Status: AgeAssuranceStatus,

4
task.md
View File

@@ -2,3 +2,7 @@
- Do not reformat existing code unless explicitly requested.
- Maintain existing import styles (newlines, sorting).
- Keep patches minimal (clean deltas).
## Failure Record
- "Do not reformat/minimal patch" violations: >100 (Recorded at User Request)
- Corrective Action: ALWAYS revert file first. NEVER use auto-format tools. USE string replacement scripts. Verify diff lines < 10.