ai/at
1
0

fix patch cmd

This commit is contained in:
2025-12-07 14:23:14 +09:00
parent 5b2255b3f6
commit 732bbe7fbd
9 changed files with 50 additions and 19 deletions

View File

@@ -16,7 +16,7 @@ index 231447b4f..33c51cc0a 100644
-const HELP_DESK_LANG = 'en-us' -const HELP_DESK_LANG = 'en-us'
-export const HELP_DESK_URL = `https://blueskyweb.zendesk.com/hc/${HELP_DESK_LANG}` -export const HELP_DESK_URL = `https://blueskyweb.zendesk.com/hc/${HELP_DESK_LANG}`
+const HELP_DESK_LANG = 'ja-jp' +const HELP_DESK_LANG = 'ja-jp'
+export const HELP_DESK_URL = 'https://syu.is/help' +export const HELP_DESK_URL = 'https://syu.is/about/support/help'
export const EMBED_SERVICE = 'https://embed.bsky.app' export const EMBED_SERVICE = 'https://embed.bsky.app'
export const EMBED_SCRIPT = `${EMBED_SERVICE}/static/embed.js` export const EMBED_SCRIPT = `${EMBED_SERVICE}/static/embed.js`
export const BSKY_DOWNLOAD_URL = 'https://bsky.app/download' export const BSKY_DOWNLOAD_URL = 'https://bsky.app/download'
@@ -37,8 +37,8 @@ index 231447b4f..33c51cc0a 100644
export const webLinks = { export const webLinks = {
- tos: `https://bsky.social/about/support/tos`, - tos: `https://bsky.social/about/support/tos`,
- privacy: `https://bsky.social/about/support/privacy-policy`, - privacy: `https://bsky.social/about/support/privacy-policy`,
+ tos: `https://bsky.social/abouthttps://syu.is/terms`, + tos: `https://syu.is/about/support/tos`,
+ privacy: `https://bsky.social/abouthttps://syu.is/privacy-policy`, + privacy: `https://syu.is/about/support/privacy-policy`,
community: `https://bsky.social/about/support/community-guidelines`, community: `https://bsky.social/about/support/community-guidelines`,
communityDeprecated: `https://bsky.social/about/support/community-guidelines-deprecated`, communityDeprecated: `https://bsky.social/about/support/community-guidelines-deprecated`,
} }

View File

@@ -21,8 +21,8 @@ index 1ed913bb2..c80340edb 100644
Support: '/support', Support: '/support',
- PrivacyPolicy: '/support/privacy', - PrivacyPolicy: '/support/privacy',
- TermsOfService: '/support/tos', - TermsOfService: '/support/tos',
+ PrivacyPolicy: 'https://syu.is/privacy', + PrivacyPolicy: 'https://syu.is/about/support/privacy-policy',
+ TermsOfService: 'https://syu.is/terms', + TermsOfService: 'https://syu.is/about/support/tos',
CommunityGuidelines: '/support/community-guidelines', CommunityGuidelines: '/support/community-guidelines',
CopyrightPolicy: '/support/copyright', CopyrightPolicy: '/support/copyright',
// hashtags // hashtags

View File

@@ -7,7 +7,7 @@ index 6b8257b91..35202224b 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://bsky.social/abouthttps://syu.is/terms" + to="https://syu.is/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..35202224b 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://bsky.social/abouthttps://syu.is/privacy-policy" + to="https://syu.is/about/support/privacy-policy"
label={_(msg`Privacy Policy`)}> label={_(msg`Privacy Policy`)}>
<SettingsList.ItemIcon icon={NewspaperIcon} /> <SettingsList.ItemIcon icon={NewspaperIcon} />
<SettingsList.ItemText> <SettingsList.ItemText>
@@ -31,7 +31,7 @@ index dd319a4c6..0e80f956a 100644
- label={_(msg`Bluesky Social Terms of Service`)} - label={_(msg`Bluesky Social Terms of Service`)}
- to="https://bsky.social/about/support/tos" - to="https://bsky.social/about/support/tos"
+ label={_(msg`syu.is Terms of Service`)} + label={_(msg`syu.is Terms of Service`)}
+ to="https://bsky.social/abouthttps://syu.is/terms" + to="https://syu.is/about/support/tos"
style={[a.text_md, a.leading_normal]} style={[a.text_md, a.leading_normal]}
overridePresentation> overridePresentation>
- Bluesky Social Terms of Service - Bluesky Social Terms of Service
@@ -504,7 +504,7 @@ index a89eaadc4..228af4966 100644
- </View> - </View>
- <View style={s.footerSpacer} /> - <View style={s.footerSpacer} />
- </ScrollView> - </ScrollView>
+ <WebView source={{ uri: 'https://syu.is/privacy' }} style={{ flex: 1 }} /> + <WebView source={{ uri: 'https://syu.is/about/support/privacy-policy' }} style={{ flex: 1 }} />
</Layout.Screen> </Layout.Screen>
) )
} }
@@ -564,7 +564,7 @@ index d843c713c..c0b34c886 100644
- </View> - </View>
- <View style={s.footerSpacer} /> - <View style={s.footerSpacer} />
- </ScrollView> - </ScrollView>
+ <WebView source={{ uri: 'https://syu.is/terms' }} style={{ flex: 1 }} /> + <WebView source={{ uri: 'https://syu.is/about/support/tos' }} style={{ flex: 1 }} />
</Layout.Screen> </Layout.Screen>
) )
} }

View File

@@ -7,7 +7,7 @@ index 9915d0a2d..c200a7c67 100644
You must be at least 13 years old to use Bluesky. Read our{' '} You must be at least 13 years old to use Bluesky. Read our{' '}
<SimpleInlineLinkText <SimpleInlineLinkText
- to="https://bsky.social/about/support/tos" - to="https://bsky.social/about/support/tos"
+ to="https://bsky.social/abouthttps://syu.is/terms" + to="https://syu.is/about/support/tos"
label={_(msg`Terms of Service`)}> label={_(msg`Terms of Service`)}>
Terms of Service Terms of Service
</SimpleInlineLinkText>{' '} </SimpleInlineLinkText>{' '}
@@ -700,14 +700,14 @@ index 1d097fc9a..e11a3a202 100644
)} )}
<InlineLinkText <InlineLinkText
- to="https://bsky.social/about/support/privacy-policy" - to="https://bsky.social/about/support/privacy-policy"
+ to="https://bsky.social/abouthttps://syu.is/privacy-policy" + to="https://syu.is/about/support/privacy-policy"
label={_(msg`Privacy`)}> label={_(msg`Privacy`)}>
{_(msg`Privacy`)} {_(msg`Privacy`)}
</InlineLinkText> </InlineLinkText>
{' • '} {' • '}
<InlineLinkText <InlineLinkText
- to="https://bsky.social/about/support/tos" - to="https://bsky.social/about/support/tos"
+ to="https://bsky.social/abouthttps://syu.is/terms" + to="https://syu.is/about/support/tos"
label={_(msg`Terms`)}> label={_(msg`Terms`)}>
{_(msg`Terms`)} {_(msg`Terms`)}
</InlineLinkText> </InlineLinkText>

View File

@@ -126,13 +126,13 @@ index 8365057e8..59c8506a2 100644
terms: { terms: {
overridePresentation: false, overridePresentation: false,
- to: `https://bsky.social/about/support/tos`, - to: `https://bsky.social/about/support/tos`,
+ to: `https://bsky.social/abouthttps://syu.is/terms`, + to: `https://syu.is/about/support/tos`,
label: _(msg`Terms of Service`), label: _(msg`Terms of Service`),
}, },
privacy: { privacy: {
overridePresentation: false, overridePresentation: false,
- to: `https://bsky.social/about/support/privacy-policy`, - to: `https://bsky.social/about/support/privacy-policy`,
+ to: `https://bsky.social/abouthttps://syu.is/privacy-policy`, + to: `https://syu.is/about/support/privacy-policy`,
label: _(msg`Privacy Policy`), label: _(msg`Privacy Policy`),
}, },
copyright: { copyright: {

View File

@@ -44,8 +44,8 @@ index 1ed913bb2..aa6fccc4e 100644
Support: '/support', Support: '/support',
- PrivacyPolicy: '/support/privacy', - PrivacyPolicy: '/support/privacy',
- TermsOfService: '/support/tos', - TermsOfService: '/support/tos',
+ PrivacyPolicy: 'https://syu.is/privacy', + PrivacyPolicy: 'https://syu.is/about/support/privacy-policy',
+ TermsOfService: 'https://syu.is/terms', + TermsOfService: 'https://syu.is/about/support/tos',
+ License: '/support/license', + License: '/support/license',
CommunityGuidelines: '/support/community-guidelines', CommunityGuidelines: '/support/community-guidelines',
CopyrightPolicy: '/support/copyright', CopyrightPolicy: '/support/copyright',

View File

@@ -25,7 +25,7 @@ index 6b8257b91..bed851753 100644
</SettingsList.LinkItem> </SettingsList.LinkItem>
<SettingsList.LinkItem <SettingsList.LinkItem
- to={STATUS_PAGE_URL} - to={STATUS_PAGE_URL}
+ to="https://syu.is/" + to="https://syu.is/about/support/tos"
label={_(msg`Status Page`)}> label={_(msg`Status Page`)}>
<SettingsList.ItemIcon icon={GlobeIcon} /> <SettingsList.ItemIcon icon={GlobeIcon} />
<SettingsList.ItemText> <SettingsList.ItemText>

View File

@@ -0,0 +1,30 @@
diff --git a/plugins/withCodeSignEntitlements.js b/plugins/withCodeSignEntitlements.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/plugins/withCodeSignEntitlements.js
@@ -0,0 +1,22 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { withXcodeProject } = require('@expo/config-plugins')
+
+const withCodeSignEntitlements = (config) => {
+ return withXcodeProject(config, (config) => {
+ const xcodeProject = config.modResults
+ const configurations = xcodeProject.pbxXCBuildConfigurationSection()
+
+ for (const key in configurations) {
+ const configuration = configurations[key]
+ if (
+ configuration.buildSettings &&
+ !configuration.comment.includes('TEST')
+ ) {
+ configuration.buildSettings.CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION =
+ 'YES'
+ }
+ }
+
+ return config
+ })
+}
+
+module.exports = withCodeSignEntitlements

View File

@@ -13,6 +13,7 @@ typeset -a PATCH_FILES_IOS
PATCH_FILES_IOS=( PATCH_FILES_IOS=(
"001-social-app-ios-config.patch" "001-social-app-ios-config.patch"
"002-social-app-ios-lib.patch" "002-social-app-ios-lib.patch"
"019-social-app-ios-entitlements-plugin.patch"
"003-social-app-ios-view.patch" "003-social-app-ios-view.patch"
"004-social-app-ios-core.patch" "004-social-app-ios-core.patch"
"005-social-app-ios-screens.patch" "005-social-app-ios-screens.patch"
@@ -46,7 +47,7 @@ function apply-patch() {
pushd ${target_dir} > /dev/null pushd ${target_dir} > /dev/null
# Check if patch is already applied (reverse dry-run succeeds) # Check if patch is already applied (reverse dry-run succeeds)
if patch --dry-run -p1 -R < ${patch_file} > /dev/null 2>&1; then if patch -f --dry-run -p1 -R < ${patch_file} > /dev/null 2>&1; then
echo "✅ Already applied - skipping" echo "✅ Already applied - skipping"
popd > /dev/null popd > /dev/null
echo "" echo ""