zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Make all referrer info sync (#4782)

zio/stable
Hailey 2024-07-12 07:37:43 -07:00 committed by GitHub
parent f021c06468
commit 306f162639
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/referrer/ExpoBlueskyReferrerModule.kt
View File

@ -23,7 +23,7 @@ class ExpoBlueskyReferrerModule : Module() {
activityReferrer = appContext.currentActivity?.referrer activityReferrer = appContext.currentActivity?.referrer
} }
AsyncFunction("getReferrerInfoAsync") { Function("getReferrerInfo") {
val intentReferrer = val intentReferrer =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
intent?.getParcelableExtra(Intent.EXTRA_REFERRER, Uri::class.java) intent?.getParcelableExtra(Intent.EXTRA_REFERRER, Uri::class.java)
@ -40,7 +40,7 @@ class ExpoBlueskyReferrerModule : Module() {
"hostname" to intentReferrer.host, "hostname" to intentReferrer.host,
) )
intent = null intent = null
return@AsyncFunction res return@Function res
} }
// In all other cases, we'll just record the app that sent the intent. // In all other cases, we'll just record the app that sent the intent.
@ -52,10 +52,10 @@ class ExpoBlueskyReferrerModule : Module() {
"hostname" to (activityReferrer?.host ?: ""), "hostname" to (activityReferrer?.host ?: ""),
) )
activityReferrer = null activityReferrer = null
return@AsyncFunction res return@Function res
} }
return@AsyncFunction null return@Function null
} }
AsyncFunction("getGooglePlayReferrerInfoAsync") { promise: Promise -> AsyncFunction("getGooglePlayReferrerInfoAsync") { promise: Promise ->

4
modules/expo-bluesky-swiss-army/src/Referrer/index.android.ts
View File

@ -8,6 +8,6 @@ export function getGooglePlayReferrerInfoAsync(): Promise<GooglePlayReferrerInfo
return NativeModule.getGooglePlayReferrerInfoAsync() return NativeModule.getGooglePlayReferrerInfoAsync()
} }
export function getReferrerInfoAsync(): Promise<ReferrerInfo | null> { export function getReferrerInfo(): Promise<ReferrerInfo | null> {
return NativeModule.getReferrerInfoAsync() return NativeModule.getReferrerInfo()
} }

4
modules/expo-bluesky-swiss-army/src/Referrer/index.ios.ts
View File

@ -6,7 +6,7 @@ export function getGooglePlayReferrerInfoAsync(): Promise<GooglePlayReferrerInfo
throw new NotImplementedError() throw new NotImplementedError()
} }
export function getReferrerInfoAsync(): Promise<ReferrerInfo | null> { export function getReferrerInfo(): ReferrerInfo | null {
const referrer = SharedPrefs.getString('referrer') const referrer = SharedPrefs.getString('referrer')
if (referrer) { if (referrer) {
SharedPrefs.removeValue('referrer') SharedPrefs.removeValue('referrer')
@ -19,7 +19,7 @@ export function getReferrerInfoAsync(): Promise<ReferrerInfo | null> {
} catch (e) { } catch (e) {
return { return {
referrer, referrer,
hostname: undefined, hostname: referrer,
} }
} }
} }

2
modules/expo-bluesky-swiss-army/src/Referrer/index.ts
View File

@ -5,6 +5,6 @@ export function getGooglePlayReferrerInfoAsync(): Promise<GooglePlayReferrerInfo
throw new NotImplementedError() throw new NotImplementedError()
} }
export function getReferrerInfoAsync(): Promise<ReferrerInfo | null> { export function getReferrerInfo(): ReferrerInfo | null {
throw new NotImplementedError() throw new NotImplementedError()
} }

2
modules/expo-bluesky-swiss-army/src/Referrer/index.web.ts
View File

@ -7,7 +7,7 @@ export function getGooglePlayReferrerInfoAsync(): Promise<GooglePlayReferrerInfo
throw new NotImplementedError() throw new NotImplementedError()
} }
export async function getReferrerInfoAsync(): Promise<ReferrerInfo | null> { export function getReferrerInfo(): ReferrerInfo | null {
if ( if (
Platform.OS === 'web' && Platform.OS === 'web' &&
// for ssr // for ssr

17
src/Navigation.tsx
View File

@ -771,15 +771,14 @@ function logModuleInitTime() {
}) })
if (isWeb) { if (isWeb) {
Referrer.getReferrerInfoAsync().then(info => { const referrerInfo = Referrer.getReferrerInfo()
if (info && info.hostname !== 'bsky.app') { if (referrerInfo && referrerInfo.hostname !== 'bsky.app') {
logEvent('deepLink:referrerReceived', { logEvent('deepLink:referrerReceived', {
to: window.location.href, to: window.location.href,
referrer: info?.referrer, referrer: referrerInfo?.referrer,
hostname: info?.hostname, hostname: referrerInfo?.hostname,
}) })
} }
})
} }
if (__DEV__) { if (__DEV__) {

17
src/lib/hooks/useIntentHandler.ts
View File

@ -18,15 +18,14 @@ export function useIntentHandler() {
React.useEffect(() => { React.useEffect(() => {
const handleIncomingURL = (url: string) => { const handleIncomingURL = (url: string) => {
Referrer.getReferrerInfoAsync().then(info => { const referrerInfo = Referrer.getReferrerInfo()
if (info && info.hostname !== 'bsky.app') { if (referrerInfo && referrerInfo.hostname !== 'bsky.app') {
logEvent('deepLink:referrerReceived', { logEvent('deepLink:referrerReceived', {
to: url, to: url,
referrer: info?.referrer, referrer: referrerInfo?.referrer,
hostname: info?.hostname, hostname: referrerInfo?.hostname,
}) })
} }
})
// We want to be able to support bluesky:// deeplinks. It's unnatural for someone to use a deeplink with three // We want to be able to support bluesky:// deeplinks. It's unnatural for someone to use a deeplink with three
// slashes, like bluesky:///intent/follow. However, supporting just two slashes causes us to have to take care // slashes, like bluesky:///intent/follow. However, supporting just two slashes causes us to have to take care