Merge branch 'mirror' of https://github.com/creaton-io/at-app

.github/workflows/build-submit-android.yml

@@ -0,0 +1,65 @@
+---
+name: Build and Submit Android
+
+on:
+ workflow_dispatch:
+ inputs:
+ profile:
+ type: choice
+ description: Build profile to use
+ options:
+ - production
+
+jobs:
+ build:
+ name: Build and Submit Android
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check for EXPO_TOKEN
+ run: >
+ if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
+ echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
+ exit 1
+ fi
+
+ - name: ⬇️ Checkout
+ uses: actions/checkout@v4
+
+ - name: 🔧 Setup Node
+ uses: actions/setup-node@v4
+ with:
+ node-version-file: .nvmrc
+ cache: yarn
+
+ - name: 🔨 Setup EAS
+ uses: expo/expo-github-action@v8
+ with:
+ expo-version: latest
+ eas-version: latest
+ token: ${{ secrets.EXPO_TOKEN }}
+
+ - name: ⛏️ Setup EAS local builds
+ run: yarn global add eas-cli-local-build-plugin
+
+ - uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: '17'
+
+ - name: ⚙️ Install dependencies
+ run: yarn install
+
+ - name: 🔤 Compile translations
+ run: yarn intl:build
+
+ - name: ✏️ Write environment variables
+ run: |
+ export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
+ echo "${{ secrets.ENV_TOKEN }}" > .env
+ echo "$json" > google-services.json
+
+ - name: 🏗️ EAS Build
+ run: yarn use-build-number eas build -p android --profile production --local --output build.aab --non-interactive
+
+ - name: 🚀 Deploy
+ run: eas submit -p android --non-interactive --path build.aab

.github/workflows/build-submit-ios.yml

@@ -0,0 +1,75 @@
+---
+name: Build and Submit iOS
+
+on:
+ schedule:
+ - cron: '0 5 * * *'
+ workflow_dispatch:
+ inputs:
+ profile:
+ type: choice
+ description: Build profile to use
+ options:
+ - production
+
+jobs:
+ build:
+ name: Build and Submit iOS
+ runs-on: macos-14
+ steps:
+ - name: Check for EXPO_TOKEN
+ run: >
+ if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
+ echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
+ exit 1
+ fi
+
+ - name: ⬇️ Checkout
+ uses: actions/checkout@v4
+
+ - name: 🔧 Setup Node
+ uses: actions/setup-node@v4
+ with:
+ node-version-file: .nvmrc
+ cache: yarn
+
+ - name: 🔨 Setup EAS
+ uses: expo/expo-github-action@v8
+ with:
+ expo-version: latest
+ eas-version: latest
+ token: ${{ secrets.EXPO_TOKEN }}
+
+ - name: ⛏️ Setup EAS local builds
+ run: yarn global add eas-cli-local-build-plugin
+
+ - name: ⚙️ Install dependencies
+ run: yarn install
+
+ - name: ☕️ Setup Cocoapods
+ uses: maxim-lobanov/setup-cocoapods@v1
+ with:
+ version: 1.14.3
+
+ - name: 💾 Cache Pods
+ uses: actions/cache@v3
+ id: pods-cache
+ with:
+ path: ./ios/Pods
+ # We'll use the yarn.lock for our hash since we don't yet have a Podfile.lock. Pod versions will not
+ # change unless the yarn version changes as well.
+ key: ${{ runner.os }}-pods-${{ hashFiles('yarn.lock') }}
+
+ - name: 🔤 Compile translations
+ run: yarn intl:build
+
+ - name: ✏️ Write environment variables
+ run: |
+ echo "${{ secrets.ENV_TOKEN }}" > .env
+ echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json
+
+ - name: 🏗️ EAS Build
+ run: yarn use-build-number eas build -p ios --profile production --local --output build.ipa --non-interactive
+
+ - name: 🚀 Deploy
+ run: eas submit -p ios --non-interactive --path build.ipa

.github/workflows/lint.yml

@@ -32,12 +32,12 @@ jobs:
  name: Run tests
  runs-on: ubuntu-latest
  steps:
- - name: Install node 18
- uses: actions/setup-node@v4
- with:
- node-version: 18
  - name: Check out Git repository
  uses: actions/checkout@v3
+ - name: Install node
+ uses: actions/setup-node@v4
+ with:
+ node-version-file: .nvmrc
  - name: Yarn install
  uses: Wandalen/wretry.action@master
  with:

.nvmrc

@@ -0,0 +1 @@
+18

Dockerfile

@@ -23,7 +23,7 @@ COPY . .
 RUN mkdir --parents $NVM_DIR && \
  wget \
  --output-document=/tmp/nvm-install.sh \
- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh && \
+ https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh && \
  bash /tmp/nvm-install.sh
 
 RUN \. "$NVM_DIR/nvm.sh" && \

README.md

@@ -6,7 +6,7 @@ Get the app itself:
 
 - **Web: [bsky.app](https://bsky.app)**
 - **iOS: [App Store](https://apps.apple.com/us/app/bluesky-social/id6444370199)**
-- **Android: [Play Store](https://play.google.com/store/apps/details?id=xyz.blueskyweb.app&hl=en_US&gl=US)**
+- **Android: [Play Store](https://play.google.com/store/apps/details?id=xyz.blueskyweb.app)**
 
 ## Development Resources
 
@@ -21,7 +21,7 @@ The Authenticated Transfer Protocol ("AT Protocol" or "atproto") is a decentrali
 - [Overview and Guides](https://atproto.com/guides/overview)
 - [Github Discussions](https://github.com/bluesky-social/atproto/discussions) 👈 Great place to ask questions
 - [Protocol Specifications](https://atproto.com/specs/atp)
-- [Blogpost on self-authenticating data structures](https://blueskyweb.xyz/blog/3-6-2022-a-self-authenticating-social-protocol)
+- [Blogpost on self-authenticating data structures](https://bsky.social/about/blog/3-6-2022-a-self-authenticating-social-protocol)
 
 The Bluesky Social application encompasses a set of schemas and APIs built in the overall AT Protocol framework. The namespace for these "Lexicons" is `app.bsky.*`.
 
@@ -65,8 +65,6 @@ If you discover any security issues, please send an email to [email protected].
 
 Bluesky is an open social network built on the AT Protocol, a flexible technology that will never lock developers out of the ecosystems that they help build. With atproto, third-party can be as seamless as first-party through custom feeds, federated services, clients, and more.
 
-If you're a developer interested in building on atproto, we'd love to email you a Bluesky invite code. Simply share your GitHub (or similar) profile with us via [this form](https://forms.gle/BF21oxVNZiDjDhXF9).
-
 ## License (MIT)
 
 See [./LICENSE](./LICENSE) for the full license.

__e2e__/tests/create-account.test.ts

@@ -18,9 +18,10 @@ describe('Create account', () => {
  await device.takeScreenshot('1- opened create account screen')
  await element(by.id('selectServiceButton')).tap()
  await device.takeScreenshot('2- selected other server')
+ await element(by.id('customSelectBtn')).tap()
  await element(by.id('customServerTextInput')).typeText(service)
  await element(by.id('customServerTextInput')).tapReturnKey()
- await element(by.id('customServerSelectBtn')).tap()
+ await element(by.id('doneBtn')).tap()
  await device.takeScreenshot('3- input test server URL')
  await element(by.id('emailInput')).typeText('[email protected]')
  await element(by.id('passwordInput')).typeText('hunter2')
@@ -33,12 +34,6 @@ describe('Create account', () => {
 
  await element(by.id('nextBtn')).tap()
 
- await expect(element(by.id('welcomeOnboarding'))).toBeVisible()
- await element(by.id('continueBtn')).tap()
- await expect(element(by.id('recommendedFeedsOnboarding'))).toBeVisible()
- await element(by.id('continueBtn')).tap()
- await expect(element(by.id('recommendedFollowsOnboarding'))).toBeVisible()
- await element(by.id('continueBtn')).tap()
- await expect(element(by.id('homeScreen'))).toBeVisible()
+ await expect(element(by.id('onboardingInterests'))).toBeVisible()
  })
 })

__e2e__/tests/home-screen.test.ts

@@ -36,22 +36,22 @@ describe('Home screen', () => {
  const carlaPosts = by.id('feedItem-by-carla.test')
  await expect(
  element(by.id('likeCount').withAncestor(carlaPosts)).atIndex(0),
- ).toHaveText('0')
+ ).not.toExist()
  await element(by.id('likeBtn').withAncestor(carlaPosts)).atIndex(0).tap()
  await expect(
  element(by.id('likeCount').withAncestor(carlaPosts)).atIndex(0),
  ).toHaveText('1')
  await element(by.id('likeBtn').withAncestor(carlaPosts)).atIndex(0).tap()
  await expect(
  element(by.id('likeCount').withAncestor(carlaPosts)).atIndex(0),
- ).toHaveText('0')
+ ).not.toExist()
  })
 
  it('Can repost posts', async () => {
  const carlaPosts = by.id('feedItem-by-carla.test')
  await expect(
  element(by.id('repostCount').withAncestor(carlaPosts)).atIndex(0),
- ).toHaveText('0')
+ ).not.toExist()
  await element(by.id('repostBtn').withAncestor(carlaPosts)).atIndex(0).tap()
  await expect(element(by.id('repostModal'))).toBeVisible()
  await element(by.id('repostBtn').withAncestor(by.id('repostModal'))).tap()
@@ -65,7 +65,7 @@ describe('Home screen', () => {
  await expect(element(by.id('repostModal'))).not.toBeVisible()
  await expect(
  element(by.id('repostCount').withAncestor(carlaPosts)).atIndex(0),
- ).toHaveText('0')
+ ).not.toExist()
  })
 
  it('Can report posts', async () => {

__e2e__/tests/invite-codes.test.ts

@@ -28,9 +28,10 @@ describe('invite-codes', () => {
  await device.takeScreenshot('1- opened create account screen')
  await element(by.id('selectServiceButton')).tap()
  await device.takeScreenshot('2- selected other server')
+ await element(by.id('customSelectBtn')).tap()
  await element(by.id('customServerTextInput')).typeText(service)
  await element(by.id('customServerTextInput')).tapReturnKey()
- await element(by.id('customServerSelectBtn')).tap()
+ await element(by.id('doneBtn')).tap()
  await device.takeScreenshot('3- input test server URL')
  await element(by.id('inviteCodeInput')).typeText(inviteCode)
  await element(by.id('emailInput')).typeText('[email protected]')
@@ -40,12 +41,6 @@ describe('invite-codes', () => {
  await element(by.id('handleInput')).typeText('e2e-test')
  await device.takeScreenshot('4- entered handle')
  await element(by.id('nextBtn')).tap()
- await expect(element(by.id('welcomeOnboarding'))).toBeVisible()
- await element(by.id('continueBtn')).tap()
- await expect(element(by.id('recommendedFeedsOnboarding'))).toBeVisible()
- await element(by.id('continueBtn')).tap()
- await expect(element(by.id('recommendedFollowsOnboarding'))).toBeVisible()
- await element(by.id('continueBtn')).tap()
- await expect(element(by.id('homeScreen'))).toBeVisible()
+ await expect(element(by.id('onboardingInterests'))).toBeVisible()
  })
 })

__e2e__/tests/invites-and-text-verification.test.ts

@@ -28,16 +28,17 @@ describe('invite-codes', () => {
  await device.takeScreenshot('1- opened create account screen')
  await element(by.id('selectServiceButton')).tap()
  await device.takeScreenshot('2- selected other server')
+ await element(by.id('customSelectBtn')).tap()
  await element(by.id('customServerTextInput')).typeText(service)
  await element(by.id('customServerTextInput')).tapReturnKey()
- await element(by.id('customServerSelectBtn')).tap()
+ await element(by.id('doneBtn')).tap()
  await device.takeScreenshot('3- input test server URL')
  await element(by.id('inviteCodeInput')).typeText(inviteCode)
  await element(by.id('emailInput')).typeText('[email protected]')
  await element(by.id('passwordInput')).typeText('hunter2')
  await device.takeScreenshot('4- entered account details')
  await element(by.id('nextBtn')).tap()
- await element(by.id('phoneInput')).typeText('5558675309')
+ await element(by.id('phoneInput')).typeText('2345551234')
  await element(by.id('requestCodeBtn')).tap()
  await device.takeScreenshot('5- requested code')
  await element(by.id('codeInput')).typeText('000000')
@@ -46,12 +47,6 @@ describe('invite-codes', () => {
  await element(by.id('handleInput')).typeText('e2e-test')
  await device.takeScreenshot('7- entered handle')
  await element(by.id('nextBtn')).tap()
- await expect(element(by.id('welcomeOnboarding'))).toBeVisible()
- await element(by.id('continueBtn')).tap()
- await expect(element(by.id('recommendedFeedsOnboarding'))).toBeVisible()
- await element(by.id('continueBtn')).tap()
- await expect(element(by.id('recommendedFollowsOnboarding'))).toBeVisible()
- await element(by.id('continueBtn')).tap()
- await expect(element(by.id('homeScreen'))).toBeVisible()
+ await expect(element(by.id('onboardingInterests'))).toBeVisible()
  })
 })

__e2e__/tests/mod-lists.test.ts

@@ -2,7 +2,7 @@
 
 import {describe, beforeAll, it} from '@jest/globals'
 import {expect} from 'detox'
-import {openApp, loginAsAlice, loginAsBob, createServer, sleep} from '../util'
+import {openApp, loginAsAlice, loginAsBob, createServer} from '../util'
 
 describe('Mod lists', () => {
  beforeAll(async () => {
@@ -62,38 +62,39 @@ describe('Mod lists', () => {
  .withTimeout(5000)
  })
 
- it('Set avi via the edit modlist modal', async () => {
- await expect(element(by.id('userAvatarFallback'))).toExist()
- await element(by.id('headerDropdownBtn')).tap()
- await element(by.text('Edit list details')).tap()
- await expect(element(by.id('createOrEditListModal'))).toBeVisible()
- await element(by.id('changeAvatarBtn')).tap()
- await element(by.text('Library')).tap()
- await sleep(3e3)
- await element(by.id('saveBtn')).tap()
- await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
- await expect(element(by.id('userAvatarImage'))).toExist()
- // have to wait for the toast to clear
- await waitFor(element(by.id('headerDropdownBtn')))
- .toBeVisible()
- .withTimeout(5000)
- })
-
- it('Remove avi via the edit modlist modal', async () => {
- await expect(element(by.id('userAvatarImage'))).toExist()
- await element(by.id('headerDropdownBtn')).tap()
- await element(by.text('Edit list details')).tap()
- await expect(element(by.id('createOrEditListModal'))).toBeVisible()
- await element(by.id('changeAvatarBtn')).tap()
- await element(by.text('Remove')).tap()
- await element(by.id('saveBtn')).tap()
- await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
- await expect(element(by.id('userAvatarFallback'))).toExist()
- // have to wait for the toast to clear
- await waitFor(element(by.id('headerDropdownBtn')))
- .toBeVisible()
- .withTimeout(5000)
- })
+ // DISABLED e2e environment is real finicky about avatar uploads -prf
+ // it('Set avi via the edit modlist modal', async () => {
+ // await expect(element(by.id('userAvatarFallback'))).toExist()
+ // await element(by.id('headerDropdownBtn')).tap()
+ // await element(by.text('Edit list details')).tap()
+ // await expect(element(by.id('createOrEditListModal'))).toBeVisible()
+ // await element(by.id('changeAvatarBtn')).tap()
+ // await element(by.text('Library')).tap()
+ // await sleep(3e3)
+ // await element(by.id('saveBtn')).tap()
+ // await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
+ // await expect(element(by.id('userAvatarImage'))).toExist()
+ // // have to wait for the toast to clear
+ // await waitFor(element(by.id('headerDropdownBtn')))
+ // .toBeVisible()
+ // .withTimeout(5000)
+ // })
+
+ // it('Remove avi via the edit modlist modal', async () => {
+ // await expect(element(by.id('userAvatarImage'))).toExist()
+ // await element(by.id('headerDropdownBtn')).tap()
+ // await element(by.text('Edit list details')).tap()
+ // await expect(element(by.id('createOrEditListModal'))).toBeVisible()
+ // await element(by.id('changeAvatarBtn')).tap()
+ // await element(by.text('Remove')).tap()
+ // await element(by.id('saveBtn')).tap()
+ // await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
+ // await expect(element(by.id('userAvatarFallback'))).toExist()
+ // // have to wait for the toast to clear
+ // await waitFor(element(by.id('headerDropdownBtn')))
+ // .toBeVisible()
+ // .withTimeout(5000)
+ // })
 
  it('Delete the modlist', async () => {
  await element(by.id('headerDropdownBtn')).tap()