forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
fix final final final (#8719)
+43
-15
+5
-2
.github/workflows/pull-request-comment.yml
+5
-2
.github/workflows/pull-request-comment.yml
···
81
81
uses: marocchino/sticky-pull-request-comment@v2
82
82
with:
83
83
header: pull-request-eas-build-${{ github.sha }}
84
+
number: ${{ github.event.issue.number }}
84
85
message: |
85
86
An OTA deployment has been requested and is now running...
86
87
···
158
159
env:
159
160
DENIS_API_KEY: ${{ secrets.DENIS_API_KEY }}
160
161
CHANNEL_NAME: pull-request-${{ github.event.issue.number }}
161
-
BUNDLE_VERSION:
162
+
RUNTIME_VERSION:
162
163
163
164
164
165
- name: 💬 Drop a comment
165
166
uses: marocchino/sticky-pull-request-comment@v2
166
167
with:
167
168
header: pull-request-eas-build-${{ github.sha }}
169
+
number: ${{ github.event.issue.number }}
168
170
message: |
169
171
Your requested OTA deployment was successful! You may now apply it by pressing the link below.
170
172
171
-
[Apply OTA update](bluesky://ota-apply?channel=pull-request-${{ github.event.issue.number }})
173
+
[Apply OTA update](bluesky://intent/apply-ota?channel=pull-request-${{ github.event.issue.number }})
172
174
173
175
[Here is some music to listen to while you wait...](https://www.youtube.com/watch?v=VBlFHuCzPgY)
174
176
---
···
180
182
if: failure()
181
183
with:
182
184
header: pull-request-eas-build-${{ github.sha }}
185
+
number: ${{ github.event.issue.number }}
183
186
message: |
184
187
Your requested OTA deployment was unsuccessful. See action logs for more details.
185
188
---
+2
-6
app.config.js
+2
-6
app.config.js
···
26
26
...(IS_DEV || IS_TESTFLIGHT ? [] : []),
27
27
]
28
28
29
-
const UPDATES_CHANNEL = IS_TESTFLIGHT
30
-
? 'testflight'
31
-
: IS_PRODUCTION
32
-
? 'production'
33
-
: undefined
34
-
const UPDATES_ENABLED = !!UPDATES_CHANNEL
29
+
const UPDATES_ENABLED =
30
+
IS_TESTFLIGHT !== undefined || IS_PRODUCTION !== undefined
35
31
36
32
const USE_SENTRY = Boolean(process.env.SENTRY_AUTH_TOKEN)
37
33
-5
src/lib/hooks/useIntentHandler.ts
-5
src/lib/hooks/useIntentHandler.ts
···
13
13
} from '#/components/ageAssurance/AgeAssuranceRedirectDialog'
14
14
import {useIntentDialogs} from '#/components/intents/IntentDialogs'
15
15
import {Referrer} from '../../../modules/expo-bluesky-swiss-army'
16
-
import {IS_TESTFLIGHT} from '../app-info.web'
17
16
import {useApplyPullRequestOTAUpdate} from './useOTAUpdates'
18
17
19
18
type IntentType = 'compose' | 'verify-email' | 'age-assurance' | 'apply-ota'
···
97
96
return
98
97
}
99
98
case 'apply-ota': {
100
-
if (!isNative || !IS_TESTFLIGHT) {
101
-
return
102
-
}
103
-
104
99
const channel = params.get('channel')
105
100
if (!channel) {
106
101
Alert.alert('Error', 'No channel provided to look for.')
+36
-2
src/screens/Settings/Settings.tsx
+36
-2
src/screens/Settings/Settings.tsx
···
1
1
import {useState} from 'react'
2
-
import {LayoutAnimation, Pressable, View} from 'react-native'
2
+
import {Alert, LayoutAnimation, Pressable, View} from 'react-native'
3
3
import {Linking} from 'react-native'
4
4
import {useReducedMotion} from 'react-native-reanimated'
5
5
import {type AppBskyActorDefs, moderateProfile} from '@atproto/api'
···
19
19
} from '#/lib/routes/types'
20
20
import {sanitizeDisplayName} from '#/lib/strings/display-names'
21
21
import {sanitizeHandle} from '#/lib/strings/handles'
22
-
import {isNative} from '#/platform/detection'
22
+
import {isIOS, isNative} from '#/platform/detection'
23
23
import {useProfileShadow} from '#/state/cache/profile-shadow'
24
24
import * as persisted from '#/state/persisted'
25
25
import {clearStorage} from '#/state/persisted'
···
367
367
const navigation = useNavigation<NavigationProp>()
368
368
const {mutate: deleteChatDeclarationRecord} = useDeleteActorDeclaration()
369
369
const {
370
+
tryApplyUpdate,
370
371
revertToEmbedded,
371
372
isCurrentlyRunningPullRequestDeployment,
372
373
currentChannel,
···
399
400
setActyNotifNudged(false)
400
401
}
401
402
403
+
const onPressApplyOta = () => {
404
+
Alert.prompt(
405
+
'Apply OTA',
406
+
'Enter the channel for the OTA you wish to apply.',
407
+
[
408
+
{
409
+
style: 'cancel',
410
+
text: 'Cancel',
411
+
},
412
+
{
413
+
style: 'default',
414
+
text: 'Apply',
415
+
onPress: channel => {
416
+
tryApplyUpdate(channel ?? '')
417
+
},
418
+
},
419
+
],
420
+
'plain-text',
421
+
isCurrentlyRunningPullRequestDeployment
422
+
? currentChannel
423
+
: 'pull-request-',
424
+
)
425
+
}
426
+
402
427
return (
403
428
<>
404
429
<SettingsList.PressableItem
···
459
484
<Trans>Clear all storage data (restart after this)</Trans>
460
485
</SettingsList.ItemText>
461
486
</SettingsList.PressableItem>
487
+
{isIOS ? (
488
+
<SettingsList.PressableItem
489
+
onPress={onPressApplyOta}
490
+
label={_(msg`Apply Pull Request`)}>
491
+
<SettingsList.ItemText>
492
+
<Trans>Apply Pull Request</Trans>
493
+
</SettingsList.ItemText>
494
+
</SettingsList.PressableItem>
495
+
) : null}
462
496
{isNative && isCurrentlyRunningPullRequestDeployment ? (
463
497
<SettingsList.PressableItem
464
498
onPress={revertToEmbedded}