fix
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx
|
diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx
|
||||||
index 6b8257b91..e21b4900d 100644
|
index 6b8257b91..1aa59eb0d 100644
|
||||||
--- a/src/screens/Settings/AboutSettings.tsx
|
--- a/src/screens/Settings/AboutSettings.tsx
|
||||||
+++ b/src/screens/Settings/AboutSettings.tsx
|
+++ b/src/screens/Settings/AboutSettings.tsx
|
||||||
@@ -80,7 +80,7 @@ export function AboutSettingsScreen({}: Props) {
|
@@ -80,7 +80,7 @@ export function AboutSettingsScreen({}: Props) {
|
||||||
@@ -7,7 +7,7 @@ index 6b8257b91..e21b4900d 100644
|
|||||||
<SettingsList.Container>
|
<SettingsList.Container>
|
||||||
<SettingsList.LinkItem
|
<SettingsList.LinkItem
|
||||||
- to="https://bsky.social/about/support/tos"
|
- to="https://bsky.social/about/support/tos"
|
||||||
+ to="https://syu.is/about/support/tos"
|
+ to="/about/support/tos"
|
||||||
label={_(msg`Terms of Service`)}>
|
label={_(msg`Terms of Service`)}>
|
||||||
<SettingsList.ItemIcon icon={NewspaperIcon} />
|
<SettingsList.ItemIcon icon={NewspaperIcon} />
|
||||||
<SettingsList.ItemText>
|
<SettingsList.ItemText>
|
||||||
@@ -16,7 +16,7 @@ index 6b8257b91..e21b4900d 100644
|
|||||||
</SettingsList.LinkItem>
|
</SettingsList.LinkItem>
|
||||||
<SettingsList.LinkItem
|
<SettingsList.LinkItem
|
||||||
- to="https://bsky.social/about/support/privacy-policy"
|
- to="https://bsky.social/about/support/privacy-policy"
|
||||||
+ to="https://syu.is/about/support/privacy-policy"
|
+ to="/about/support/privacy-policy"
|
||||||
label={_(msg`Privacy Policy`)}>
|
label={_(msg`Privacy Policy`)}>
|
||||||
<SettingsList.ItemIcon icon={NewspaperIcon} />
|
<SettingsList.ItemIcon icon={NewspaperIcon} />
|
||||||
<SettingsList.ItemText>
|
<SettingsList.ItemText>
|
||||||
@@ -24,7 +24,7 @@ index 6b8257b91..e21b4900d 100644
|
|||||||
</SettingsList.ItemText>
|
</SettingsList.ItemText>
|
||||||
</SettingsList.LinkItem>
|
</SettingsList.LinkItem>
|
||||||
+ <SettingsList.LinkItem
|
+ <SettingsList.LinkItem
|
||||||
+ to="/support/license"
|
+ to="/about/support/license"
|
||||||
+ label={_(msg`License`)}>
|
+ label={_(msg`License`)}>
|
||||||
+ <SettingsList.ItemIcon icon={NewspaperIcon} />
|
+ <SettingsList.ItemIcon icon={NewspaperIcon} />
|
||||||
+ <SettingsList.ItemText>
|
+ <SettingsList.ItemText>
|
||||||
|
|||||||
@@ -1,8 +1,17 @@
|
|||||||
diff --git a/src/ageAssurance/index.tsx b/src/ageAssurance/index.tsx
|
diff --git a/src/ageAssurance/index.tsx b/src/ageAssurance/index.tsx
|
||||||
index 9a0a9c9d5..fa233c8ab 100644
|
index 9a0a9c9d5..0a1f8e7cb 100644
|
||||||
--- a/src/ageAssurance/index.tsx
|
--- a/src/ageAssurance/index.tsx
|
||||||
+++ b/src/ageAssurance/index.tsx
|
+++ b/src/ageAssurance/index.tsx
|
||||||
@@ -97,7 +97,10 @@ function InnerProvider({children}: {children: React.ReactNode}) {
|
@@ -88,20 +88,14 @@ 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
|
||||||
return {
|
return {
|
||||||
Access: AgeAssuranceAccess,
|
Access: AgeAssuranceAccess,
|
||||||
Status: AgeAssuranceStatus,
|
Status: AgeAssuranceStatus,
|
||||||
@@ -12,5 +21,10 @@ index 9a0a9c9d5..fa233c8ab 100644
|
|||||||
+ access: AgeAssuranceAccess.Full,
|
+ access: AgeAssuranceAccess.Full,
|
||||||
+ },
|
+ },
|
||||||
flags: {
|
flags: {
|
||||||
adultContentDisabled,
|
- adultContentDisabled,
|
||||||
chatDisabled,
|
- chatDisabled,
|
||||||
|
+ adultContentDisabled: false,
|
||||||
|
+ chatDisabled: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}, [state, data])}>
|
||||||
|
|||||||
@@ -1,3 +1,46 @@
|
|||||||
|
diff --git a/src/view/com/posts/DiscoverFallbackHeader.tsx b/src/view/com/posts/DiscoverFallbackHeader.tsx
|
||||||
|
index e35a33aaf..a36f84ae0 100644
|
||||||
|
--- a/src/view/com/posts/DiscoverFallbackHeader.tsx
|
||||||
|
+++ b/src/view/com/posts/DiscoverFallbackHeader.tsx
|
||||||
|
@@ -7,37 +7,5 @@ import {TextLink} from '../util/Link'
|
||||||
|
import {Text} from '../util/text/Text'
|
||||||
|
|
||||||
|
export function DiscoverFallbackHeader() {
|
||||||
|
- const pal = usePalette('default')
|
||||||
|
- return (
|
||||||
|
- <View
|
||||||
|
- style={[
|
||||||
|
- {
|
||||||
|
- flexDirection: 'row',
|
||||||
|
- alignItems: 'center',
|
||||||
|
- paddingVertical: 12,
|
||||||
|
- paddingHorizontal: 12,
|
||||||
|
- borderTopWidth: 1,
|
||||||
|
- },
|
||||||
|
- pal.border,
|
||||||
|
- pal.viewLight,
|
||||||
|
- ]}>
|
||||||
|
- <View style={{width: 68, paddingLeft: 12}}>
|
||||||
|
- <InfoCircleIcon size={36} style={pal.textLight} strokeWidth={1.5} />
|
||||||
|
- </View>
|
||||||
|
- <View style={{flex: 1}}>
|
||||||
|
- <Text type="md" style={pal.text}>
|
||||||
|
- <Trans>
|
||||||
|
- We ran out of posts from your follows. Here's the latest from{' '}
|
||||||
|
- <TextLink
|
||||||
|
- type="md-medium"
|
||||||
|
- href="/profile/bsky.app/feed/whats-hot"
|
||||||
|
- text="Discover"
|
||||||
|
- style={pal.link}
|
||||||
|
- />
|
||||||
|
- .
|
||||||
|
- </Trans>
|
||||||
|
- </Text>
|
||||||
|
- </View>
|
||||||
|
- </View>
|
||||||
|
- )
|
||||||
|
+ return null
|
||||||
|
}
|
||||||
diff --git a/src/view/com/posts/FollowingEmptyState.tsx b/src/view/com/posts/FollowingEmptyState.tsx
|
diff --git a/src/view/com/posts/FollowingEmptyState.tsx b/src/view/com/posts/FollowingEmptyState.tsx
|
||||||
index 352cc1dc0..f477521af 100644
|
index 352cc1dc0..f477521af 100644
|
||||||
--- a/src/view/com/posts/FollowingEmptyState.tsx
|
--- a/src/view/com/posts/FollowingEmptyState.tsx
|
||||||
@@ -189,3 +232,16 @@ index e3c84d782..efb55d406 100644
|
|||||||
- borderRadius: 30,
|
- borderRadius: 30,
|
||||||
- },
|
- },
|
||||||
})
|
})
|
||||||
|
diff --git a/src/view/com/posts/PostFeed.tsx b/src/view/com/posts/PostFeed.tsx
|
||||||
|
index 4f25468c9..a72a10b80 100644
|
||||||
|
--- a/src/view/com/posts/PostFeed.tsx
|
||||||
|
+++ b/src/view/com/posts/PostFeed.tsx
|
||||||
|
@@ -766,7 +766,7 @@ let PostFeed = ({
|
||||||
|
} else if (row.type === 'feedShutdownMsg') {
|
||||||
|
return <FeedShutdownMsg feedUri={feedUriOrActorDid} />
|
||||||
|
} else if (row.type === 'interstitialFollows') {
|
||||||
|
- return <SuggestedFollows feed={feed} />
|
||||||
|
+ return null
|
||||||
|
} else if (row.type === 'interstitialProgressGuide') {
|
||||||
|
return <ProgressGuide />
|
||||||
|
} else if (row.type === 'ageAssuranceBanner') {
|
||||||
|
|||||||
@@ -15,11 +15,11 @@
|
|||||||
- `009-social-app-ios-license.patch` - ライセンスページの追加(Drawer, Navigation, routes, types)
|
- `009-social-app-ios-license.patch` - ライセンスページの追加(Drawer, Navigation, routes, types)
|
||||||
- `010-social-app-ios-remove-contact-support.patch` - アカウント作成時の「Contact support」リンクを削除
|
- `010-social-app-ios-remove-contact-support.patch` - アカウント作成時の「Contact support」リンクを削除
|
||||||
- `011-social-app-ios-splash-license-footer.patch` - スプラッシュ画面の「What's up?」削除、© syui フッター追加
|
- `011-social-app-ios-splash-license-footer.patch` - スプラッシュ画面の「What's up?」削除、© syui フッター追加
|
||||||
- `012-social-app-ios-settings-about-help.patch` - About 設定のリンク修正(syu.is に変更)
|
- `012-social-app-ios-settings-about-help.patch` - About 設定のリンクを独自ページに変更(/support/tos, /support/privacy-policy, /support/license)
|
||||||
- `013-social-app-ios-settings-remove-help.patch` - Settings から Help 項目を削除
|
- `013-social-app-ios-settings-remove-help.patch` - Settings から Help 項目を削除
|
||||||
- `019-social-app-ios-entitlements-plugin.patch` - iOS entitlements プラグイン設定
|
- `019-social-app-ios-entitlements-plugin.patch` - iOS entitlements プラグイン設定
|
||||||
- `020-social-app-ios-bypass-age-assurance.patch` - 年齢確認を完全に無効化
|
- `020-social-app-ios-bypass-age-assurance.patch` - 年齢確認を完全に無効化(access を Full に固定、chatDisabled と adultContentDisabled を false に固定)
|
||||||
- `021-social-app-ios-clean-feed.patch` - Following フィードのシンプル化(おすすめ・Discover削除)
|
- `021-social-app-ios-clean-feed.patch` - Following フィードのシンプル化(DiscoverFallbackHeader の (i) アイコンと Discover リンク削除、SuggestedFollows インタースティシャル無効化、おすすめボタン削除)
|
||||||
- `License.tsx` - ライセンス表示画面(新規ファイル)
|
- `License.tsx` - ライセンス表示画面(新規ファイル)
|
||||||
|
|
||||||
## 使用方法
|
## 使用方法
|
||||||
|
|||||||
Reference in New Issue
Block a user