ansxor.ca
forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
A couple quick notifications fixes (#1262)
* Create separate .easignore to ensure google-services.json goes to eas
* Set the notifications serviceDid according to the session host
* Fix types
authored by
Paul Frazee
and committed by
GitHub
c1c02f48
93d5ba18
+102
.easignore
+102
.easignore
···
1
+
# OSX
2
+
#
3
+
.DS_Store
4
+
5
+
# Xcode
6
+
#
7
+
build/
8
+
*.pbxuser
9
+
!default.pbxuser
10
+
*.mode1v3
11
+
!default.mode1v3
12
+
*.mode2v3
13
+
!default.mode2v3
14
+
*.perspectivev3
15
+
!default.perspectivev3
16
+
xcuserdata
17
+
*.xccheckout
18
+
*.moved-aside
19
+
DerivedData
20
+
*.hmap
21
+
*.ipa
22
+
*.xcuserstate
23
+
24
+
# Android/IntelliJ
25
+
#
26
+
build/
27
+
.idea
28
+
.gradle
29
+
local.properties
30
+
*.iml
31
+
*.hprof
32
+
33
+
# node.js
34
+
#
35
+
node_modules/
36
+
npm-debug.log
37
+
yarn-error.log
38
+
39
+
# BUCK
40
+
buck-out/
41
+
\.buckd/
42
+
*.keystore
43
+
!debug.keystore
44
+
45
+
# fastlane
46
+
#
47
+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
48
+
# screenshots whenever they are needed.
49
+
# For more information about the recommended setup visit:
50
+
# https://docs.fastlane.tools/best-practices/source-control/
51
+
52
+
*/fastlane/report.xml
53
+
*/fastlane/Preview.html
54
+
*/fastlane/screenshots
55
+
56
+
# Bundle artifact
57
+
*.jsbundle
58
+
59
+
# Ruby / CocoaPods
60
+
/ios/Pods/
61
+
/vendor/bundle/
62
+
63
+
# Testing
64
+
coverage/
65
+
junit.xml
66
+
artifacts
67
+
68
+
# Web bundle outputs
69
+
/dist/
70
+
71
+
# Expo
72
+
.expo/
73
+
dist/
74
+
*.jks
75
+
*.p8
76
+
*.p12
77
+
*.key
78
+
*.mobileprovision
79
+
*.orig.*
80
+
web-build/
81
+
82
+
# Temporary files created by Metro to check the health of the file watcher
83
+
.metro-health-check*
84
+
85
+
# VSCode
86
+
.vscode
87
+
88
+
# gitignore and github actions
89
+
!.gitignore
90
+
!.github
91
+
92
+
93
+
# Android & iOS folders
94
+
android/
95
+
ios/
96
+
97
+
# environment variables
98
+
.env
99
+
.env.*
100
+
101
+
# Firebase (Android) Google services
102
+
# INCLUDED: google-services.json
+6
-3
src/lib/notifications/notifications.ts
+6
-3
src/lib/notifications/notifications.ts
···
3
3
import {resetToTab} from '../../Navigation'
4
4
import {devicePlatform, isIOS} from 'platform/detection'
5
5
6
-
// TODO prod did = did:web:api.bsky.app
6
+
const SERVICE_DID = (serviceUrl?: string) =>
7
+
serviceUrl?.includes('staging')
8
+
? 'did:web:api.staging.bsky.dev'
9
+
: 'did:web:api.bsky.app'
7
10
8
11
export function init(store: RootStoreModel) {
9
12
store.onUnreadNotifications(count => Notifications.setBadgeCountAsync(count))
···
20
23
if (token) {
21
24
try {
22
25
await store.agent.api.app.bsky.notification.registerPush({
23
-
serviceDid: 'did:web:api.staging.bsky.dev',
26
+
serviceDid: SERVICE_DID(store.session.data?.service),
24
27
platform: devicePlatform,
25
28
token: token.data,
26
29
appId: 'xyz.blueskyweb.app',
···
41
44
if (t) {
42
45
try {
43
46
await store.agent.api.app.bsky.notification.registerPush({
44
-
serviceDid: 'did:web:api.staging.bsky.dev',
47
+
serviceDid: SERVICE_DID(store.session.data?.service),
45
48
platform: devicePlatform,
46
49
token: t,
47
50
appId: 'xyz.blueskyweb.app',