diff --git a/__e2e__/flows/composer-self-label.yml b/__e2e__/flows/composer-self-label.yml index 4539e1e04..044d40de9 100644 --- a/__e2e__/flows/composer-self-label.yml +++ b/__e2e__/flows/composer-self-label.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/composer.yml b/__e2e__/flows/composer.yml index 62f195de7..68521d3f8 100644 --- a/__e2e__/flows/composer.yml +++ b/__e2e__/flows/composer.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/create-account.yml b/__e2e__/flows/create-account.yml index eb2f05ca1..e9d7f06e3 100644 --- a/__e2e__/flows/create-account.yml +++ b/__e2e__/flows/create-account.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/curate-lists.yml b/__e2e__/flows/curate-lists.yml index ece9a7ce8..44757d37b 100644 --- a/__e2e__/flows/curate-lists.yml +++ b/__e2e__/flows/curate-lists.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/feed-reorder.yml b/__e2e__/flows/feed-reorder.yml index a917344a7..cae1a65b3 100644 --- a/__e2e__/flows/feed-reorder.yml +++ b/__e2e__/flows/feed-reorder.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/home-screen.yml b/__e2e__/flows/home-screen.yml index 420f68b92..5dc936ccc 100644 --- a/__e2e__/flows/home-screen.yml +++ b/__e2e__/flows/home-screen.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/login.yml b/__e2e__/flows/login.yml index 5ca40224c..0a823a5f0 100644 --- a/__e2e__/flows/login.yml +++ b/__e2e__/flows/login.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/mod-lists.yml b/__e2e__/flows/mod-lists.yml index 3a3f5fe9c..9c9414083 100644 --- a/__e2e__/flows/mod-lists.yml +++ b/__e2e__/flows/mod-lists.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/onboarding-avatar-creator.yml b/__e2e__/flows/onboarding-avatar-creator.yml index 2204abb9d..e4e762c9a 100644 --- a/__e2e__/flows/onboarding-avatar-creator.yml +++ b/__e2e__/flows/onboarding-avatar-creator.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/onboarding.yml b/__e2e__/flows/onboarding.yml index a5f421745..d0f0819f1 100644 --- a/__e2e__/flows/onboarding.yml +++ b/__e2e__/flows/onboarding.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/post-report-flow.yml b/__e2e__/flows/post-report-flow.yml index a509fcc02..cc0ae72cc 100644 --- a/__e2e__/flows/post-report-flow.yml +++ b/__e2e__/flows/post-report-flow.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/profile-screen-edit.yml b/__e2e__/flows/profile-screen-edit.yml index f60ca01b4..404affadf 100644 --- a/__e2e__/flows/profile-screen-edit.yml +++ b/__e2e__/flows/profile-screen-edit.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/profile-screen.yml b/__e2e__/flows/profile-screen.yml index a20302dac..1949c6545 100644 --- a/__e2e__/flows/profile-screen.yml +++ b/__e2e__/flows/profile-screen.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/report-dialog/account.default.yml b/__e2e__/flows/report-dialog/account.default.yml index 0d4225473..7e6e5806f 100644 --- a/__e2e__/flows/report-dialog/account.default.yml +++ b/__e2e__/flows/report-dialog/account.default.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../../setupServer.js diff --git a/__e2e__/flows/report-dialog/post.default.yml b/__e2e__/flows/report-dialog/post.default.yml index 955177b59..25005f4b5 100644 --- a/__e2e__/flows/report-dialog/post.default.yml +++ b/__e2e__/flows/report-dialog/post.default.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../../setupServer.js diff --git a/__e2e__/flows/report-dialog/post.edit-reason.yml b/__e2e__/flows/report-dialog/post.edit-reason.yml index 3c612d4ba..87513d366 100644 --- a/__e2e__/flows/report-dialog/post.edit-reason.yml +++ b/__e2e__/flows/report-dialog/post.edit-reason.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../../setupServer.js diff --git a/__e2e__/flows/report-dialog/post.reason-other.yml b/__e2e__/flows/report-dialog/post.reason-other.yml index 39c0e7084..f6520c92d 100644 --- a/__e2e__/flows/report-dialog/post.reason-other.yml +++ b/__e2e__/flows/report-dialog/post.reason-other.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../../setupServer.js diff --git a/__e2e__/flows/search-screen.yml b/__e2e__/flows/search-screen.yml index 13a1b06fa..064b8f58a 100644 --- a/__e2e__/flows/search-screen.yml +++ b/__e2e__/flows/search-screen.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/shared-prefs.yml b/__e2e__/flows/shared-prefs.yml index 8b773a766..2ce8f2822 100644 --- a/__e2e__/flows/shared-prefs.yml +++ b/__e2e__/flows/shared-prefs.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/thread-muting.yml b/__e2e__/flows/thread-muting.yml index fcc4868bf..0020199e0 100644 --- a/__e2e__/flows/thread-muting.yml +++ b/__e2e__/flows/thread-muting.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/flows/thread-screen.yml b/__e2e__/flows/thread-screen.yml index f3671ebcb..66f172717 100644 --- a/__e2e__/flows/thread-screen.yml +++ b/__e2e__/flows/thread-screen.yml @@ -1,4 +1,4 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - runScript: file: ../setupServer.js diff --git a/__e2e__/perf-test.yml b/__e2e__/perf-test.yml index 7a7b7a18c..782ae8cfe 100644 --- a/__e2e__/perf-test.yml +++ b/__e2e__/perf-test.yml @@ -1,7 +1,7 @@ # flow.yaml -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - launchApp # Login @@ -33,7 +33,7 @@ appId: xyz.blueskyweb.app direction: "LEFT" - swipe: direction: "LEFT" -- swipe: +- swipe: direction: "LEFT" - swipe: direction: "RIGHT" diff --git a/__e2e__/setupApp.yml b/__e2e__/setupApp.yml index 00f53c526..f05cf4dba 100644 --- a/__e2e__/setupApp.yml +++ b/__e2e__/setupApp.yml @@ -1,7 +1,7 @@ -appId: xyz.blueskyweb.app +appId: app.bitchsky --- - launchApp: - appId: "xyz.blueskyweb.app" + appId: "app.bitchsky" clearState: true - waitForAnimationToEnd - tapOn: "http://localhost:8081" diff --git a/__tests__/lib/string.test.ts b/__tests__/lib/string.test.ts index 6087ba5b1..a9842ab25 100644 --- a/__tests__/lib/string.test.ts +++ b/__tests__/lib/string.test.ts @@ -981,7 +981,7 @@ describe('parseStarterPackHttpUri', () => { describe('createStarterPackGooglePlayUri', () => { const base = - 'https://play.google.com/store/apps/details?id=xyz.blueskyweb.app&referrer=utm_source%3Dbluesky%26utm_medium%3Dstarterpack%26utm_content%3Dstarterpack_' + 'https://play.google.com/store/apps/details?id=app.bitchsky&referrer=utm_source%3Dbluesky%26utm_medium%3Dstarterpack%26utm_content%3Dstarterpack_' it('returns valid google play uri when input is valid', () => { expect(createStarterPackGooglePlayUri('name', 'rkey')).toEqual( diff --git a/bskylink/src/routes/siteAssociation.ts b/bskylink/src/routes/siteAssociation.ts index 7b71ccdd5..d240b6c7d 100644 --- a/bskylink/src/routes/siteAssociation.ts +++ b/bskylink/src/routes/siteAssociation.ts @@ -9,13 +9,13 @@ export default function (ctx: AppContext, app: Express) { apps: [], details: [ { - appID: 'B3LX46C5HS.xyz.blueskyweb.app', + appID: 'B3LX46C5HS.app.bitchsky', paths: ['*'], }, ], }, appclips: { - apps: ['B3LX46C5HS.xyz.blueskyweb.app.AppClip'], + apps: ['B3LX46C5HS.app.bitchsky.AppClip'], }, }) }) diff --git a/bskyweb/cmd/bskyweb/server.go b/bskyweb/cmd/bskyweb/server.go index ec5261dee..fb1d7dac2 100644 --- a/bskyweb/cmd/bskyweb/server.go +++ b/bskyweb/cmd/bskyweb/server.go @@ -413,7 +413,7 @@ func (srv *Server) errorHandler(err error, c echo.Context) { func (srv *Server) Download(c echo.Context) error { ua := c.Request().UserAgent() if strings.Contains(ua, "Android") { - return c.Redirect(http.StatusFound, "https://play.google.com/store/apps/details?id=xyz.blueskyweb.app") + return c.Redirect(http.StatusFound, "https://play.google.com/store/apps/details?id=app.bitchsky") } if strings.Contains(ua, "iPhone") || strings.Contains(ua, "iPad") || strings.Contains(ua, "iPod") { diff --git a/bskyweb/static/.well-known/apple-app-site-association b/bskyweb/static/.well-known/apple-app-site-association index f5752d7c1..b284d6b9c 100644 --- a/bskyweb/static/.well-known/apple-app-site-association +++ b/bskyweb/static/.well-known/apple-app-site-association @@ -2,7 +2,7 @@ "applinks": { "details": [ { - "appID": "B3LX46C5HS.xyz.blueskyweb.app", + "appID": "B3LX46C5HS.app.bitchsky", "paths": [ "*" ] @@ -10,6 +10,6 @@ ] }, "appclips": { - "apps": ["B3LX46C5HS.xyz.blueskyweb.app.AppClip"] + "apps": ["B3LX46C5HS.app.bitchsky.AppClip"] } } diff --git a/bskyweb/templates/starterpack.html b/bskyweb/templates/starterpack.html index 80cbfc80a..694b830ed 100644 --- a/bskyweb/templates/starterpack.html +++ b/bskyweb/templates/starterpack.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block html_head_extra -%} - + {%- if requestURI %} {% endif -%} diff --git a/docs/deploy-ota.md b/docs/deploy-ota.md index e75ac1b3a..be3eda475 100644 --- a/docs/deploy-ota.md +++ b/docs/deploy-ota.md @@ -60,13 +60,13 @@ values you found in **Step 1**. ```sh > npx eas build:version:set -p ios > -> Project @blueskysocial/bluesky with bundle identifier "xyz.blueskyweb.app" is configured with buildNumber 1011. +> Project @blueskysocial/bluesky with bundle identifier "app.bitchsky" is configured with buildNumber 1011. > ✔ What version would you like to set? … 1009 > > npx eas build:version:set -p android > -> Project @blueskysocial/bluesky with application ID "xyz.blueskyweb.app" is configured with versionCode 641. -> ✔ What version would you like to set? … 639 +> Project @blueskysocial/bluesky with application ID "app.bitchsky" is configured with versionCode 641. +> ✔ What version would you like to set? … 639 ``` 👉 **Save the previous values,** in this case `1011` and `641`, so you can reset @@ -124,12 +124,12 @@ to reset the build numbers. ```sh > npx eas build:version:set -p ios > -> Project @blueskysocial/bluesky with bundle identifier "xyz.blueskyweb.app" is configured with buildNumber 1009. +> Project @blueskysocial/bluesky with bundle identifier "app.bitchsky" is configured with buildNumber 1009. > ✔ What version would you like to set? … 1011 > > npx eas build:version:set -p android > -> Project @blueskysocial/bluesky with application ID "xyz.blueskyweb.app" is configured with versionCode 639. +> Project @blueskysocial/bluesky with application ID "app.bitchsky" is configured with versionCode 639. > ✔ What version would you like to set? … 641 ``` diff --git a/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/NotificationPrefs.kt b/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/NotificationPrefs.kt index 97b05b4d7..e4be49ee7 100644 --- a/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/NotificationPrefs.kt +++ b/modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/NotificationPrefs.kt @@ -18,7 +18,7 @@ class NotificationPrefs( private val context: Context?, ) { private val prefs = - context?.getSharedPreferences("xyz.blueskyweb.app", Context.MODE_PRIVATE) + context?.getSharedPreferences("app.bitchsky", Context.MODE_PRIVATE) ?: throw Error("Context is null") fun initialize() { diff --git a/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/sharedprefs/SharedPrefs.kt b/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/sharedprefs/SharedPrefs.kt index 38d79abf1..fb7f04308 100644 --- a/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/sharedprefs/SharedPrefs.kt +++ b/modules/expo-bluesky-swiss-army/android/src/main/java/expo/modules/blueskyswissarmy/sharedprefs/SharedPrefs.kt @@ -32,7 +32,7 @@ class SharedPrefs( ): SharedPreferences { if (instance == null) { Log.d(NAME, "No preferences instance found, creating one.") - instance = context.getSharedPreferences("xyz.blueskyweb.app", Context.MODE_PRIVATE) + instance = context.getSharedPreferences("app.bitchsky", Context.MODE_PRIVATE) } val safeInstance = instance ?: throw Error("Preferences is null: $info") diff --git a/modules/expo-receive-android-intents/android/build.gradle b/modules/expo-receive-android-intents/android/build.gradle index 3712dda40..cb9b3a220 100644 --- a/modules/expo-receive-android-intents/android/build.gradle +++ b/modules/expo-receive-android-intents/android/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'maven-publish' -group = 'xyz.blueskyweb.app.exporeceiveandroidintents' +group = 'app.bitchsky.exporeceiveandroidintents' version = '0.4.1' buildscript { @@ -65,7 +65,7 @@ android { } } - namespace "xyz.blueskyweb.app.exporeceiveandroidintents" + namespace "app.bitchsky.exporeceiveandroidintents" defaultConfig { minSdkVersion safeExtGet("minSdkVersion", 21) targetSdkVersion safeExtGet("targetSdkVersion", 34) diff --git a/modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt b/modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt index abae882b4..e73ff1073 100644 --- a/modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt +++ b/modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt @@ -1,4 +1,4 @@ -package xyz.blueskyweb.app.exporeceiveandroidintents +package app.bitchsky.exporeceiveandroidintents import android.content.Intent import android.graphics.Bitmap diff --git a/modules/expo-receive-android-intents/expo-module.config.json b/modules/expo-receive-android-intents/expo-module.config.json index 8f01fb6c9..aefaca97f 100644 --- a/modules/expo-receive-android-intents/expo-module.config.json +++ b/modules/expo-receive-android-intents/expo-module.config.json @@ -1,6 +1,6 @@ { "platforms": ["android"], "android": { - "modules": ["xyz.blueskyweb.app.exporeceiveandroidintents.ExpoReceiveAndroidIntentsModule"] + "modules": ["app.bitchsky.exporeceiveandroidintents.ExpoReceiveAndroidIntentsModule"] } } diff --git a/package.json b/package.json index 9519c89ac..582c96ab1 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "e2e:run": "maestro test __e2e__", "perf:test": "NODE_ENV=test maestro test", "perf:test:run": "NODE_ENV=test maestro test __e2e__/perf-test.yml", - "perf:test:measure": "NODE_ENV=test flashlight test --bundleId xyz.blueskyweb.app --testCommand \"yarn perf:test\" --duration 150000 --resultsFilePath .perf/results.json", + "perf:test:measure": "NODE_ENV=test flashlight test --bundleId app.bitchsky --testCommand \"yarn perf:test\" --duration 150000 --resultsFilePath .perf/results.json", "perf:test:results": "NODE_ENV=test flashlight report .perf/results.json", "perf:measure": "NODE_ENV=test flashlight measure", "intl:build": "yarn intl:extract:all && yarn intl:compile", diff --git a/src/lib/strings/starter-pack.ts b/src/lib/strings/starter-pack.ts index 475b00033..a2dfd1009 100644 --- a/src/lib/strings/starter-pack.ts +++ b/src/lib/strings/starter-pack.ts @@ -66,7 +66,7 @@ export function createStarterPackGooglePlayUri( rkey: string, ): string | null { if (!name || !rkey) return null - return `https://play.google.com/store/apps/details?id=xyz.blueskyweb.app&referrer=utm_source%3Dbluesky%26utm_medium%3Dstarterpack%26utm_content%3Dstarterpack_${name}_${rkey}` + return `https://play.google.com/store/apps/details?id=app.bitchsky&referrer=utm_source%3Dbluesky%26utm_medium%3Dstarterpack%26utm_content%3Dstarterpack_${name}_${rkey}` } export function httpStarterPackUriToAtUri(httpUri?: string): string | null { diff --git a/src/screens/Settings/NotificationSettings/index.tsx b/src/screens/Settings/NotificationSettings/index.tsx index a16d30061..4e4f4cb07 100644 --- a/src/screens/Settings/NotificationSettings/index.tsx +++ b/src/screens/Settings/NotificationSettings/index.tsx @@ -70,7 +70,7 @@ export function NotificationSettingsScreen({}: Props) { [ { key: 'android.provider.extra.APP_PACKAGE', - value: 'xyz.blueskyweb.app', + value: 'app.bitchsky', }, ], ) diff --git a/src/screens/StarterPack/StarterPackLandingScreen.tsx b/src/screens/StarterPack/StarterPackLandingScreen.tsx index 829e1f5f7..9c1bb209e 100644 --- a/src/screens/StarterPack/StarterPackLandingScreen.tsx +++ b/src/screens/StarterPack/StarterPackLandingScreen.tsx @@ -362,7 +362,7 @@ function LandingScreenLoaded({ {isWeb && ( )}