Compare commits
1 Commits
main
...
5362bf7f7b
| Author | SHA1 | Date | |
|---|---|---|---|
|
5362bf7f7b
|
40
.github/workflows/cf-pages.yml
vendored
@@ -1,40 +0,0 @@
|
|||||||
name: Deploy to Cloudflare Pages
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
paths:
|
|
||||||
- 'web/**'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
deployments: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '20'
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: npm install
|
|
||||||
working-directory: web
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: npm run build
|
|
||||||
working-directory: web
|
|
||||||
|
|
||||||
- name: Deploy to Cloudflare Pages
|
|
||||||
uses: cloudflare/wrangler-action@v3
|
|
||||||
with:
|
|
||||||
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
|
||||||
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
|
||||||
command: pages deploy web/dist/aiat --project-name=${{ secrets.CLOUDFLARE_PROJECT_NAME }}
|
|
||||||
8
.gitignore
vendored
@@ -2,11 +2,3 @@ repos
|
|||||||
.claude
|
.claude
|
||||||
deploy.yml
|
deploy.yml
|
||||||
claude.md
|
claude.md
|
||||||
embedded.mobileprovision
|
|
||||||
.env
|
|
||||||
k8s/secrets.env
|
|
||||||
k8s/deploy.yml
|
|
||||||
web/dist
|
|
||||||
node_modules
|
|
||||||
package-lock.json
|
|
||||||
/tmp
|
|
||||||
|
|||||||
44
README.md
@@ -1,15 +1,18 @@
|
|||||||
# at
|
# at
|
||||||
|
|
||||||
- https://github.com/bluesky-social/atproto
|
- https://github.com/bluesky-social/atproto
|
||||||
- https://github.com/bluesky-social/social-app
|
- https://github.com/bluesky-social/atproto/discussions/2026
|
||||||
|
|
||||||
|name|type|example|
|
|word|name|example|
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
|at|uri|at://example.com|
|
|at|uri|at://example.com|
|
||||||
|@|user|@example.com|
|
|@|user|@example.com|
|
||||||
|
|[at]proto|repo|`git@github.com:bluesky-social/atproto`|
|
||||||
|[at]mosphere|system|pds, bsky(appview), ozone, bgs, plc|
|
|[at]mosphere|system|pds, bsky(appview), ozone, bgs, plc|
|
||||||
|[a]uthenticated [t]ransfer|protocol|[did](https://www.w3.org/TR/did-core/)|
|
|[a]uthenticated [t]ransfer|protocol|[did](https://www.w3.org/TR/did-core/)|
|
||||||
|
|
||||||
|
- https://atproto.com/ja/guides/glossary
|
||||||
|
|
||||||
## account
|
## account
|
||||||
|
|
||||||
- [ai@syu.is](https://syu.is/profile/did:plc:6qyecktefllvenje24fcxnie)
|
- [ai@syu.is](https://syu.is/profile/did:plc:6qyecktefllvenje24fcxnie)
|
||||||
@@ -19,14 +22,27 @@
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ curl -sL syu.is/xrpc/_health
|
$ curl -sL syu.is/xrpc/_health
|
||||||
|
|
||||||
|
# latest
|
||||||
|
# https://github.com/bluesky-social/atproto/blob/main/packages/pds/package.json
|
||||||
|
$ curl -sL https://raw.githubusercontent.com/bluesky-social/atproto/refs/heads/main/packages/pds/package.json |jq -r .version
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ handle=ai.syui.ai
|
||||||
|
$ curl -sL "syu.is/xrpc/com.atproto.repo.describeRepo?repo=${handle}" |jq -r .did
|
||||||
|
did:plc:6qyecktefllvenje24fcxnie
|
||||||
|
|
||||||
|
$ curl -sL "syu.is/xrpc/com.atproto.repo.listRecords?repo=${handle}&collection=app.bsky.feed.post&reverse=true&limit=1"
|
||||||
|
{"records":[{"uri":"at://did:plc:6qyecktefllvenje24fcxnie/app.bsky.feed.post/3l6s2riuouk2j","cid":"bafyreibjohl7va4upkibw5twaxdd4jg3l6rmfatu4dpjjfd5xkb2ijtlx4","value":{"text":"hello","$type":"app.bsky.feed.post","langs":["ja"],"createdAt":"2024-10-18T13:21:39.809Z"}}],"cursor":"3l6s2riuouk2j"}
|
||||||
```
|
```
|
||||||
|
|
||||||
## feed
|
## feed
|
||||||
|
|
||||||
> at://did:plc:6qyecktefllvenje24fcxnie/app.bsky.feed.generator/app
|
> at://did:plc:6qyecktefllvenje24fcxnie/app.bsky.feed.generator/app
|
||||||
|
|
||||||
- https://syu.is/profile/did:plc:6qyecktefllvenje24fcxnie/feed/app
|
- https://syu.is/profile/ai.syui.ai/feed/app
|
||||||
- https://feed.syu.is/xrpc/app.bsky.feed.getFeedSkeleton?feed=at://did:plc:6qyecktefllvenje24fcxnie/app.bsky.feed.generator/app
|
- https://feed.syu.is/xrpc/app.bsky.feed.getFeedSkeleton?feed=at://did:plc:4hqjfn7m6n5hno3doamuhgef/app.bsky.feed.generator/app
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
@@ -49,23 +65,3 @@ $ curl -sL syu.is/xrpc/_health
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## build
|
|
||||||
|
|
||||||
```sh
|
|
||||||
# build
|
|
||||||
./install.zsh
|
|
||||||
|
|
||||||
# build social-app
|
|
||||||
./install.zsh pull;./install.zsh patch;./install.zsh build social-app;./install.zsh push social-app
|
|
||||||
---
|
|
||||||
# server
|
|
||||||
./install.zsh
|
|
||||||
---
|
|
||||||
# social-app ios
|
|
||||||
# https://appstoreconnect.apple.com/
|
|
||||||
# https://developer.apple.com/account/resources/profiles/list
|
|
||||||
./install.zsh pull;./ios/setup.zsh
|
|
||||||
./ios/build.zsh
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ services:
|
|||||||
- 2470:2470
|
- 2470:2470
|
||||||
build:
|
build:
|
||||||
context: ./repos/indigo/
|
context: ./repos/indigo/
|
||||||
dockerfile: cmd/relay/Dockerfile
|
dockerfile: cmd/bigsky/Dockerfile
|
||||||
restart: always
|
restart: always
|
||||||
env_file:
|
env_file:
|
||||||
- ./envs/bgs
|
- ./envs/bgs
|
||||||
@@ -86,7 +86,6 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
database:
|
database:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
#command: ["/bigsky", "--crawl-insecure-ws"]
|
|
||||||
|
|
||||||
social-app:
|
social-app:
|
||||||
ports:
|
ports:
|
||||||
@@ -155,5 +154,3 @@ services:
|
|||||||
- ./envs/feed
|
- ./envs/feed
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/feed:/data/
|
- ./data/feed:/data/
|
||||||
depends_on:
|
|
||||||
- jetstream
|
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
FROM node:20-alpine
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Install dependencies for better-sqlite3
|
|
||||||
RUN apk add --no-cache python3 make g++
|
|
||||||
|
|
||||||
# Copy package files and install
|
|
||||||
COPY package.json yarn.lock ./
|
|
||||||
RUN yarn install
|
|
||||||
|
|
||||||
# Copy source
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
# Build TypeScript
|
|
||||||
RUN yarn build
|
|
||||||
|
|
||||||
EXPOSE 3000
|
|
||||||
|
|
||||||
CMD ["node", "dist/index.js"]
|
|
||||||
@@ -3,5 +3,5 @@ FEEDGEN_LISTENHOST=0.0.0.0
|
|||||||
FEEDGEN_SQLITE_LOCATION=/data/db.sqlite
|
FEEDGEN_SQLITE_LOCATION=/data/db.sqlite
|
||||||
FEEDGEN_HOSTNAME=feed.syu.is
|
FEEDGEN_HOSTNAME=feed.syu.is
|
||||||
FEEDGEN_PUBLISHER_DID=did:plc:6qyecktefllvenje24fcxnie
|
FEEDGEN_PUBLISHER_DID=did:plc:6qyecktefllvenje24fcxnie
|
||||||
|
FEEDGEN_SUBSCRIPTION_ENDPOINT=ws://bgs:2470
|
||||||
FEEDGEN_SERVICE_DID=did:web:feed.syu.is
|
FEEDGEN_SERVICE_DID=did:web:feed.syu.is
|
||||||
FEEDGEN_JETSTREAM_URL=ws://jetstream:6008/subscribe
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
JETSTREAM_WS_URL=ws://bgs.${host}/xrpc/com.atproto.sync.subscribeRepos
|
JETSTREAM_WS_URL=wss://bgs.${host}/xrpc/com.atproto.sync.subscribeRepos
|
||||||
JETSTREAM_DATA_DIR=/data
|
JETSTREAM_DATA_DIR=/data
|
||||||
JETSTREAM_LISTEN_ADDR=:6008
|
JETSTREAM_LISTEN_ADDR=:6008
|
||||||
JETSTREAM_METRICS_LISTEN_ADDR=:6009
|
JETSTREAM_METRICS_LISTEN_ADDR=:6009
|
||||||
|
|||||||
32
icon.svg
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
<svg
|
||||||
|
viewBox="0 0 2821.6379 794.29016"
|
||||||
|
preserveAspectRatio="xMidYMid"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg">
|
||||||
|
<g
|
||||||
|
transform="matrix(0.1,0,0,-0.1,-282.80153,1445)"
|
||||||
|
fill="#000000"
|
||||||
|
stroke="none"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="m 24787,14443 c -4,-3 -7,-224 -7,-490 v -483 h 545 545 v 490 490 h -538 c -296,0 -542,-3 -545,-7 z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="m 5190,13285 c -8,-3 -96,-12 -195,-20 -199,-16 -296,-32 -430,-70 -49,-14 -115,-32 -145,-40 -153,-39 -504,-198 -662,-301 -21,-13 -57,-36 -80,-51 -24,-16 -72,-50 -109,-78 -241,-182 -377,-315 -528,-517 -119,-158 -120,-160 -106,-188 23,-45 140,-140 560,-457 110,-84 319,-242 465,-353 146,-110 369,-279 495,-375 791,-600 723,-549 1049,-799 269,-207 398,-307 524,-403 l 114,-86 -49,-49 c -128,-131 -378,-258 -588,-299 -66,-13 -357,-13 -420,0 -115,23 -172,39 -202,54 -18,10 -37,17 -43,17 -24,0 -171,81 -255,141 -50,35 -146,121 -215,192 -69,70 -133,127 -142,127 -19,0 -153,-63 -177,-83 -9,-7 -54,-35 -101,-62 -47,-26 -110,-64 -140,-85 -30,-20 -97,-61 -148,-91 -51,-30 -107,-62 -124,-72 -18,-10 -57,-38 -87,-61 -70,-53 -252,-168 -446,-281 -82,-49 -158,-95 -168,-104 -16,-16 -14,-21 34,-106 165,-289 544,-666 867,-860 9,-6 35,-22 58,-37 36,-23 267,-138 349,-173 108,-47 160,-67 240,-93 150,-48 201,-62 228,-62 14,0 64,-9 109,-19 197,-46 302,-56 573,-56 197,1 281,5 345,17 47,9 110,19 141,22 31,3 75,13 99,21 23,8 56,15 72,15 17,0 51,7 77,15 25,8 80,24 121,36 41,12 125,41 185,66 61,25 124,50 140,56 17,7 89,42 160,78 113,58 177,98 395,246 82,56 273,232 403,371 127,136 237,271 237,291 0,12 -208,179 -425,342 -186,140 -1121,843 -1720,1294 -264,199 -589,444 -723,546 -134,101 -274,208 -312,237 -39,29 -70,58 -70,66 0,21 107,115 203,179 95,64 237,133 295,143 20,4 49,12 63,20 96,48 519,48 619,-1 14,-7 41,-16 60,-20 65,-13 262,-118 360,-191 99,-74 250,-230 372,-384 34,-44 70,-80 80,-80 9,0 39,15 67,33 28,17 70,44 94,58 23,15 121,76 217,136 96,60 254,156 350,213 96,56 272,160 390,230 118,70 230,135 248,144 41,21 41,45 -3,116 -18,30 -46,75 -61,100 -64,106 -252,348 -352,454 -106,112 -169,171 -293,274 -197,164 -310,235 -594,376 -215,106 -519,205 -735,240 -137,22 -574,51 -610,41 z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="m 29095,12736 c -421,-44 -744,-157 -975,-342 -259,-207 -396,-446 -465,-809 -16,-84 -23,-301 -14,-425 36,-518 257,-859 694,-1070 166,-80 284,-116 716,-215 449,-103 514,-121 646,-186 218,-107 308,-253 306,-494 -2,-303 -188,-477 -588,-551 -140,-26 -640,-27 -825,-1 -275,38 -486,94 -776,203 -94,35 -174,64 -178,64 -3,0 -6,-175 -6,-389 v -388 l 88,-41 c 404,-187 905,-282 1486,-282 675,0 1154,150 1465,459 196,194 311,434 362,756 20,121 17,476 -5,600 -89,517 -358,800 -945,994 -130,43 -241,71 -616,156 -137,31 -299,73 -360,92 -331,106 -455,246 -455,511 1,249 127,412 387,501 272,92 801,76 1269,-39 116,-28 326,-96 432,-138 l 52,-22 -2,406 -3,406 -66,28 c -154,66 -413,140 -604,174 -279,49 -756,69 -1020,42 z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="m 9630,12676 c 0,-2 403,-996 896,-2208 493,-1211 898,-2211 901,-2220 6,-21 -135,-386 -193,-499 -104,-202 -256,-324 -471,-380 -118,-30 -340,-43 -516,-29 -84,6 -185,17 -225,24 -40,7 -75,10 -77,7 -3,-2 -5,-163 -5,-357 v -353 l 63,-30 c 194,-93 493,-138 801,-120 414,23 683,115 937,319 174,140 357,402 474,680 26,62 1945,5159 1945,5167 0,2 -232,2 -516,1 l -517,-3 -556,-1550 c -485,-1350 -560,-1550 -578,-1553 -18,-3 -26,11 -62,105 -23,59 -295,758 -605,1553 l -562,1445 -567,3 c -312,1 -567,0 -567,-2 z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="m 15690,10867 c 0,-1970 -1,-1936 56,-2153 128,-497 461,-787 1014,-885 147,-26 440,-36 605,-20 413,40 834,200 1181,447 35,25 73,44 88,44 14,0 26,-1 26,-3 0,-2 20,-94 45,-205 25,-111 45,-204 45,-207 0,-3 209,-5 465,-5 h 465 v 2400 2400 h -535 -535 l -2,-1866 -3,-1866 -115,-50 c -425,-185 -743,-252 -1088,-227 -302,21 -472,109 -562,293 -79,161 -74,11 -77,1969 l -3,1747 h -535 -535 z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="m 24785,12668 c -3,-7 -4,-1086 -3,-2398 l 3,-2385 538,-3 537,-2 v 2400 2400 h -535 c -419,0 -537,-3 -540,-12 z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="m 21660,8275 v -545 h 565 565 v 545 545 h -565 -565 z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 4.0 KiB |
476
install.zsh
@@ -52,10 +52,6 @@ function at-repos-env() {
|
|||||||
name=${host%%.*}
|
name=${host%%.*}
|
||||||
domain=${host##*.}
|
domain=${host##*.}
|
||||||
dport=5000
|
dport=5000
|
||||||
|
|
||||||
typeset -A PINNED_COMMITS
|
|
||||||
PINNED_COMMITS=()
|
|
||||||
#PINNED_COMMITS=( [indigo]="d49b454196351c988ceb5ce1f5e21b689487b5ab" [atproto]="104e6ed37b0589cc000109dc76316be35b2257e1")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Arrays for patch management
|
# Arrays for patch management
|
||||||
@@ -72,10 +68,11 @@ typeset -a PATCH_FILES
|
|||||||
PATCH_FILES=(
|
PATCH_FILES=(
|
||||||
"170-pds-oauth-same-site-fix.patch"
|
"170-pds-oauth-same-site-fix.patch"
|
||||||
"8980-social-app-disable-proxy.diff"
|
"8980-social-app-disable-proxy.diff"
|
||||||
|
"disable-statsig-sdk.diff"
|
||||||
"140-social-app-yarn-network-timeout.patch"
|
"140-social-app-yarn-network-timeout.patch"
|
||||||
"130-atproto-ozone-enable-daemon-v2.patch"
|
"130-atproto-ozone-enable-daemon-v2.patch"
|
||||||
|
"190-bgs-disable-ratelimit.patch"
|
||||||
"200-feed-generator-custom.patch"
|
"200-feed-generator-custom.patch"
|
||||||
"210-bgs-since-empty-fix.patch"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
function at-repos-clone() {
|
function at-repos-clone() {
|
||||||
@@ -103,10 +100,6 @@ function at-repos-pull() {
|
|||||||
echo $repo
|
echo $repo
|
||||||
if [ -d $d/repos/${repo##*/} ];then
|
if [ -d $d/repos/${repo##*/} ];then
|
||||||
cd $d/repos/${repo##*/}
|
cd $d/repos/${repo##*/}
|
||||||
# Clean up before pull: reset changes, remove .orig files and untracked patch-created files
|
|
||||||
git checkout -- .
|
|
||||||
find . -name "*.orig" -type f -delete 2>/dev/null
|
|
||||||
git clean -fd 2>/dev/null
|
|
||||||
git stash -u
|
git stash -u
|
||||||
if ! git pull;then
|
if ! git pull;then
|
||||||
rm -rf $d/repos/${repo##*/}
|
rm -rf $d/repos/${repo##*/}
|
||||||
@@ -120,31 +113,32 @@ function at-repos-pull() {
|
|||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
# Copy feed-generator Dockerfile if missing (removed by git checkout)
|
|
||||||
if [ ! -f $d/repos/feed-generator/Dockerfile ] && [ -f $d/docker/feed/Dockerfile ];then
|
|
||||||
cp -rf $d/docker/feed/Dockerfile $d/repos/feed-generator/
|
|
||||||
fi
|
|
||||||
cd $d
|
cd $d
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-checkout-pinned() {
|
function at-repos-social-app-avatar-write() {
|
||||||
echo "🔒 Checking out pinned commits..."
|
did_admin=did:plc:6qyecktefllvenje24fcxnie
|
||||||
cd $d/repos
|
dt=$d/repos/social-app/src
|
||||||
for repo_name pinned_commit in ${(kv)PINNED_COMMITS}; do
|
cd $dt
|
||||||
if [ -n "$pinned_commit" ] && [ -d "$d/repos/$repo_name" ]; then
|
grep -R syu.is .|cut -d : -f 1|sort -u|xargs sediment "s/syu.is/${host}/g"
|
||||||
echo " 📌 $repo_name -> $pinned_commit"
|
grep -R web.syu.is .|cut -d : -f 1|sort -u|xargs sediment "s/web.syu.is/web.${host}/g"
|
||||||
cd $d/repos/$repo_name
|
f=$dt/lib/constants.ts
|
||||||
git fetch origin
|
sediment "s#export const BSKY_SERVICE = 'https://bsky.social'#export const BSKY_SERVICE = 'https://${host}'#g" $f
|
||||||
git checkout $pinned_commit
|
sediment "s#export const BSKY_SERVICE_DID = 'did:web:bsky.social'#export const BSKY_SERVICE_DID = 'did:web:${host}'#g" $f
|
||||||
cd $d/repos
|
sediment "s#export const PUBLIC_BSKY_SERVICE = 'https://public.api.bsky.app'#export const PUBLIC_BSKY_SERVICE = 'https://bsky.${host}'#g" $f
|
||||||
fi
|
sediment "s#export const PUBLIC_APPVIEW = 'https://api.bsky.app'#export const PUBLIC_APPVIEW = 'https://bsky.${host}'#g" $f
|
||||||
done
|
sediment "s#export const PUBLIC_APPVIEW_DID = 'did:web:api.bsky.app'#export const PUBLIC_APPVIEW_DID = 'did:web:bsky.${host}'#g" $f
|
||||||
cd $d
|
|
||||||
|
f=$dt/view/com/util/UserAvatar.tsx
|
||||||
|
curl -sL https://raw.githubusercontent.com/bluesky-social/social-app/refs/heads/main/src/view/com/util/UserAvatar.tsx -o $f
|
||||||
|
sediment "s#/img/avatar/plain/#https://cdn.web.syu.is/img/avatar/plain/#g" $f
|
||||||
|
sediment "s#/img/avatar_thumbnail/plain/#https://bsky.${host}/img/avatar/plain/#g" $f
|
||||||
|
sediment "s#source={{uri: avatar}}#source={{ uri: hackModifyThumbnailPath(avatar, 1 > 0), }}#g" $f
|
||||||
|
curl -sL https://raw.githubusercontent.com/bluesky-social/social-app/refs/heads/main/src/lib/strings/url-helpers.ts -o $dt/lib/strings/url-helpers.ts
|
||||||
|
sediment "s#https://go.web.syu.is/redirect?u=\${encodeURIComponent(url)}#\${url}#g" $dt/lib/strings/url-helpers.ts
|
||||||
|
grep -R $did_admin .|cut -d : -f 1|sort -u|xargs sediment "s/${did_admin}/${did}/g"
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-social-app-ios-patch() {
|
|
||||||
$d/ios/setup.zsh
|
|
||||||
}
|
|
||||||
|
|
||||||
# Common patch function with status detection
|
# Common patch function with status detection
|
||||||
function apply-patch() {
|
function apply-patch() {
|
||||||
@@ -267,21 +261,16 @@ function at-repos-patch-apply-all() {
|
|||||||
local repo=""
|
local repo=""
|
||||||
|
|
||||||
# Determine repo from filename
|
# Determine repo from filename
|
||||||
# Note: check indigo/bgs BEFORE pds to avoid "newpds" matching "pds"
|
|
||||||
if [[ $filename == *"social-app"* || $filename == *"statsig"* ]]; then
|
if [[ $filename == *"social-app"* || $filename == *"statsig"* ]]; then
|
||||||
repo="social-app"
|
repo="social-app"
|
||||||
elif [[ $filename == *"indigo"* || $filename == *"bgs"* ]]; then
|
|
||||||
repo="indigo"
|
|
||||||
elif [[ $filename == *"atproto"* ]]; then
|
elif [[ $filename == *"atproto"* ]]; then
|
||||||
repo="atproto"
|
repo="atproto"
|
||||||
elif [[ $filename == *"pds"* ]]; then
|
elif [[ $filename == *"pds"* ]]; then
|
||||||
repo="atproto"
|
repo="atproto"
|
||||||
|
elif [[ $filename == *"indigo"* || $filename == *"bgs"* ]]; then
|
||||||
|
repo="indigo"
|
||||||
elif [[ $filename == *"feed"* ]]; then
|
elif [[ $filename == *"feed"* ]]; then
|
||||||
repo="feed-generator"
|
repo="feed-generator"
|
||||||
# feed-generatorパッチ適用前に既存のDockerfileを削除(upstreamと競合回避)
|
|
||||||
if [[ $filename == "200-feed-generator-custom.patch" ]]; then
|
|
||||||
rm -f "$d/repos/feed-generator/Dockerfile"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
patch-apply "$title" "$repo" "$filename"
|
patch-apply "$title" "$repo" "$filename"
|
||||||
@@ -334,169 +323,20 @@ export const SOCIAL_APP_DOMAIN =\
|
|||||||
}' lib/constants.ts 2>/dev/null || true
|
}' lib/constants.ts 2>/dev/null || true
|
||||||
# Fix parseInt() to handle undefined by adding || ''
|
# Fix parseInt() to handle undefined by adding || ''
|
||||||
sediment "s/parseInt(env('\([^']*\)'))/parseInt(env('\1') || '0')/g" lib/constants.ts 2>/dev/null || true
|
sediment "s/parseInt(env('\([^']*\)'))/parseInt(env('\1') || '0')/g" lib/constants.ts 2>/dev/null || true
|
||||||
|
|
||||||
# Add next-runtime-env to package.json if missing (used by lib/constants.ts)
|
|
||||||
if ! grep -q 'next-runtime-env' package.json 2>/dev/null; then
|
|
||||||
echo "📦 Adding next-runtime-env to package.json..."
|
|
||||||
python3 -c "
|
|
||||||
import json
|
|
||||||
with open('package.json') as f:
|
|
||||||
d = json.load(f)
|
|
||||||
d.setdefault('dependencies', {})['next-runtime-env'] = '^1.6.2'
|
|
||||||
with open('package.json', 'w') as f:
|
|
||||||
json.dump(d, f, indent=2)
|
|
||||||
f.write('\n')
|
|
||||||
"
|
|
||||||
echo "✅ Added next-runtime-env"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Update @atproto/ozone in service/package.json to latest
|
|
||||||
echo "📦 Updating @atproto/ozone in service/package.json..."
|
|
||||||
local latest_ozone_ver
|
|
||||||
latest_ozone_ver=$(npm view @atproto/ozone version 2>/dev/null)
|
|
||||||
if [ -n "$latest_ozone_ver" ] && [ -f service/package.json ]; then
|
|
||||||
python3 -c "
|
|
||||||
import json, sys
|
|
||||||
ver = sys.argv[1]
|
|
||||||
with open('service/package.json') as f:
|
|
||||||
d = json.load(f)
|
|
||||||
old = d.get('dependencies', {}).get('@atproto/ozone', '')
|
|
||||||
d.setdefault('dependencies', {})['@atproto/ozone'] = ver
|
|
||||||
with open('service/package.json', 'w') as f:
|
|
||||||
json.dump(d, f, indent=2)
|
|
||||||
f.write('\n')
|
|
||||||
print(f'✅ @atproto/ozone: {old} -> {ver}')
|
|
||||||
" "$latest_ozone_ver"
|
|
||||||
fi
|
|
||||||
|
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-feed-generator-newfiles() {
|
|
||||||
echo ""
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
echo "📝 Creating feed-generator new files..."
|
|
||||||
|
|
||||||
# Create app.ts
|
|
||||||
cat > $d/repos/feed-generator/src/algos/app.ts <<'EOF'
|
|
||||||
import { QueryParams } from '../lexicon/types/app/bsky/feed/getFeedSkeleton'
|
|
||||||
import { AppContext } from '../config'
|
|
||||||
|
|
||||||
// max 15 chars
|
|
||||||
export const shortname = 'app'
|
|
||||||
|
|
||||||
export const handler = async (ctx: AppContext, params: QueryParams) => {
|
|
||||||
let builder = ctx.db
|
|
||||||
.selectFrom('post')
|
|
||||||
.selectAll()
|
|
||||||
.orderBy('indexedAt', 'desc')
|
|
||||||
.orderBy('cid', 'desc')
|
|
||||||
.limit(params.limit)
|
|
||||||
|
|
||||||
if (params.cursor) {
|
|
||||||
const timeStr = new Date(parseInt(params.cursor, 10)).toISOString()
|
|
||||||
builder = builder.where('post.indexedAt', '<', timeStr)
|
|
||||||
}
|
|
||||||
const res = await builder.execute()
|
|
||||||
|
|
||||||
const feed = res.map((row) => ({
|
|
||||||
post: row.uri,
|
|
||||||
}))
|
|
||||||
|
|
||||||
let cursor: string | undefined
|
|
||||||
const last = res.at(-1)
|
|
||||||
if (last) {
|
|
||||||
cursor = new Date(last.indexedAt).getTime().toString(10)
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
cursor,
|
|
||||||
feed,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
echo "✅ Created src/algos/app.ts"
|
|
||||||
|
|
||||||
# Restore Dockerfile (removed during patch apply to avoid conflicts)
|
|
||||||
if [ ! -f $d/repos/feed-generator/Dockerfile ] && [ -f $d/docker/feed/Dockerfile ];then
|
|
||||||
cp -rf $d/docker/feed/Dockerfile $d/repos/feed-generator/
|
|
||||||
echo "✅ Restored Dockerfile"
|
|
||||||
fi
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
}
|
|
||||||
|
|
||||||
function at-repos-docker-verify() {
|
|
||||||
local service=$1
|
|
||||||
local image="at-${service}:latest"
|
|
||||||
local check_file=""
|
|
||||||
case $service in
|
|
||||||
pds) check_file="/app/services/pds/index.js" ;;
|
|
||||||
bsky) check_file="/app/services/bsky/api.js" ;;
|
|
||||||
ozone) check_file="/app/services/ozone/api.js" ;;
|
|
||||||
bgs) check_file="/relay" ;;
|
|
||||||
plc) check_file="/app/packages/server/dist/index.js" ;;
|
|
||||||
*) return 0 ;;
|
|
||||||
esac
|
|
||||||
local cid
|
|
||||||
cid=$(docker create --entrypoint "" "$image" true 2>&1)
|
|
||||||
if [ $? -ne 0 ]; then
|
|
||||||
echo " ❌ FAILED: cannot create container from $image"
|
|
||||||
echo " $cid"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
if docker cp "$cid:$check_file" /tmp/.docker-verify-tmp 2>/dev/null; then
|
|
||||||
rm -f /tmp/.docker-verify-tmp
|
|
||||||
docker rm "$cid" > /dev/null 2>&1
|
|
||||||
echo " ✅ Verified: $check_file exists"
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
rm -f /tmp/.docker-verify-tmp
|
|
||||||
docker rm "$cid" > /dev/null 2>&1
|
|
||||||
echo " ❌ FAILED: $check_file not found in $image"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function at-repos-build-docker-atproto() {
|
function at-repos-build-docker-atproto() {
|
||||||
cd $d
|
cd $d
|
||||||
local failed=()
|
docker image prune -a
|
||||||
if [ -z "$1" ];then
|
if [ -z "$1" ];then
|
||||||
for ((i=1; i<=${#services}; i++)); do
|
for ((i=1; i<=${#services}; i++)); do
|
||||||
service=${services[$i]}
|
service=${services[$i]}
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
docker compose build --no-cache $service
|
||||||
echo "🔨 Building: $service"
|
|
||||||
if ! docker compose build --no-cache $service; then
|
|
||||||
echo " ❌ Build failed: $service"
|
|
||||||
failed+=($service)
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
if ! at-repos-docker-verify $service; then
|
|
||||||
failed+=($service)
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
if [ "$service" = "ozone" ]; then
|
|
||||||
docker compose build --no-cache ${service}-web
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
echo "🔨 Building: $1"
|
docker compose build --no-cache $1
|
||||||
if ! docker compose build --no-cache $1; then
|
|
||||||
echo "❌ Build failed: $1"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
if ! at-repos-docker-verify $1; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if [ ${#failed[@]} -gt 0 ]; then
|
|
||||||
echo ""
|
|
||||||
echo "❌ Failed builds: ${failed[*]}"
|
|
||||||
echo "⚠️ Do NOT push these images."
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
echo ""
|
|
||||||
echo "✅ All builds verified successfully."
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-push-reset() {
|
function at-repos-push-reset() {
|
||||||
@@ -514,41 +354,26 @@ function at-repos-push-reset() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-push-docker() {
|
function at-repos-push-docker() {
|
||||||
local dtag=$(date +%Y%m%d)
|
if [ -z "$1" ];then
|
||||||
if [ -z "$1" ] || [ "$1" = "push" ]; then
|
for ((i=1; i<=${#services}; i++)); do
|
||||||
for service in "${services[@]}"; do
|
service=${services[$i]}
|
||||||
if ! at-repos-docker-verify $service; then
|
|
||||||
echo "⚠️ Skipping push: $service (verification failed)"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
docker tag at-${service}:latest localhost:${dport}/${service}:latest
|
docker tag at-${service}:latest localhost:${dport}/${service}:latest
|
||||||
docker tag at-${service}:latest localhost:${dport}/${service}:${dtag}
|
|
||||||
docker push localhost:${dport}/${service}:latest
|
docker push localhost:${dport}/${service}:latest
|
||||||
docker push localhost:${dport}/${service}:${dtag}
|
if [ "$service" == "ozone" ];then
|
||||||
if [ "$service" = "ozone" ]; then
|
|
||||||
docker tag at-${service}-web:latest localhost:${dport}/${service}-web:latest
|
docker tag at-${service}-web:latest localhost:${dport}/${service}-web:latest
|
||||||
docker tag at-${service}-web:latest localhost:${dport}/${service}-web:${dtag}
|
|
||||||
docker push localhost:${dport}/${service}-web:latest
|
docker push localhost:${dport}/${service}-web:latest
|
||||||
docker push localhost:${dport}/${service}-web:${dtag}
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
if ! at-repos-docker-verify $1; then
|
|
||||||
echo "❌ Push aborted: $1 (verification failed)"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
docker tag at-${1}:latest localhost:${dport}/${1}:latest
|
docker tag at-${1}:latest localhost:${dport}/${1}:latest
|
||||||
docker tag at-${1}:latest localhost:${dport}/${1}:${dtag}
|
|
||||||
docker push localhost:${dport}/${1}:latest
|
docker push localhost:${dport}/${1}:latest
|
||||||
docker push localhost:${dport}/${1}:${dtag}
|
|
||||||
fi
|
fi
|
||||||
echo "📦 Pushed with tags: latest, ${dtag}"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-pull-docker() {
|
function at-repos-pull-docker() {
|
||||||
cd $d
|
cd $d
|
||||||
|
docker image prune -a
|
||||||
docker compose up -d --pull always
|
docker compose up -d --pull always
|
||||||
echo "💡 Run 'docker image prune' manually to clean up old images."
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-reset-bgs-db() {
|
function at-repos-reset-bgs-db() {
|
||||||
@@ -579,55 +404,28 @@ function at-repos-reset-bgs-db() {
|
|||||||
echo "⚙️ Updating Slurp Config..."
|
echo "⚙️ Updating Slurp Config..."
|
||||||
docker exec -i $dp psql -U postgres -d bgs -c "UPDATE slurp_configs SET new_subs_disabled = false, new_pds_per_day_limit = 1000 WHERE id = 1;"
|
docker exec -i $dp psql -U postgres -d bgs -c "UPDATE slurp_configs SET new_subs_disabled = false, new_pds_per_day_limit = 1000 WHERE id = 1;"
|
||||||
|
|
||||||
# host=pds:3000
|
echo "🔗 Registering Trusted Domain & Resetting Repos..."
|
||||||
echo "🔗 Registering Trusted Domain..."
|
|
||||||
# Retry loop for addTrustedDomain as BGS might still be warming up
|
# Retry loop for addTrustedDomain as BGS might still be warming up
|
||||||
for i in {1..5}; do
|
for i in {1..5}; do
|
||||||
if curl -f -X POST "https://bgs.${host}/admin/pds/addTrustedDomain?domain=${host}" -H "Authorization: Bearer ${BGS_ADMIN_KEY}"; then
|
if curl -f -X POST "https://bgs.${host}/admin/pds/addTrustedDomain?domain=${host}" -H "Authorization: Bearer ${BGS_ADMIN_KEY}"; then
|
||||||
echo ""
|
|
||||||
echo "✅ Trusted domain registered"
|
echo "✅ Trusted domain registered"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
echo "Failed to contact BGS (attempt $i/5)... waiting 5s"
|
echo "Bot failed to contact BGS (attempt $i/5)... waiting 5s"
|
||||||
sleep 5
|
sleep 5
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "🔗 Requesting PDS Crawl..."
|
|
||||||
# Request BGS to crawl the PDS - this registers the PDS and starts subscription
|
|
||||||
for i in {1..5}; do
|
|
||||||
result=$(curl -s -X POST "https://bgs.${host}/admin/pds/requestCrawl" \
|
|
||||||
-H "Authorization: Bearer ${BGS_ADMIN_KEY}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "{\"hostname\":\"${host}\"}" \
|
|
||||||
-w "%{http_code}" -o /dev/null)
|
|
||||||
if [ "$result" = "200" ]; then
|
|
||||||
echo "✅ PDS crawl requested successfully"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo "Failed to request crawl (attempt $i/5, status: $result)... waiting 5s"
|
|
||||||
sleep 5
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "⏳ Waiting 5s for BGS to connect to PDS..."
|
|
||||||
sleep 5
|
|
||||||
|
|
||||||
echo "🔄 Triggering repo sync for existing users..."
|
|
||||||
for ((i=1; i<=${#handles}; i++)); do
|
for ((i=1; i<=${#handles}; i++)); do
|
||||||
handle=${handles[$i]}
|
handle=${handles[$i]}
|
||||||
did=$(curl -sL "https://${host}/xrpc/com.atproto.repo.describeRepo?repo=${handle}" | jq -r .did)
|
did=`curl -sL "https://${host}/xrpc/com.atproto.repo.describeRepo?repo=${handle}" |jq -r .did`
|
||||||
if [ -n "$did" ] && [ "$did" != "null" ]; then
|
if [ ! -z "$did" ] && [ "$did" != "null" ]; then
|
||||||
echo " Syncing repo: $handle ($did)"
|
echo "Resetting repo: $handle ($did)"
|
||||||
# Use takedown=false to trigger a resync without actually taking down
|
curl -X POST "https://bgs.${host}/admin/repo/reset?did=${did}" \
|
||||||
curl -s -X POST "https://bgs.${host}/admin/repo/takedown?did=${did}&takedown=false" \
|
-H "Authorization: Bearer ${BGS_ADMIN_KEY}"
|
||||||
-H "Authorization: Bearer ${BGS_ADMIN_KEY}" || true
|
|
||||||
else
|
else
|
||||||
echo " Skipping $handle (DID not found)"
|
echo "Skipping reset for $handle (DID not found)"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "✅ BGS reset complete!"
|
|
||||||
echo " PDS should now be subscribed and syncing repos."
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-feed-generator-start-push() {
|
function at-repos-feed-generator-start-push() {
|
||||||
@@ -690,177 +488,6 @@ curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $
|
|||||||
https://${host}/xrpc/com.atproto.repo.putRecord
|
https://${host}/xrpc/com.atproto.repo.putRecord
|
||||||
}
|
}
|
||||||
|
|
||||||
# ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
|
|
||||||
# Patch creation helpers
|
|
||||||
# ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
|
|
||||||
|
|
||||||
# Find existing patches that modify the same file
|
|
||||||
# Usage: at-patch-find-conflicts <filepath> <patch-dir>
|
|
||||||
function at-patch-find-conflicts() {
|
|
||||||
local filepath="$1"
|
|
||||||
local patch_dir="$2"
|
|
||||||
local conflicts=()
|
|
||||||
|
|
||||||
if [ ! -d "$patch_dir" ]; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
for pf in "$patch_dir"/*.patch(N) "$patch_dir"/*.diff(N); do
|
|
||||||
[ -f "$pf" ] || continue
|
|
||||||
if grep -q "^--- a/$filepath" "$pf" 2>/dev/null || grep -q "^+++ b/$filepath" "$pf" 2>/dev/null; then
|
|
||||||
conflicts+=("$(basename "$pf")")
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ ${#conflicts[@]} -gt 0 ]; then
|
|
||||||
echo "⚠️ This file is also modified by:"
|
|
||||||
for c in "${conflicts[@]}"; do
|
|
||||||
echo " - $c"
|
|
||||||
done
|
|
||||||
echo ""
|
|
||||||
echo " Ensure patches are applied in order before patch-begin."
|
|
||||||
echo " Baseline must reflect the post-earlier-patches state."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Save current file state as baseline for patch creation
|
|
||||||
# Usage: ./install.zsh patch-begin <repo> <file-path> [--ios]
|
|
||||||
# Example: ./install.zsh patch-begin social-app "src/screens/Profile/Header/ProfileHeaderStandard.tsx" --ios
|
|
||||||
function at-patch-begin() {
|
|
||||||
local repo="$1"
|
|
||||||
local filepath="$2"
|
|
||||||
local flag="$3"
|
|
||||||
|
|
||||||
if [ -z "$repo" ] || [ -z "$filepath" ]; then
|
|
||||||
echo "Usage: ./install.zsh patch-begin <repo> <file-path> [--ios]"
|
|
||||||
echo "Example: ./install.zsh patch-begin social-app \"src/screens/Profile/Header/ProfileHeaderStandard.tsx\" --ios"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
local full_path="$d/repos/$repo/$filepath"
|
|
||||||
if [ ! -f "$full_path" ]; then
|
|
||||||
echo "❌ File not found: $full_path"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
local tmp_file="/tmp/patch-base--$(echo "$filepath" | tr '/' '-')"
|
|
||||||
cp "$full_path" "$tmp_file"
|
|
||||||
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
echo "✅ Baseline saved: $tmp_file"
|
|
||||||
echo " File: $full_path"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# Check for conflicting patches
|
|
||||||
if [ "$flag" = "--ios" ]; then
|
|
||||||
at-patch-find-conflicts "$filepath" "$d/ios/patching"
|
|
||||||
else
|
|
||||||
at-patch-find-conflicts "$filepath" "$d/patching"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Next steps:"
|
|
||||||
echo " 1. Edit: $full_path"
|
|
||||||
echo " 2. Save: ./install.zsh patch-save <NNN-name.patch> $repo \"$filepath\" ${flag:---ios}"
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Generate patch from baseline diff
|
|
||||||
# Usage: ./install.zsh patch-save <patch-filename> <repo> <file-path> [--ios]
|
|
||||||
# Example: ./install.zsh patch-save 042-social-app-ios-feature.patch social-app "src/path/to/file.tsx" --ios
|
|
||||||
function at-patch-save() {
|
|
||||||
local patch_filename="$1"
|
|
||||||
local repo="$2"
|
|
||||||
local filepath="$3"
|
|
||||||
local flag="$4"
|
|
||||||
|
|
||||||
if [ -z "$patch_filename" ] || [ -z "$repo" ] || [ -z "$filepath" ]; then
|
|
||||||
echo "Usage: ./install.zsh patch-save <patch-filename> <repo> <file-path> [--ios]"
|
|
||||||
echo "Example: ./install.zsh patch-save 042-social-app-ios-feature.patch social-app \"src/file.tsx\" --ios"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
local full_path="$d/repos/$repo/$filepath"
|
|
||||||
local tmp_file="/tmp/patch-base--$(echo "$filepath" | tr '/' '-')"
|
|
||||||
|
|
||||||
if [ ! -f "$tmp_file" ]; then
|
|
||||||
echo "❌ No baseline found. Run 'patch-begin' first."
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
if [ ! -f "$full_path" ]; then
|
|
||||||
echo "❌ File not found: $full_path"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Determine output directory
|
|
||||||
local patch_dir="$d/patching"
|
|
||||||
if [ "$flag" = "--ios" ]; then
|
|
||||||
patch_dir="$d/ios/patching"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Generate diff with proper a/b paths
|
|
||||||
diff -u "$tmp_file" "$full_path" \
|
|
||||||
| sed "1s|--- .*|--- a/$filepath|" \
|
|
||||||
| sed "2s|+++ .*|+++ b/$filepath|" \
|
|
||||||
> "$patch_dir/$patch_filename"
|
|
||||||
|
|
||||||
local line_count
|
|
||||||
line_count=$(wc -l < "$patch_dir/$patch_filename" | tr -d ' ')
|
|
||||||
if [ "$line_count" -eq 0 ]; then
|
|
||||||
echo "⚠️ No differences found. Patch file is empty."
|
|
||||||
rm "$patch_dir/$patch_filename"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
echo "📝 Patch: $patch_dir/$patch_filename ($line_count lines)"
|
|
||||||
|
|
||||||
# Dry-run verify: restore baseline, test patch, restore edit
|
|
||||||
pushd "$d/repos/$repo" > /dev/null
|
|
||||||
cp "$full_path" /tmp/patch-edited-tmp
|
|
||||||
cp "$tmp_file" "$full_path"
|
|
||||||
|
|
||||||
if patch --dry-run -p1 < "$patch_dir/$patch_filename" > /dev/null 2>&1; then
|
|
||||||
echo "✅ Dry-run: OK"
|
|
||||||
else
|
|
||||||
echo "❌ Dry-run: FAILED"
|
|
||||||
patch --dry-run -p1 < "$patch_dir/$patch_filename" 2>&1 | head -5
|
|
||||||
fi
|
|
||||||
|
|
||||||
cp /tmp/patch-edited-tmp "$full_path"
|
|
||||||
rm -f /tmp/patch-edited-tmp
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
rm -f "$tmp_file"
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Verify all patches can be applied (full dry-run)
|
|
||||||
# Usage: ./install.zsh patch-check [--ios]
|
|
||||||
function at-patch-check() {
|
|
||||||
local flag="$1"
|
|
||||||
|
|
||||||
if [ "$flag" = "--ios" ]; then
|
|
||||||
echo "Checking iOS patches against: $d/repos/social-app"
|
|
||||||
pushd "$d/repos/social-app" > /dev/null
|
|
||||||
for pf in "$d/ios/patching"/*.patch; do
|
|
||||||
[ -f "$pf" ] || continue
|
|
||||||
local name="$(basename "$pf")"
|
|
||||||
if patch --dry-run -p1 < "$pf" > /dev/null 2>&1; then
|
|
||||||
echo " ✅ $name"
|
|
||||||
else
|
|
||||||
echo " ❌ $name"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
popd > /dev/null
|
|
||||||
else
|
|
||||||
echo "Checking server patches..."
|
|
||||||
for pf in "$d/patching"/*.patch "$d/patching"/*.diff; do
|
|
||||||
[ -f "$pf" ] || continue
|
|
||||||
echo " $(basename "$pf")"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
at-repos-env
|
at-repos-env
|
||||||
case "$1" in
|
case "$1" in
|
||||||
pull)
|
pull)
|
||||||
@@ -869,25 +496,12 @@ case "$1" in
|
|||||||
exit
|
exit
|
||||||
;;
|
;;
|
||||||
patch)
|
patch)
|
||||||
at-repos-social-app-ios-patch
|
at-repos-social-app-avatar-write
|
||||||
at-repos-patch-apply-all
|
at-repos-patch-apply-all
|
||||||
at-repos-ozone-patch
|
at-repos-ozone-patch
|
||||||
at-repos-feed-generator-newfiles
|
|
||||||
show-failed-patches
|
show-failed-patches
|
||||||
exit
|
exit
|
||||||
;;
|
;;
|
||||||
patch-begin)
|
|
||||||
at-patch-begin "$2" "$3" "$4"
|
|
||||||
exit
|
|
||||||
;;
|
|
||||||
patch-save)
|
|
||||||
at-patch-save "$2" "$3" "$4" "$5"
|
|
||||||
exit
|
|
||||||
;;
|
|
||||||
patch-check)
|
|
||||||
at-patch-check "$2"
|
|
||||||
exit
|
|
||||||
;;
|
|
||||||
build)
|
build)
|
||||||
at-repos-build-docker-atproto $2
|
at-repos-build-docker-atproto $2
|
||||||
exit
|
exit
|
||||||
@@ -913,7 +527,7 @@ esac
|
|||||||
case "`cat /etc/hostname`" in
|
case "`cat /etc/hostname`" in
|
||||||
at)
|
at)
|
||||||
if [ "$1" = "bgs-reset" ];then
|
if [ "$1" = "bgs-reset" ];then
|
||||||
# at-repos-reset-bgs-db
|
at-repos-reset-bgs-db
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
at-repos-pull-docker
|
at-repos-pull-docker
|
||||||
@@ -922,11 +536,9 @@ case "`cat /etc/hostname`" in
|
|||||||
*)
|
*)
|
||||||
at-repos-clone
|
at-repos-clone
|
||||||
at-repos-pull
|
at-repos-pull
|
||||||
at-repos-checkout-pinned
|
at-repos-social-app-avatar-write
|
||||||
at-repos-social-app-ios-patch
|
|
||||||
at-repos-patch-apply-all
|
at-repos-patch-apply-all
|
||||||
at-repos-ozone-patch
|
at-repos-ozone-patch
|
||||||
at-repos-feed-generator-newfiles
|
|
||||||
show-failed-patches
|
show-failed-patches
|
||||||
at-repos-build-docker-atproto
|
at-repos-build-docker-atproto
|
||||||
at-repos-push-docker
|
at-repos-push-docker
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
APP_NAME="Aiat"
|
|
||||||
REPO_DIR="../repos/social-app"
|
|
||||||
APP_SLUG="aiat"
|
|
||||||
APP_SCHEME="syui"
|
|
||||||
APP_GROUP="group.ai.syui.at"
|
|
||||||
APP_MAIL=user@example.com
|
|
||||||
APP_KEYCHAIN=@keychain:KEYCHAIN_NAME
|
|
||||||
BUNDLE_ID="ai.syui.at"
|
|
||||||
SERVICE_URL="https://syu.is"
|
|
||||||
HELP_URL="https://syu.is/about/support/help"
|
|
||||||
PRIVACY_URL="https://syu.is/about/support/privacy-policy"
|
|
||||||
TERMS_URL="https://syu.is/about/support/tos"
|
|
||||||
REPO_DIR="../repos/social-app"
|
|
||||||
CONFIG_FILE="$REPO_DIR/app.config.js"
|
|
||||||
CONSTANTS_FILE="$REPO_DIR/src/lib/constants.ts"
|
|
||||||
IOS_CERTIFICATE_NAME="Apple Distribution: $TEAM($TEAM_ID)"
|
|
||||||
PDS_HOST=syu.is
|
|
||||||
134
ios/AppInfo.tsx
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import {View, Text, StyleSheet, Pressable, Linking} from 'react-native'
|
||||||
|
|
||||||
|
interface AppInfoProps {
|
||||||
|
onLinkPress?: (url: string) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function AppInfo({onLinkPress}: AppInfoProps) {
|
||||||
|
const handleLinkPress = (url: string) => {
|
||||||
|
if (onLinkPress) {
|
||||||
|
onLinkPress(url)
|
||||||
|
} else {
|
||||||
|
Linking.openURL(url)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={styles.container}>
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>About This App</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
This is a customized AT Protocol social networking client. It allows you to
|
||||||
|
connect to any Personal Data Server (PDS) and participate in the decentralized
|
||||||
|
social network.
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>Key Features</Text>
|
||||||
|
<View style={styles.list}>
|
||||||
|
<Text style={styles.listItem}>• Connect to any AT Protocol PDS</Text>
|
||||||
|
<Text style={styles.listItem}>• Post text, images, and videos</Text>
|
||||||
|
<Text style={styles.listItem}>• Follow users and view timelines</Text>
|
||||||
|
<Text style={styles.listItem}>• Customize feeds and moderation settings</Text>
|
||||||
|
<Text style={styles.listItem}>• Direct messaging support</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>Open Source</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
This application is based on the Bluesky social-app, licensed under the MIT
|
||||||
|
License. The original source code is available at:
|
||||||
|
</Text>
|
||||||
|
<Pressable
|
||||||
|
onPress={() =>
|
||||||
|
handleLinkPress('https://github.com/bluesky-social/social-app')
|
||||||
|
}>
|
||||||
|
<Text style={styles.link}>github.com/bluesky-social/social-app</Text>
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>AT Protocol</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
This app uses the AT Protocol (Authenticated Transfer Protocol), an open and
|
||||||
|
decentralized standard for social applications.
|
||||||
|
</Text>
|
||||||
|
<Pressable onPress={() => handleLinkPress('https://atproto.com')}>
|
||||||
|
<Text style={styles.link}>atproto.com</Text>
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>License</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
Copyright 2023–2025 Bluesky Social PBC
|
||||||
|
</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software.
|
||||||
|
</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND.
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>Contact</Text>
|
||||||
|
<Pressable onPress={() => handleLinkPress('https://syu.is')}>
|
||||||
|
<Text style={styles.link}>https://syu.is</Text>
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.versionText}>Version 1.0.0</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
container: {
|
||||||
|
flex: 1,
|
||||||
|
},
|
||||||
|
section: {
|
||||||
|
marginBottom: 24,
|
||||||
|
},
|
||||||
|
sectionTitle: {
|
||||||
|
fontSize: 20,
|
||||||
|
fontWeight: '600',
|
||||||
|
color: '#1d1d1f',
|
||||||
|
marginBottom: 12,
|
||||||
|
},
|
||||||
|
paragraph: {
|
||||||
|
fontSize: 15,
|
||||||
|
lineHeight: 22,
|
||||||
|
color: '#3a3a3c',
|
||||||
|
marginBottom: 8,
|
||||||
|
},
|
||||||
|
list: {
|
||||||
|
marginLeft: 8,
|
||||||
|
marginTop: 8,
|
||||||
|
},
|
||||||
|
listItem: {
|
||||||
|
fontSize: 15,
|
||||||
|
lineHeight: 24,
|
||||||
|
color: '#3a3a3c',
|
||||||
|
},
|
||||||
|
link: {
|
||||||
|
fontSize: 15,
|
||||||
|
color: '#007aff',
|
||||||
|
textDecorationLine: 'underline',
|
||||||
|
marginTop: 8,
|
||||||
|
},
|
||||||
|
versionText: {
|
||||||
|
fontSize: 13,
|
||||||
|
color: '#8e8e93',
|
||||||
|
fontStyle: 'italic',
|
||||||
|
},
|
||||||
|
})
|
||||||
95
ios/LicenseNotice.tsx
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import {View, Text, StyleSheet, Pressable, Linking} from 'react-native'
|
||||||
|
|
||||||
|
export default function LicenseNotice() {
|
||||||
|
return (
|
||||||
|
<View style={styles.container}>
|
||||||
|
<Text style={styles.title}>Open Source Licenses</Text>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.projectName}>Bluesky Social App</Text>
|
||||||
|
<Text style={styles.license}>MIT License</Text>
|
||||||
|
<Text style={styles.copyright}>Copyright 2023–2025 Bluesky Social PBC</Text>
|
||||||
|
|
||||||
|
<Text style={styles.licenseText}>
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
<Text style={styles.licenseText}>
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
<Text style={styles.licenseText}>
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
<Pressable
|
||||||
|
onPress={() =>
|
||||||
|
Linking.openURL('https://github.com/bluesky-social/social-app')
|
||||||
|
}>
|
||||||
|
<Text style={styles.link}>View Source Code</Text>
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
container: {
|
||||||
|
flex: 1,
|
||||||
|
padding: 16,
|
||||||
|
},
|
||||||
|
title: {
|
||||||
|
fontSize: 24,
|
||||||
|
fontWeight: 'bold',
|
||||||
|
marginBottom: 20,
|
||||||
|
color: '#1d1d1f',
|
||||||
|
},
|
||||||
|
section: {
|
||||||
|
marginBottom: 24,
|
||||||
|
padding: 16,
|
||||||
|
backgroundColor: '#f5f5f7',
|
||||||
|
borderRadius: 8,
|
||||||
|
},
|
||||||
|
projectName: {
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: '600',
|
||||||
|
marginBottom: 8,
|
||||||
|
color: '#1d1d1f',
|
||||||
|
},
|
||||||
|
license: {
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight: '500',
|
||||||
|
color: '#007aff',
|
||||||
|
marginBottom: 4,
|
||||||
|
},
|
||||||
|
copyright: {
|
||||||
|
fontSize: 13,
|
||||||
|
color: '#3a3a3c',
|
||||||
|
marginBottom: 12,
|
||||||
|
},
|
||||||
|
licenseText: {
|
||||||
|
fontSize: 12,
|
||||||
|
lineHeight: 18,
|
||||||
|
color: '#3a3a3c',
|
||||||
|
marginBottom: 12,
|
||||||
|
},
|
||||||
|
link: {
|
||||||
|
fontSize: 14,
|
||||||
|
color: '#007aff',
|
||||||
|
textDecorationLine: 'underline',
|
||||||
|
marginTop: 8,
|
||||||
|
},
|
||||||
|
})
|
||||||
163
ios/PrivacyContent.tsx
Normal file
@@ -0,0 +1,163 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import {View, Text, StyleSheet, Pressable, Linking} from 'react-native'
|
||||||
|
|
||||||
|
interface PrivacyContentProps {
|
||||||
|
onLinkPress?: (url: string) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function PrivacyContent({onLinkPress}: PrivacyContentProps) {
|
||||||
|
const handleLinkPress = (url: string) => {
|
||||||
|
if (onLinkPress) {
|
||||||
|
onLinkPress(url)
|
||||||
|
} else {
|
||||||
|
Linking.openURL(url)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={styles.container}>
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>Introduction</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
This Privacy Policy explains how this AT Protocol client application
|
||||||
|
(hereinafter referred to as "the App") handles personal information.
|
||||||
|
Please read this policy carefully before using the App.
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>Information We Collect</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
The App may collect and use the following information:
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
<Text style={styles.subTitle}>1. Information Collected Automatically</Text>
|
||||||
|
<View style={styles.list}>
|
||||||
|
<Text style={styles.listItem}>• Device information (model, OS version)</Text>
|
||||||
|
<Text style={styles.listItem}>• App usage data (sessions, features used)</Text>
|
||||||
|
<Text style={styles.listItem}>• Crash logs and performance data</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<Text style={styles.subTitle}>2. Information Provided by Users</Text>
|
||||||
|
<View style={styles.list}>
|
||||||
|
<Text style={styles.listItem}>
|
||||||
|
• DID (Decentralized Identifier) and handle for authentication
|
||||||
|
</Text>
|
||||||
|
<Text style={styles.listItem}>• Posts, media, and social interactions</Text>
|
||||||
|
<Text style={styles.listItem}>• Profile information (avatar, display name, bio)</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.highlight}>
|
||||||
|
<Text style={styles.highlightText}>
|
||||||
|
Important: Your data is stored on your chosen PDS (Personal Data Server).
|
||||||
|
This app does not store your content on our servers.
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>How We Use Your Information</Text>
|
||||||
|
<View style={styles.list}>
|
||||||
|
<Text style={styles.listItem}>
|
||||||
|
• To provide AT Protocol social networking features
|
||||||
|
</Text>
|
||||||
|
<Text style={styles.listItem}>• To improve app performance and user experience</Text>
|
||||||
|
<Text style={styles.listItem}>• To diagnose and fix technical issues</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>Data Sharing</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
The App interacts with your chosen PDS and AppView services. Your posts and
|
||||||
|
profile information are shared according to the AT Protocol specification and
|
||||||
|
your privacy settings.
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>Your Rights</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
You have the right to access, modify, or delete your data through your PDS.
|
||||||
|
You can also switch to a different PDS at any time while maintaining your
|
||||||
|
identity.
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.sectionTitle}>Contact</Text>
|
||||||
|
<Text style={styles.paragraph}>
|
||||||
|
For questions about this Privacy Policy, please contact:
|
||||||
|
</Text>
|
||||||
|
<Pressable onPress={() => handleLinkPress('https://syu.is')}>
|
||||||
|
<Text style={styles.link}>https://syu.is</Text>
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={styles.lastUpdated}>Last Updated: December 3, 2025</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
container: {
|
||||||
|
flex: 1,
|
||||||
|
},
|
||||||
|
section: {
|
||||||
|
marginBottom: 24,
|
||||||
|
},
|
||||||
|
sectionTitle: {
|
||||||
|
fontSize: 20,
|
||||||
|
fontWeight: '600',
|
||||||
|
color: '#1d1d1f',
|
||||||
|
marginBottom: 12,
|
||||||
|
},
|
||||||
|
subTitle: {
|
||||||
|
fontSize: 16,
|
||||||
|
fontWeight: '500',
|
||||||
|
color: '#1d1d1f',
|
||||||
|
marginTop: 12,
|
||||||
|
marginBottom: 8,
|
||||||
|
},
|
||||||
|
paragraph: {
|
||||||
|
fontSize: 15,
|
||||||
|
lineHeight: 22,
|
||||||
|
color: '#3a3a3c',
|
||||||
|
marginBottom: 8,
|
||||||
|
},
|
||||||
|
list: {
|
||||||
|
marginLeft: 8,
|
||||||
|
marginTop: 8,
|
||||||
|
},
|
||||||
|
listItem: {
|
||||||
|
fontSize: 15,
|
||||||
|
lineHeight: 24,
|
||||||
|
color: '#3a3a3c',
|
||||||
|
},
|
||||||
|
highlight: {
|
||||||
|
backgroundColor: '#fff3cd',
|
||||||
|
borderLeftWidth: 4,
|
||||||
|
borderLeftColor: '#ffc107',
|
||||||
|
padding: 12,
|
||||||
|
marginTop: 12,
|
||||||
|
borderRadius: 4,
|
||||||
|
},
|
||||||
|
highlightText: {
|
||||||
|
fontSize: 14,
|
||||||
|
lineHeight: 20,
|
||||||
|
color: '#856404',
|
||||||
|
},
|
||||||
|
link: {
|
||||||
|
fontSize: 15,
|
||||||
|
color: '#007aff',
|
||||||
|
textDecorationLine: 'underline',
|
||||||
|
marginTop: 8,
|
||||||
|
},
|
||||||
|
lastUpdated: {
|
||||||
|
fontSize: 13,
|
||||||
|
color: '#8e8e93',
|
||||||
|
fontStyle: 'italic',
|
||||||
|
},
|
||||||
|
})
|
||||||
42
ios/PrivacyPolicy.screen.tsx
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import {View} from 'react-native'
|
||||||
|
import {msg} from '@lingui/macro'
|
||||||
|
import {useLingui} from '@lingui/react'
|
||||||
|
import {useFocusEffect} from '@react-navigation/native'
|
||||||
|
|
||||||
|
import {usePalette} from '#/lib/hooks/usePalette'
|
||||||
|
import {
|
||||||
|
type CommonNavigatorParams,
|
||||||
|
type NativeStackScreenProps,
|
||||||
|
} from '#/lib/routes/types'
|
||||||
|
import {s} from '#/lib/styles'
|
||||||
|
import {useSetMinimalShellMode} from '#/state/shell'
|
||||||
|
import {ScrollView} from '#/view/com/util/Views'
|
||||||
|
import * as Layout from '#/components/Layout'
|
||||||
|
import {ViewHeader} from '../com/util/ViewHeader'
|
||||||
|
import PrivacyContent from '#/components/custom/PrivacyContent'
|
||||||
|
|
||||||
|
type Props = NativeStackScreenProps<CommonNavigatorParams, 'PrivacyPolicy'>
|
||||||
|
export const PrivacyPolicyScreen = (_props: Props) => {
|
||||||
|
const pal = usePalette('default')
|
||||||
|
const {_} = useLingui()
|
||||||
|
const setMinimalShellMode = useSetMinimalShellMode()
|
||||||
|
|
||||||
|
useFocusEffect(
|
||||||
|
React.useCallback(() => {
|
||||||
|
setMinimalShellMode(false)
|
||||||
|
}, [setMinimalShellMode]),
|
||||||
|
)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Layout.Screen>
|
||||||
|
<ViewHeader title={_(msg`Privacy Policy`)} />
|
||||||
|
<ScrollView style={[s.hContentRegion, pal.view]}>
|
||||||
|
<View style={[s.p20]}>
|
||||||
|
<PrivacyContent />
|
||||||
|
</View>
|
||||||
|
<View style={s.footerSpacer} />
|
||||||
|
</ScrollView>
|
||||||
|
</Layout.Screen>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,7 +1,16 @@
|
|||||||
This document summarizes the key points for the ./ios (social-app) development.
|
今回の./ios (social-app)開発の要点をまとめます。
|
||||||
|
|
||||||
1. Comply with the MIT license and ensure it can be published as an iOS app without issues
|
|
||||||
2. Do not use the "Bluesky" name. Change icons and links accordingly
|
|
||||||
3. Must work with self-hosted instances
|
|
||||||
|
|
||||||
|
1. MITのライセンスを遵守すること、iosアプリとして出品しても問題ないようにすること
|
||||||
https://raw.githubusercontent.com/bluesky-social/social-app/refs/heads/main/LICENSE
|
https://raw.githubusercontent.com/bluesky-social/social-app/refs/heads/main/LICENSE
|
||||||
|
|
||||||
|
2. "Bluesky"という名称を使用しないこと。アイコンの変更。リンクの変更
|
||||||
|
|
||||||
|
3. selfhostでも動くこと。本来のsocial-appは動きませんので、これは不便なのでiosアプリに出品することにしました。なお、これはすでにpatchで実現しています。
|
||||||
|
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ ./install.zsh pull
|
||||||
|
$ ./install.zsh patch
|
||||||
|
$ ./ios/setup.zsh
|
||||||
|
$ ./ios/preview.zsh
|
||||||
|
```
|
||||||
|
|||||||
38
ios/Support.screen.tsx
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import {msg} from '@lingui/macro'
|
||||||
|
import {useLingui} from '@lingui/react'
|
||||||
|
import {useFocusEffect} from '@react-navigation/native'
|
||||||
|
|
||||||
|
import {usePalette} from '#/lib/hooks/usePalette'
|
||||||
|
import {
|
||||||
|
type CommonNavigatorParams,
|
||||||
|
type NativeStackScreenProps,
|
||||||
|
} from '#/lib/routes/types'
|
||||||
|
import {s} from '#/lib/styles'
|
||||||
|
import {useSetMinimalShellMode} from '#/state/shell'
|
||||||
|
import {ViewHeader} from '#/view/com/util/ViewHeader'
|
||||||
|
import {ScrollView} from '#/view/com/util/Views'
|
||||||
|
import * as Layout from '#/components/Layout'
|
||||||
|
import AppInfo from '#/components/custom/AppInfo'
|
||||||
|
|
||||||
|
type Props = NativeStackScreenProps<CommonNavigatorParams, 'Support'>
|
||||||
|
export const SupportScreen = (_props: Props) => {
|
||||||
|
const pal = usePalette('default')
|
||||||
|
const setMinimalShellMode = useSetMinimalShellMode()
|
||||||
|
const {_} = useLingui()
|
||||||
|
|
||||||
|
useFocusEffect(
|
||||||
|
React.useCallback(() => {
|
||||||
|
setMinimalShellMode(false)
|
||||||
|
}, [setMinimalShellMode]),
|
||||||
|
)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Layout.Screen>
|
||||||
|
<ViewHeader title={_(msg`App Info`)} />
|
||||||
|
<ScrollView style={[s.hContentRegion, pal.view]}>
|
||||||
|
<AppInfo />
|
||||||
|
</ScrollView>
|
||||||
|
</Layout.Screen>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/android_icon_core_flat_black.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/android_icon_core_flat_blue.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/android_icon_core_flat_white.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/android_icon_core_midnight.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/android_icon_core_sunrise.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/android_icon_core_sunset.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/android_icon_default_next.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/android_icon_legacy_dark.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/android_icon_legacy_light.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_core_aurora.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_core_bonfire.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_core_classic.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_core_flat_black.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_core_flat_blue.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_core_flat_white.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_core_midnight.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_core_sunrise.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_core_sunset.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_default.icon/Assets/iOS transparent.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_default.icon/icon.png
Normal file
|
After Width: | Height: | Size: 45 KiB |
BIN
ios/app-icons/ios_icon_default_next.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_legacy_dark.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
ios/app-icons/ios_icon_legacy_light.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
8
ios/app.config.patch.js
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Aiat app configuration overrides
|
||||||
|
module.exports = {
|
||||||
|
name: 'Aiat',
|
||||||
|
slug: 'aiat',
|
||||||
|
scheme: 'aiat',
|
||||||
|
owner: 'syui',
|
||||||
|
bundleIdentifier: 'ai.syui.at'
|
||||||
|
}
|
||||||
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 821 B |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 821 B |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 536 B |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 6.7 KiB |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M237.9 461.4C237.9 463.4 235.6 465 232.7 465C229.4 465.3 227.1 463.7 227.1 461.4C227.1 459.4 229.4 457.8 232.3 457.8C235.3 457.5 237.9 459.1 237.9 461.4zM206.8 456.9C206.1 458.9 208.1 461.2 211.1 461.8C213.7 462.8 216.7 461.8 217.3 459.8C217.9 457.8 216 455.5 213 454.6C210.4 453.9 207.5 454.9 206.8 456.9zM251 455.2C248.1 455.9 246.1 457.8 246.4 460.1C246.7 462.1 249.3 463.4 252.3 462.7C255.2 462 257.2 460.1 256.9 458.1C256.6 456.2 253.9 454.9 251 455.2zM316.8 72C178.1 72 72 177.3 72 316C72 426.9 141.8 521.8 241.5 555.2C254.3 557.5 258.8 549.6 258.8 543.1C258.8 536.9 258.5 502.7 258.5 481.7C258.5 481.7 188.5 496.7 173.8 451.9C173.8 451.9 162.4 422.8 146 415.3C146 415.3 123.1 399.6 147.6 399.9C147.6 399.9 172.5 401.9 186.2 425.7C208.1 464.3 244.8 453.2 259.1 446.6C261.4 430.6 267.9 419.5 275.1 412.9C219.2 406.7 162.8 398.6 162.8 302.4C162.8 274.9 170.4 261.1 186.4 243.5C183.8 237 175.3 210.2 189 175.6C209.9 169.1 258 202.6 258 202.6C278 197 299.5 194.1 320.8 194.1C342.1 194.1 363.6 197 383.6 202.6C383.6 202.6 431.7 169 452.6 175.6C466.3 210.3 457.8 237 455.2 243.5C471.2 261.2 481 275 481 302.4C481 398.9 422.1 406.6 366.2 412.9C375.4 420.8 383.2 435.8 383.2 459.3C383.2 493 382.9 534.7 382.9 542.9C382.9 549.4 387.5 557.3 400.2 555C500.2 521.8 568 426.9 568 316C568 177.3 455.5 72 316.8 72zM169.2 416.9C167.9 417.9 168.2 420.2 169.9 422.1C171.5 423.7 173.8 424.4 175.1 423.1C176.4 422.1 176.1 419.8 174.4 417.9C172.8 416.3 170.5 415.6 169.2 416.9zM158.4 408.8C157.7 410.1 158.7 411.7 160.7 412.7C162.3 413.7 164.3 413.4 165 412C165.7 410.7 164.7 409.1 162.7 408.1C160.7 407.5 159.1 407.8 158.4 408.8zM190.8 444.4C189.2 445.7 189.8 448.7 192.1 450.6C194.4 452.9 197.3 453.2 198.6 451.6C199.9 450.3 199.3 447.3 197.3 445.4C195.1 443.1 192.1 442.8 190.8 444.4zM179.4 429.7C177.8 430.7 177.8 433.3 179.4 435.6C181 437.9 183.7 438.9 185 437.9C186.6 436.6 186.6 434 185 431.7C183.6 429.4 181 428.4 179.4 429.7z"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 2.1 KiB |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M453.2 112L523.8 112L369.6 288.2L551 528L409 528L297.7 382.6L170.5 528L99.8 528L264.7 339.5L90.8 112L236.4 112L336.9 244.9L453.2 112zM428.4 485.8L467.5 485.8L215.1 152L173.1 152L428.4 485.8z"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 421 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M581.7 188.1C575.5 164.4 556.9 145.8 533.4 139.5C490.9 128 320.1 128 320.1 128C320.1 128 149.3 128 106.7 139.5C83.2 145.8 64.7 164.4 58.4 188.1C47 231 47 320.4 47 320.4C47 320.4 47 409.8 58.4 452.7C64.7 476.3 83.2 494.2 106.7 500.5C149.3 512 320.1 512 320.1 512C320.1 512 490.9 512 533.5 500.5C557 494.2 575.5 476.3 581.8 452.7C593.2 409.8 593.2 320.4 593.2 320.4C593.2 320.4 593.2 231 581.8 188.1zM264.2 401.6L264.2 239.2L406.9 320.4L264.2 401.6z"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 678 B |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.7 MiB |
212
ios/build.zsh
@@ -1,212 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
SCRIPT_DIR=${0:a:h}
|
|
||||||
cd "$SCRIPT_DIR"
|
|
||||||
source .env
|
|
||||||
|
|
||||||
function sediment() {
|
|
||||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
|
||||||
sed -i '' "$@"
|
|
||||||
else
|
|
||||||
sed -i "$@"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# 絶対パスに変換
|
|
||||||
REPO_DIR="$SCRIPT_DIR/../repos/social-app"
|
|
||||||
APP_NAME="Aiat"
|
|
||||||
WORKSPACE="$REPO_DIR/ios/${APP_NAME}.xcworkspace"
|
|
||||||
SCHEME="$APP_NAME"
|
|
||||||
BUILD_DIR="$REPO_DIR/build"
|
|
||||||
MOBILEPROVISION="$REPO_DIR/embedded.mobileprovision"
|
|
||||||
ASSETS_DIR="$SCRIPT_DIR/assets"
|
|
||||||
|
|
||||||
echo "Running iOS preview workflow..."
|
|
||||||
cd "$REPO_DIR"
|
|
||||||
|
|
||||||
# 0. Environment Setup (Fix Node Version)
|
|
||||||
export NVM_DIR="$HOME/.nvm"
|
|
||||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
|
||||||
echo "Checking Node version..."
|
|
||||||
if command -v nvm >/dev/null; then
|
|
||||||
nvm use 22 || nvm use 20 || echo "Warning: Could not switch to Node 22/20. Current: $(node -v)"
|
|
||||||
else
|
|
||||||
echo "nvm not found, using system node: $(node -v)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 1. Install dependencies
|
|
||||||
echo "1. Installing dependencies (yarn)..."
|
|
||||||
yarn install
|
|
||||||
|
|
||||||
# 1.5. Copy assets
|
|
||||||
echo "1.5. Copying assets..."
|
|
||||||
if [ -d "$ASSETS_DIR" ]; then
|
|
||||||
cp -rf "$ASSETS_DIR/"* "$REPO_DIR/assets/"
|
|
||||||
echo "✅ Copied all assets (including logo.png, logo-1024.png)"
|
|
||||||
else
|
|
||||||
echo "⚠️ Warning: $ASSETS_DIR not found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
function cleanup_build {
|
|
||||||
# 1.8. Update package.json version (prevent App Store version conflict)
|
|
||||||
echo "1.8. Updating package.json version..."
|
|
||||||
if [ -n "$APP_VERSION" ]; then
|
|
||||||
# Use node to update version in package.json (already in REPO_DIR)
|
|
||||||
node -e "
|
|
||||||
const fs = require('fs');
|
|
||||||
const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
|
|
||||||
pkg.version = '$APP_VERSION';
|
|
||||||
fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2) + '\n');
|
|
||||||
"
|
|
||||||
echo " ✅ Set version to $APP_VERSION"
|
|
||||||
else
|
|
||||||
echo " ⚠️ APP_VERSION not set in .env"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 1.9. Update buildNumber (CFBundleVersion) with current timestamp
|
|
||||||
echo "1.9. Updating buildNumber..."
|
|
||||||
local build_number=$(date +%y%m%d%H%M%S)
|
|
||||||
sediment "s/buildNumber: '[0-9]*'/buildNumber: '${build_number}'/" "./app.config.js"
|
|
||||||
echo " ✅ Set buildNumber to $build_number"
|
|
||||||
|
|
||||||
# 2. Prebuild (Generate ios directory)
|
|
||||||
echo "2. Running Expo Prebuild..."
|
|
||||||
# Clean old ios folder to remove old entitlements/AppClip targets
|
|
||||||
rm -rf ios
|
|
||||||
npx expo prebuild --platform ios --clean
|
|
||||||
|
|
||||||
# 3. CocoaPods
|
|
||||||
echo "3. Installing CocoaPods..."
|
|
||||||
if [ -z "$1" ];then
|
|
||||||
cd ios
|
|
||||||
pod install
|
|
||||||
cd ..
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 4. Signing (Automated)
|
|
||||||
echo "4. Configuring Xcode Signing..."
|
|
||||||
XCODE_PROJ="ios/${APP_NAME}.xcodeproj"
|
|
||||||
if [ ! -d "$XCODE_PROJ" ]; then
|
|
||||||
XCODE_PROJ=$(find ios -name "*.xcodeproj" | head -n 1)
|
|
||||||
fi
|
|
||||||
PBXPROJ="$XCODE_PROJ/project.pbxproj"
|
|
||||||
|
|
||||||
# Set DEVELOPMENT_TEAM in pbxproj
|
|
||||||
if [ -n "$DEVELOPMENT_TEAM" ]; then
|
|
||||||
echo " Setting DEVELOPMENT_TEAM=$DEVELOPMENT_TEAM"
|
|
||||||
sediment "s/PRODUCT_BUNDLE_IDENTIFIER = /DEVELOPMENT_TEAM = $DEVELOPMENT_TEAM; PRODUCT_BUNDLE_IDENTIFIER = /g" "$PBXPROJ"
|
|
||||||
sediment "s/DEVELOPMENT_TEAM = \"\";/DEVELOPMENT_TEAM = $DEVELOPMENT_TEAM;/g" "$PBXPROJ"
|
|
||||||
sediment "s/DEVELOPMENT_TEAM = ;/DEVELOPMENT_TEAM = $DEVELOPMENT_TEAM;/g" "$PBXPROJ"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create/Update entitlements file with App Group
|
|
||||||
ENTITLEMENTS_FILE="ios/${APP_NAME}/${APP_NAME}.entitlements"
|
|
||||||
if [ -n "$APP_GROUP" ]; then
|
|
||||||
echo " Setting APP_GROUP=$APP_GROUP"
|
|
||||||
cat > "$ENTITLEMENTS_FILE" << EOF
|
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>aps-environment</key>
|
|
||||||
<string>production</string>
|
|
||||||
<key>com.apple.security.application-groups</key>
|
|
||||||
<array>
|
|
||||||
<string>${APP_GROUP}</string>
|
|
||||||
</array>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
EOF
|
|
||||||
if ! grep -q "CODE_SIGN_ENTITLEMENTS" "$PBXPROJ"; then
|
|
||||||
sediment "s/DEVELOPMENT_TEAM = $DEVELOPMENT_TEAM;/DEVELOPMENT_TEAM = $DEVELOPMENT_TEAM; CODE_SIGN_ENTITLEMENTS = ${APP_NAME}\\/${APP_NAME}.entitlements;/g" "$PBXPROJ"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "✅ Signing configured automatically"
|
|
||||||
|
|
||||||
# (Old manual step - commented out)
|
|
||||||
# open "$XCODE_PROJ"
|
|
||||||
# read
|
|
||||||
}
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
i)
|
|
||||||
echo "Skipping cleanup_build..."
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
cleanup_build
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
echo "Building $APP_NAME for App Store upload..."
|
|
||||||
|
|
||||||
# ビルドディレクトリ作成
|
|
||||||
mkdir -p "$BUILD_DIR"
|
|
||||||
|
|
||||||
# アーカイブ(詳細ログ出力)
|
|
||||||
xcodebuild -workspace "$WORKSPACE" \
|
|
||||||
-scheme "$SCHEME" \
|
|
||||||
-configuration Release \
|
|
||||||
-archivePath "$BUILD_DIR/${APP_NAME}.xcarchive" \
|
|
||||||
-allowProvisioningUpdates \
|
|
||||||
DEVELOPMENT_TEAM="$DEVELOPMENT_TEAM" \
|
|
||||||
archive 2>&1 | tee "$BUILD_DIR/build.log"
|
|
||||||
|
|
||||||
# アーカイブ成功確認
|
|
||||||
if [ ! -d "$BUILD_DIR/${APP_NAME}.xcarchive" ]; then
|
|
||||||
echo "Error: Archive failed. Check $BUILD_DIR/build.log for details"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd "$BUILD_DIR"
|
|
||||||
|
|
||||||
|
|
||||||
# IPA作成
|
|
||||||
rm -rf Payload ${APP_NAME}.ipa
|
|
||||||
mkdir -p Payload
|
|
||||||
cp -R ${APP_NAME}.xcarchive/Products/Applications/${APP_NAME}.app Payload/
|
|
||||||
|
|
||||||
# store.mobileprovisionの存在確認とコピー
|
|
||||||
# https://developer.apple.com/account/resources/profiles/list
|
|
||||||
if [ ! -f "$MOBILEPROVISION" ]; then
|
|
||||||
# 親ディレクトリからコピーを試みる
|
|
||||||
PARENT_MOBILEPROVISION="$SCRIPT_DIR/../embedded.mobileprovision"
|
|
||||||
if [ -f "$PARENT_MOBILEPROVISION" ]; then
|
|
||||||
echo "Copying mobileprovision from $PARENT_MOBILEPROVISION to $MOBILEPROVISION"
|
|
||||||
cp "$PARENT_MOBILEPROVISION" "$MOBILEPROVISION"
|
|
||||||
else
|
|
||||||
echo "Error: store.mobileprovision not found at $MOBILEPROVISION or $PARENT_MOBILEPROVISION"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
cp "$MOBILEPROVISION" Payload/${APP_NAME}.app/embedded.mobileprovision
|
|
||||||
|
|
||||||
# entitlements抽出
|
|
||||||
security cms -D -i Payload/${APP_NAME}.app/embedded.mobileprovision > /tmp/profile.plist
|
|
||||||
/usr/libexec/PlistBuddy -x -c "Print :Entitlements" /tmp/profile.plist > /tmp/entitlements.plist
|
|
||||||
|
|
||||||
# 署名
|
|
||||||
CERT="$IOS_CERTIFICATE_NAME"
|
|
||||||
|
|
||||||
# Frameworksディレクトリが存在する場合のみ署名
|
|
||||||
if [ -d "Payload/${APP_NAME}.app/Frameworks" ]; then
|
|
||||||
for framework in Payload/${APP_NAME}.app/Frameworks/*.framework; do
|
|
||||||
if [ -e "$framework" ]; then
|
|
||||||
echo "Signing $framework"
|
|
||||||
codesign -f -s "$CERT" "$framework"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# アプリ本体に署名
|
|
||||||
codesign -f -s "$CERT" --entitlements /tmp/entitlements.plist Payload/${APP_NAME}.app
|
|
||||||
|
|
||||||
# IPA作成
|
|
||||||
zip -r ${APP_NAME}.ipa Payload
|
|
||||||
|
|
||||||
# アップロード
|
|
||||||
xcrun altool --upload-app -f ${APP_NAME}.ipa -t ios -u "${APP_MAIL}" -p "${APP_KEYCHAIN}"
|
|
||||||
|
|
||||||
echo "Upload complete: ${APP_NAME}.ipa"
|
|
||||||
14
ios/config.zsh
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
APP_NAME="Aiat"
|
||||||
|
DEVICE_ID="xxx"
|
||||||
|
REPO_DIR="../repos/social-app"
|
||||||
|
APP_SLUG="aiat"
|
||||||
|
APP_SCHEME="syui"
|
||||||
|
BUNDLE_ID="ai.syui.at"
|
||||||
|
APP_GROUP="group.ai.syui.at"
|
||||||
|
SERVICE_URL="https://syu.is"
|
||||||
|
HELP_URL="https://syu.is/help"
|
||||||
|
PRIVACY_URL="https://syu.is/privacy"
|
||||||
|
TERMS_URL="https://syu.is/terms"
|
||||||
|
REPO_DIR="../repos/social-app"
|
||||||
|
CONFIG_FILE="$REPO_DIR/app.config.js"
|
||||||
|
CONSTANTS_FILE="$REPO_DIR/src/lib/constants.ts"
|
||||||
BIN
ios/icon.png
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 28 KiB |
@@ -1,133 +0,0 @@
|
|||||||
--- a/app.config.js
|
|
||||||
+++ b/app.config.js
|
|
||||||
@@ -23,10 +23,7 @@
|
|
||||||
const IS_DEV = !IS_TESTFLIGHT && !IS_PRODUCTION
|
|
||||||
|
|
||||||
const ASSOCIATED_DOMAINS = [
|
|
||||||
- 'applinks:bsky.app',
|
|
||||||
- 'applinks:staging.bsky.app',
|
|
||||||
- 'appclips:bsky.app',
|
|
||||||
- 'appclips:go.bsky.app', // Allows App Clip to work when scanning QR codes
|
|
||||||
+ 'applinks:syu.is',
|
|
||||||
// When testing local services, enter an ngrok (et al) domain here. It must use a standard HTTP/HTTPS port.
|
|
||||||
...(IS_DEV || IS_TESTFLIGHT ? [] : []),
|
|
||||||
]
|
|
||||||
@@ -38,27 +35,25 @@
|
|
||||||
return {
|
|
||||||
expo: {
|
|
||||||
version: VERSION,
|
|
||||||
- name: 'Bluesky',
|
|
||||||
- slug: 'bluesky',
|
|
||||||
- scheme: 'bluesky',
|
|
||||||
+ name: 'Aiat',
|
|
||||||
+ slug: 'aiat',
|
|
||||||
+ scheme: 'syui',
|
|
||||||
owner: 'blueskysocial',
|
|
||||||
runtimeVersion: {
|
|
||||||
policy: 'appVersion',
|
|
||||||
},
|
|
||||||
- icon: './assets/app-icons/ios_icon_default_next.png',
|
|
||||||
+ icon: './assets/app-icon.png',
|
|
||||||
userInterfaceStyle: 'automatic',
|
|
||||||
primaryColor: '#1083fe',
|
|
||||||
newArchEnabled: false,
|
|
||||||
ios: {
|
|
||||||
supportsTablet: false,
|
|
||||||
- bundleIdentifier: 'xyz.blueskyweb.app',
|
|
||||||
+ bundleIdentifier: 'ai.syui.at',
|
|
||||||
+ buildNumber: '__BUILD_NUMBER__',
|
|
||||||
config: {
|
|
||||||
usesNonExemptEncryption: false,
|
|
||||||
},
|
|
||||||
- icon:
|
|
||||||
- PLATFORM === 'web' // web build doesn't like .icon files
|
|
||||||
- ? './assets/app-icons/ios_icon_default_next.png'
|
|
||||||
- : './assets/app-icons/ios_icon_default.icon',
|
|
||||||
+ icon: './assets/app-icon.png',
|
|
||||||
infoPlist: {
|
|
||||||
UIBackgroundModes: ['remote-notification'],
|
|
||||||
NSCameraUsageDescription:
|
|
||||||
@@ -118,7 +113,7 @@
|
|
||||||
entitlements: {
|
|
||||||
'com.apple.developer.kernel.increased-memory-limit': true,
|
|
||||||
'com.apple.developer.kernel.extended-virtual-addressing': true,
|
|
||||||
- 'com.apple.security.application-groups': 'group.app.bsky',
|
|
||||||
+ 'com.apple.security.application-groups': 'group.ai.syui.at',
|
|
||||||
// 'com.apple.developer.device-information.user-assigned-device-name': true,
|
|
||||||
},
|
|
||||||
privacyManifests: {
|
|
||||||
@@ -181,14 +176,14 @@
|
|
||||||
barStyle: 'light-content',
|
|
||||||
},
|
|
||||||
android: {
|
|
||||||
- icon: './assets/app-icons/android_icon_default_next.png',
|
|
||||||
+ icon: './assets/app-icon.png',
|
|
||||||
adaptiveIcon: {
|
|
||||||
foregroundImage: './assets/icon-android-foreground.png',
|
|
||||||
monochromeImage: './assets/icon-android-monochrome.png',
|
|
||||||
backgroundColor: '#006AFF',
|
|
||||||
},
|
|
||||||
googleServicesFile: './google-services.json',
|
|
||||||
- package: 'xyz.blueskyweb.app',
|
|
||||||
+ package: 'ai.syui.at',
|
|
||||||
intentFilters: [
|
|
||||||
{
|
|
||||||
action: 'VIEW',
|
|
||||||
@@ -196,7 +191,7 @@
|
|
||||||
data: [
|
|
||||||
{
|
|
||||||
scheme: 'https',
|
|
||||||
- host: 'bsky.app',
|
|
||||||
+ host: 'syu.is',
|
|
||||||
},
|
|
||||||
...(IS_DEV
|
|
||||||
? [
|
|
||||||
@@ -280,7 +275,6 @@
|
|
||||||
networkInstrumentation: true,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
- './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
|
|
||||||
'./plugins/withGradleJVMHeapSizeIncrease.js',
|
|
||||||
'./plugins/withAndroidManifestLargeHeapPlugin.js',
|
|
||||||
'./plugins/withAndroidManifestFCMIconPlugin.js',
|
|
||||||
@@ -288,8 +282,6 @@
|
|
||||||
'./plugins/withAndroidStylesAccentColorPlugin.js',
|
|
||||||
'./plugins/withAndroidDayNightThemePlugin.js',
|
|
||||||
'./plugins/withAndroidNoJitpackPlugin.js',
|
|
||||||
- './plugins/shareExtension/withShareExtensions.js',
|
|
||||||
- './plugins/notificationsExtension/withNotificationsExtension.js',
|
|
||||||
[
|
|
||||||
'expo-font',
|
|
||||||
{
|
|
||||||
@@ -417,30 +409,7 @@
|
|
||||||
build: {
|
|
||||||
experimental: {
|
|
||||||
ios: {
|
|
||||||
- appExtensions: [
|
|
||||||
- {
|
|
||||||
- targetName: 'Share-with-Bluesky',
|
|
||||||
- bundleIdentifier: 'xyz.blueskyweb.app.Share-with-Bluesky',
|
|
||||||
- entitlements: {
|
|
||||||
- 'com.apple.security.application-groups': [
|
|
||||||
- 'group.app.bsky',
|
|
||||||
- ],
|
|
||||||
- },
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- targetName: 'BlueskyNSE',
|
|
||||||
- bundleIdentifier: 'xyz.blueskyweb.app.BlueskyNSE',
|
|
||||||
- entitlements: {
|
|
||||||
- 'com.apple.security.application-groups': [
|
|
||||||
- 'group.app.bsky',
|
|
||||||
- ],
|
|
||||||
- },
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- targetName: 'BlueskyClip',
|
|
||||||
- bundleIdentifier: 'xyz.blueskyweb.app.AppClip',
|
|
||||||
- },
|
|
||||||
- ],
|
|
||||||
+ appExtensions: [],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
@@ -1,217 +0,0 @@
|
|||||||
diff --git a/src/lib/api/feed/home.ts b/src/lib/api/feed/home.ts
|
|
||||||
index 7a0d72d91..93554dc3e 100644
|
|
||||||
--- a/src/lib/api/feed/home.ts
|
|
||||||
+++ b/src/lib/api/feed/home.ts
|
|
||||||
@@ -45,7 +45,7 @@ export class HomeFeedAPI implements FeedAPI {
|
|
||||||
this.following = new FollowingFeedAPI({agent})
|
|
||||||
this.discover = new CustomFeedAPI({
|
|
||||||
agent,
|
|
||||||
- feedParams: {feed: PROD_DEFAULT_FEED('whats-hot')},
|
|
||||||
+ feedParams: {feed: PROD_DEFAULT_FEED('app')},
|
|
||||||
})
|
|
||||||
this.userInterests = userInterests
|
|
||||||
}
|
|
||||||
@@ -54,7 +54,7 @@ export class HomeFeedAPI implements FeedAPI {
|
|
||||||
this.following = new FollowingFeedAPI({agent: this.agent})
|
|
||||||
this.discover = new CustomFeedAPI({
|
|
||||||
agent: this.agent,
|
|
||||||
- feedParams: {feed: PROD_DEFAULT_FEED('whats-hot')},
|
|
||||||
+ feedParams: {feed: PROD_DEFAULT_FEED('app')},
|
|
||||||
userInterests: this.userInterests,
|
|
||||||
})
|
|
||||||
this.usingDiscover = false
|
|
||||||
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
|
|
||||||
index 231447b4f..a44b3da05 100644
|
|
||||||
--- a/src/lib/constants.ts
|
|
||||||
+++ b/src/lib/constants.ts
|
|
||||||
@@ -7,12 +7,12 @@ import {BLUESKY_PROXY_DID, CHAT_PROXY_DID} from '#/env'
|
|
||||||
export const LOCAL_DEV_SERVICE =
|
|
||||||
Platform.OS === 'android' ? 'http://10.0.2.2:2583' : 'http://localhost:2583'
|
|
||||||
export const STAGING_SERVICE = 'https://staging.bsky.dev'
|
|
||||||
-export const BSKY_SERVICE = 'https://bsky.social'
|
|
||||||
-export const BSKY_SERVICE_DID = 'did:web:bsky.social'
|
|
||||||
-export const PUBLIC_BSKY_SERVICE = 'https://public.api.bsky.app'
|
|
||||||
+export const BSKY_SERVICE = 'https://syu.is'
|
|
||||||
+export const BSKY_SERVICE_DID = 'did:web:syu.is'
|
|
||||||
+export const PUBLIC_BSKY_SERVICE = 'https://bsky.syu.is'
|
|
||||||
export const DEFAULT_SERVICE = BSKY_SERVICE
|
|
||||||
-const HELP_DESK_LANG = 'en-us'
|
|
||||||
-export const HELP_DESK_URL = `https://blueskyweb.zendesk.com/hc/${HELP_DESK_LANG}`
|
|
||||||
+const HELP_DESK_LANG = 'ja-jp'
|
|
||||||
+export const HELP_DESK_URL = '/support/license'
|
|
||||||
export const EMBED_SERVICE = 'https://embed.bsky.app'
|
|
||||||
export const EMBED_SCRIPT = `${EMBED_SERVICE}/static/embed.js`
|
|
||||||
export const BSKY_DOWNLOAD_URL = 'https://bsky.app/download'
|
|
||||||
@@ -79,19 +79,17 @@ export function IS_PROD_SERVICE(url?: string) {
|
|
||||||
}
|
|
||||||
|
|
||||||
export const PROD_DEFAULT_FEED = (rkey: string) =>
|
|
||||||
- `at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/${rkey}`
|
|
||||||
+ `at://did:plc:6qyecktefllvenje24fcxnie/app.bsky.feed.generator/${rkey}`
|
|
||||||
|
|
||||||
export const STAGING_DEFAULT_FEED = (rkey: string) =>
|
|
||||||
`at://did:plc:yofh3kx63drvfljkibw5zuxo/app.bsky.feed.generator/${rkey}`
|
|
||||||
|
|
||||||
export const PROD_FEEDS = [
|
|
||||||
- `feedgen|${PROD_DEFAULT_FEED('whats-hot')}`,
|
|
||||||
- `feedgen|${PROD_DEFAULT_FEED('thevids')}`,
|
|
||||||
+ `feedgen|${PROD_DEFAULT_FEED('app')}`,
|
|
||||||
]
|
|
||||||
|
|
||||||
export const STAGING_FEEDS = [
|
|
||||||
- `feedgen|${STAGING_DEFAULT_FEED('whats-hot')}`,
|
|
||||||
- `feedgen|${STAGING_DEFAULT_FEED('thevids')}`,
|
|
||||||
+ `feedgen|${STAGING_DEFAULT_FEED('app')}`,
|
|
||||||
]
|
|
||||||
|
|
||||||
export const POST_IMG_MAX = {
|
|
||||||
@@ -129,7 +127,7 @@ export const LANG_DROPDOWN_HITSLOP = {top: 10, bottom: 10, left: 4, right: 4}
|
|
||||||
export const BACK_HITSLOP = HITSLOP_30
|
|
||||||
export const MAX_POST_LINES = 25
|
|
||||||
|
|
||||||
-export const BSKY_APP_ACCOUNT_DID = 'did:plc:z72i7hdynmk6r22z27h6tvur'
|
|
||||||
+export const BSKY_APP_ACCOUNT_DID = 'did:plc:6qyecktefllvenje24fcxnie'
|
|
||||||
|
|
||||||
export const BSKY_FEED_OWNER_DIDS = [
|
|
||||||
BSKY_APP_ACCOUNT_DID,
|
|
||||||
@@ -138,9 +136,9 @@ export const BSKY_FEED_OWNER_DIDS = [
|
|
||||||
]
|
|
||||||
|
|
||||||
export const DISCOVER_FEED_URI =
|
|
||||||
- 'at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/whats-hot'
|
|
||||||
+ 'at://did:plc:6qyecktefllvenje24fcxnie/app.bsky.feed.generator/app'
|
|
||||||
export const VIDEO_FEED_URI =
|
|
||||||
'at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/thevids'
|
|
||||||
export const STAGING_VIDEO_FEED_URI =
|
|
||||||
'at://did:plc:yofh3kx63drvfljkibw5zuxo/app.bsky.feed.generator/thevids'
|
|
||||||
export const VIDEO_FEED_URIS = [VIDEO_FEED_URI, STAGING_VIDEO_FEED_URI]
|
|
||||||
@@ -209,8 +207,8 @@ export const urls = {
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
-export const PUBLIC_APPVIEW = 'https://api.bsky.app'
|
|
||||||
-export const PUBLIC_APPVIEW_DID = 'did:web:api.bsky.app'
|
|
||||||
+export const PUBLIC_APPVIEW = 'https://bsky.syu.is'
|
|
||||||
+export const PUBLIC_APPVIEW_DID = 'did:web:bsky.syu.is'
|
|
||||||
export const PUBLIC_STAGING_APPVIEW_DID = 'did:web:api.staging.bsky.dev'
|
|
||||||
|
|
||||||
export const DEV_ENV_APPVIEW = `http://localhost:2584` // always the same
|
|
||||||
@@ -236,8 +234,8 @@ export const BLUESKY_MOD_SERVICE_HEADERS = {
|
|
||||||
}
|
|
||||||
|
|
||||||
export const webLinks = {
|
|
||||||
- tos: `https://bsky.social/about/support/tos`,
|
|
||||||
- privacy: `https://bsky.social/about/support/privacy-policy`,
|
|
||||||
+ tos: `/support/tos`,
|
|
||||||
+ privacy: `/support/privacy-policy`,
|
|
||||||
community: `https://bsky.social/about/support/community-guidelines`,
|
|
||||||
communityDeprecated: `https://bsky.social/about/support/community-guidelines-deprecated`,
|
|
||||||
}
|
|
||||||
diff --git a/src/lib/demo.ts b/src/lib/demo.ts
|
|
||||||
index 5ead62c9d..7c80dfe15 100644
|
|
||||||
--- a/src/lib/demo.ts
|
|
||||||
+++ b/src/lib/demo.ts
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
import {type AppBskyFeedGetFeed} from '@atproto/api'
|
|
||||||
import {subDays, subMinutes} from 'date-fns'
|
|
||||||
|
|
||||||
-const DID = `did:plc:z72i7hdynmk6r22z27h6tvur`
|
|
||||||
+const DID = `did:plc:6qyecktefllvenje24fcxnie`
|
|
||||||
const NOW = new Date()
|
|
||||||
const POST_1_DATE = subMinutes(NOW, 2).toISOString()
|
|
||||||
const POST_2_DATE = subMinutes(NOW, 4).toISOString()
|
|
||||||
diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts
|
|
||||||
index 6088e2806..0f6787a4d 100644
|
|
||||||
--- a/src/lib/strings/url-helpers.ts
|
|
||||||
+++ b/src/lib/strings/url-helpers.ts
|
|
||||||
@@ -53,7 +53,7 @@ export function toNiceDomain(url: string): string {
|
|
||||||
try {
|
|
||||||
const urlp = new URL(url)
|
|
||||||
if (`https://${urlp.host}` === BSKY_SERVICE) {
|
|
||||||
- return 'Bluesky Social'
|
|
||||||
+ return 'syu.is'
|
|
||||||
}
|
|
||||||
return urlp.host ? urlp.host : url
|
|
||||||
} catch (e) {
|
|
||||||
@@ -338,7 +338,7 @@ export function createProxiedUrl(url: string): string {
|
|
||||||
return url
|
|
||||||
}
|
|
||||||
|
|
||||||
- return `https://go.bsky.app/redirect?u=${encodeURIComponent(url)}`
|
|
||||||
+ return url
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isShortLink(url: string): boolean {
|
|
||||||
diff --git a/src/state/queries/feed.ts b/src/state/queries/feed.ts
|
|
||||||
index de1e92533..3d1566800 100644
|
|
||||||
--- a/src/state/queries/feed.ts
|
|
||||||
+++ b/src/state/queries/feed.ts
|
|
||||||
@@ -201,14 +201,6 @@ export function useFeedSourceInfoQuery({uri}: {uri: string}) {
|
|
||||||
// for the ones we know need it
|
|
||||||
// -prf
|
|
||||||
export const KNOWN_AUTHED_ONLY_FEEDS = [
|
|
||||||
- 'at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/with-friends', // popular with friends, by bsky.app
|
|
||||||
- 'at://did:plc:tenurhgjptubkk5zf5qhi3og/app.bsky.feed.generator/mutuals', // mutuals, by skyfeed
|
|
||||||
- 'at://did:plc:tenurhgjptubkk5zf5qhi3og/app.bsky.feed.generator/only-posts', // only posts, by skyfeed
|
|
||||||
- 'at://did:plc:wzsilnxf24ehtmmc3gssy5bu/app.bsky.feed.generator/mentions', // mentions, by flicknow
|
|
||||||
- 'at://did:plc:q6gjnaw2blty4crticxkmujt/app.bsky.feed.generator/bangers', // my bangers, by jaz
|
|
||||||
- 'at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/mutuals', // mutuals, by bluesky
|
|
||||||
- 'at://did:plc:q6gjnaw2blty4crticxkmujt/app.bsky.feed.generator/my-followers', // followers, by jaz
|
|
||||||
- 'at://did:plc:vpkhqolt662uhesyj6nxm7ys/app.bsky.feed.generator/followpics', // the gram, by why
|
|
||||||
]
|
|
||||||
|
|
||||||
type GetPopularFeedsOptions = {limit?: number; enabled?: boolean}
|
|
||||||
diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts
|
|
||||||
index 0cf6ab546..399e592bc 100644
|
|
||||||
--- a/src/state/queries/preferences/index.ts
|
|
||||||
+++ b/src/state/queries/preferences/index.ts
|
|
||||||
@@ -270,7 +270,7 @@ export function useReplaceForYouWithDiscoverFeedMutation() {
|
|
||||||
await agent.addSavedFeeds([
|
|
||||||
{
|
|
||||||
type: 'feed',
|
|
||||||
- value: PROD_DEFAULT_FEED('whats-hot'),
|
|
||||||
+ value: PROD_DEFAULT_FEED('app'),
|
|
||||||
pinned: true,
|
|
||||||
},
|
|
||||||
])
|
|
||||||
diff --git a/src/view/com/posts/FeedShutdownMsg.tsx b/src/view/com/posts/FeedShutdownMsg.tsx
|
|
||||||
index 620382175..928480da2 100644
|
|
||||||
--- a/src/view/com/posts/FeedShutdownMsg.tsx
|
|
||||||
+++ b/src/view/com/posts/FeedShutdownMsg.tsx
|
|
||||||
@@ -32,7 +32,7 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
|
|
||||||
f => f.value === feedUri && f.pinned,
|
|
||||||
)
|
|
||||||
const discoverFeedConfig = preferences?.savedFeeds?.find(
|
|
||||||
- f => f.value === PROD_DEFAULT_FEED('whats-hot'),
|
|
||||||
+ f => f.value === PROD_DEFAULT_FEED('app'),
|
|
||||||
)
|
|
||||||
const hasFeedPinned = Boolean(feedConfig)
|
|
||||||
const hasDiscoverPinned = Boolean(discoverFeedConfig?.pinned)
|
|
||||||
@@ -44,7 +44,7 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
|
|
||||||
Toast.show(_(msg`Removed from your feeds`))
|
|
||||||
}
|
|
||||||
if (hasDiscoverPinned) {
|
|
||||||
- setSelectedFeed(`feedgen|${PROD_DEFAULT_FEED('whats-hot')}`)
|
|
||||||
+ setSelectedFeed(`feedgen|${PROD_DEFAULT_FEED('app')}`)
|
|
||||||
}
|
|
||||||
} catch (err: any) {
|
|
||||||
Toast.show(
|
|
||||||
@@ -63,7 +63,7 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
|
|
||||||
forYouFeedConfig: feedConfig,
|
|
||||||
discoverFeedConfig,
|
|
||||||
})
|
|
||||||
- setSelectedFeed(`feedgen|${PROD_DEFAULT_FEED('whats-hot')}`)
|
|
||||||
+ setSelectedFeed(`feedgen|${PROD_DEFAULT_FEED('app')}`)
|
|
||||||
Toast.show(_(msg`The feed has been replaced with Discover.`))
|
|
||||||
} catch (err: any) {
|
|
||||||
Toast.show(
|
|
||||||
@@ -100,7 +100,7 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
|
|
||||||
This feed is no longer online. We are showing{' '}
|
|
||||||
<InlineLinkText
|
|
||||||
label={_(msg`The Discover feed`)}
|
|
||||||
- to="/profile/bsky.app/feed/whats-hot"
|
|
||||||
+ to="/profile/did:plc:6qyecktefllvenje24fcxnie/feed/app"
|
|
||||||
style={[a.text_md]}>
|
|
||||||
Discover
|
|
||||||
</InlineLinkText>{' '}
|
|
||||||
|
|
||||||
@@ -1,213 +0,0 @@
|
|||||||
diff --git a/src/Splash.tsx b/src/Splash.tsx
|
|
||||||
index 47e70b375..616f351ed 100644
|
|
||||||
--- a/src/Splash.tsx
|
|
||||||
+++ b/src/Splash.tsx
|
|
||||||
@@ -15,8 +15,8 @@ import Animated, {
|
|
||||||
withTiming,
|
|
||||||
} from 'react-native-reanimated'
|
|
||||||
import {useSafeAreaInsets} from 'react-native-safe-area-context'
|
|
||||||
-import Svg, {Path, type SvgProps} from 'react-native-svg'
|
|
||||||
import {Image} from 'expo-image'
|
|
||||||
+import {type SvgProps} from 'react-native-svg'
|
|
||||||
import * as SplashScreen from 'expo-splash-screen'
|
|
||||||
|
|
||||||
import {Logotype} from '#/view/icons/Logotype'
|
|
||||||
@@ -29,21 +29,18 @@ const darkSplashImageUri = RNImage.resolveAssetSource(
|
|
||||||
darkSplashImagePointer,
|
|
||||||
).uri
|
|
||||||
|
|
||||||
-export const Logo = React.forwardRef(function LogoImpl(props: SvgProps, ref) {
|
|
||||||
- const width = 1000
|
|
||||||
- const height = width * (67 / 64)
|
|
||||||
+export const Logo = React.forwardRef(function LogoImpl(props: SvgProps & {fill?: string}, ref) {
|
|
||||||
+ const size = 1000
|
|
||||||
+ // @ts-ignore
|
|
||||||
return (
|
|
||||||
- <Svg
|
|
||||||
- fill="none"
|
|
||||||
- // @ts-ignore it's fiiiiine
|
|
||||||
+ <Image
|
|
||||||
+ // @ts-ignore
|
|
||||||
ref={ref}
|
|
||||||
- viewBox="0 0 64 66"
|
|
||||||
- style={[{width, height}, props.style]}>
|
|
||||||
- <Path
|
|
||||||
- fill={props.fill || '#fff'}
|
|
||||||
- d="M13.873 3.77C21.21 9.243 29.103 20.342 32 26.3v15.732c0-.335-.13.043-.41.858-1.512 4.414-7.418 21.642-20.923 7.87-7.111-7.252-3.819-14.503 9.125-16.692-7.405 1.252-15.73-.817-18.014-8.93C1.12 22.804 0 8.431 0 6.488 0-3.237 8.579-.18 13.873 3.77ZM50.127 3.77C42.79 9.243 34.897 20.342 32 26.3v15.732c0-.335.13.043.41.858 1.512 4.414 7.418 21.642 20.923 7.87 7.111-7.252 3.819-14.503-9.125-16.692 7.405 1.252 15.73-.817 18.014-8.93C62.88 22.804 64 8.431 64 6.488 64-3.237 55.422-.18 50.127 3.77Z"
|
|
||||||
- />
|
|
||||||
- </Svg>
|
|
||||||
+ source={require('../assets/logo.png')}
|
|
||||||
+ style={[{width: size, height: size}, props.style]}
|
|
||||||
+ contentFit="contain"
|
|
||||||
+ accessibilityLabel="Logo"
|
|
||||||
+ />
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
|
|
||||||
index 8a9e51a33..65d643b89 100644
|
|
||||||
--- a/src/view/com/util/UserAvatar.tsx
|
|
||||||
+++ b/src/view/com/util/UserAvatar.tsx
|
|
||||||
@@ -444,7 +444,7 @@ let EditableUserAvatar = ({
|
|
||||||
<HighPriorityImage
|
|
||||||
testID="userAvatarImage"
|
|
||||||
style={aviStyle}
|
|
||||||
- source={{uri: avatar}}
|
|
||||||
+ source={{ uri: hackModifyThumbnailPath(avatar, 1 > 0), }}
|
|
||||||
accessibilityRole="image"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
@@ -618,9 +618,8 @@ export {PreviewableUserAvatar}
|
|
||||||
// manually string-replace to use the smaller ones
|
|
||||||
// -prf
|
|
||||||
function hackModifyThumbnailPath(uri: string, isEnabled: boolean): string {
|
|
||||||
- return isEnabled
|
|
||||||
- ? uri.replace('/img/avatar/plain/', '/img/avatar_thumbnail/plain/')
|
|
||||||
- : uri
|
|
||||||
+ // syu.is: avatars are served directly from bsky.syu.is, no CDN transformation needed
|
|
||||||
+ return uri
|
|
||||||
}
|
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
|
||||||
diff --git a/src/view/icons/Logo.tsx b/src/view/icons/Logo.tsx
|
|
||||||
index d7208df13..2763800ac 100644
|
|
||||||
--- a/src/view/icons/Logo.tsx
|
|
||||||
+++ b/src/view/icons/Logo.tsx
|
|
||||||
@@ -1,75 +1,17 @@
|
|
||||||
import React from 'react'
|
|
||||||
-import {type TextProps} from 'react-native'
|
|
||||||
-import Svg, {
|
|
||||||
- Defs,
|
|
||||||
- LinearGradient,
|
|
||||||
- Path,
|
|
||||||
- type PathProps,
|
|
||||||
- Stop,
|
|
||||||
- type SvgProps,
|
|
||||||
-} from 'react-native-svg'
|
|
||||||
import {Image} from 'expo-image'
|
|
||||||
+import {flatten} from '#/alf'
|
|
||||||
|
|
||||||
-import {useKawaiiMode} from '#/state/preferences/kawaii'
|
|
||||||
-import {flatten, useTheme} from '#/alf'
|
|
||||||
-
|
|
||||||
-const ratio = 57 / 64
|
|
||||||
-
|
|
||||||
-type Props = {
|
|
||||||
- fill?: PathProps['fill']
|
|
||||||
- style?: TextProps['style']
|
|
||||||
-} & Omit<SvgProps, 'style'>
|
|
||||||
-
|
|
||||||
-export const Logo = React.forwardRef(function LogoImpl(props: Props, ref) {
|
|
||||||
- const t = useTheme()
|
|
||||||
- const {fill, ...rest} = props
|
|
||||||
- const gradient = fill === 'sky'
|
|
||||||
- const styles = flatten(props.style)
|
|
||||||
- const _fill = gradient
|
|
||||||
- ? 'url(#sky)'
|
|
||||||
- : fill || styles?.color || t.palette.primary_500
|
|
||||||
- // @ts-ignore it's fiiiiine
|
|
||||||
- const size = parseInt(rest.width || 32, 10)
|
|
||||||
-
|
|
||||||
- const isKawaii = useKawaiiMode()
|
|
||||||
-
|
|
||||||
- if (isKawaii) {
|
|
||||||
- return (
|
|
||||||
- <Image
|
|
||||||
- source={
|
|
||||||
- size > 100
|
|
||||||
- ? require('../../../assets/kawaii.png')
|
|
||||||
- : require('../../../assets/kawaii_smol.png')
|
|
||||||
- }
|
|
||||||
- accessibilityLabel="Bluesky"
|
|
||||||
- accessibilityHint=""
|
|
||||||
- accessibilityIgnoresInvertColors
|
|
||||||
- style={[{height: size, aspectRatio: 1.4}]}
|
|
||||||
- />
|
|
||||||
- )
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
+export const Logo = React.forwardRef(function LogoImpl(props: any, ref) {
|
|
||||||
+ const {width, style} = props
|
|
||||||
+ // @ts-ignore
|
|
||||||
+ const size = parseInt(width || 32, 10)
|
|
||||||
return (
|
|
||||||
- <Svg
|
|
||||||
- fill="none"
|
|
||||||
- // @ts-ignore it's fiiiiine
|
|
||||||
- ref={ref}
|
|
||||||
- viewBox="0 0 64 57"
|
|
||||||
- {...rest}
|
|
||||||
- style={[{width: size, height: size * ratio}, styles]}>
|
|
||||||
- {gradient && (
|
|
||||||
- <Defs>
|
|
||||||
- <LinearGradient id="sky" x1="0" y1="0" x2="0" y2="1">
|
|
||||||
- <Stop offset="0" stopColor="#0A7AFF" stopOpacity="1" />
|
|
||||||
- <Stop offset="1" stopColor="#59B9FF" stopOpacity="1" />
|
|
||||||
- </LinearGradient>
|
|
||||||
- </Defs>
|
|
||||||
- )}
|
|
||||||
-
|
|
||||||
- <Path
|
|
||||||
- fill={_fill}
|
|
||||||
- d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805ZM50.127 3.805C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745Z"
|
|
||||||
- />
|
|
||||||
- </Svg>
|
|
||||||
+ <Image
|
|
||||||
+ source={require('../../../assets/logo.png')}
|
|
||||||
+ style={[{width: size, height: size}, flatten(style)]}
|
|
||||||
+ contentFit="contain"
|
|
||||||
+ accessibilityLabel="Logo"
|
|
||||||
+ />
|
|
||||||
)
|
|
||||||
})
|
|
||||||
diff --git a/src/view/icons/Logotype.tsx b/src/view/icons/Logotype.tsx
|
|
||||||
index 270c913fc..a60ffe07c 100644
|
|
||||||
--- a/src/view/icons/Logotype.tsx
|
|
||||||
+++ b/src/view/icons/Logotype.tsx
|
|
||||||
@@ -1,28 +1,22 @@
|
|
||||||
-import Svg, {Path, type PathProps, type SvgProps} from 'react-native-svg'
|
|
||||||
-
|
|
||||||
-import {usePalette} from '#/lib/hooks/usePalette'
|
|
||||||
-
|
|
||||||
-const ratio = 17 / 64
|
|
||||||
-
|
|
||||||
-export function Logotype({
|
|
||||||
- fill,
|
|
||||||
- ...rest
|
|
||||||
-}: {fill?: PathProps['fill']} & SvgProps) {
|
|
||||||
- const pal = usePalette('default')
|
|
||||||
- // @ts-ignore it's fiiiiine
|
|
||||||
- const size = parseInt(rest.width || 32)
|
|
||||||
+import React from 'react'
|
|
||||||
+import {Text} from 'react-native'
|
|
||||||
+import {useTheme, atoms as a} from '#/alf'
|
|
||||||
|
|
||||||
+export function Logotype({width, fill, style}: any) {
|
|
||||||
+ const t = useTheme()
|
|
||||||
+ const fontSize = width ? parseInt(width) / 3.5 : 22
|
|
||||||
+
|
|
||||||
return (
|
|
||||||
- <Svg
|
|
||||||
- fill="none"
|
|
||||||
- viewBox="0 0 64 17"
|
|
||||||
- {...rest}
|
|
||||||
- width={size}
|
|
||||||
- height={Number(size) * ratio}>
|
|
||||||
- <Path
|
|
||||||
- fill={fill || pal.text.color}
|
|
||||||
- d="M8.478 6.252c1.503.538 2.3 1.78 2.3 3.172 0 2.356-1.576 3.785-4.6 3.785H0V0h5.974c2.875 0 4.267 1.466 4.267 3.413 0 1.3-.594 2.245-1.763 2.839Zm-2.69-4.193H2.504v3.45h3.284c1.28 0 1.967-.667 1.967-1.78 0-1.02-.705-1.67-1.967-1.67Zm-3.284 9.072h3.544c1.41 0 2.17-.65 2.17-1.818 0-1.224-.723-1.837-2.17-1.837H2.504v3.655ZM14.251 13.209h-2.337V0h2.337v13.209ZM22.001 8.998V3.636h2.338v9.573h-2.263v-1.392c-.724 1.076-1.726 1.614-3.006 1.614-2.022 0-3.34-1.224-3.34-3.45V3.636h2.338v5.955c0 1.206.594 1.818 1.8 1.818 1.132 0 2.133-.835 2.133-2.411ZM34.979 8.59v.556h-7.161c.167 1.651 1.076 2.467 2.486 2.467 1.076 0 1.8-.463 2.189-1.372h2.244c-.5 1.947-2.17 3.19-4.452 3.19-1.428 0-2.579-.463-3.45-1.372-.872-.91-1.318-2.115-1.318-3.637 0-1.502.427-2.708 1.299-3.636.872-.909 2.004-1.372 3.432-1.372 1.447 0 2.597.482 3.45 1.428.854.946 1.28 2.208 1.28 3.747Zm-4.75-3.358c-1.28 0-2.17.742-2.393 2.281h4.805c-.204-1.391-1.057-2.281-2.411-2.281ZM40.16 13.469c-2.783 0-4.249-1.095-4.379-3.303h2.282c.13 1.188.724 1.633 2.134 1.633 1.261 0 1.892-.39 1.892-1.15 0-.687-.445-1.02-1.874-1.262l-1.094-.185c-2.097-.353-3.136-1.318-3.136-2.894 0-1.8 1.429-2.894 3.97-2.894 2.728 0 4.138 1.075 4.23 3.246h-2.207c-.056-1.169-.742-1.577-2.023-1.577-1.113 0-1.67.371-1.67 1.113 0 .668.483.965 1.596 1.169l1.206.186c2.32.426 3.32 1.28 3.32 2.912 0 1.93-1.557 3.006-4.247 3.006ZM54.667 13.209h-2.671l-2.783-4.453-1.447 1.447v3.006h-2.3V0h2.3v7.606l3.896-3.97h2.783l-3.618 3.618 3.84 5.955ZM60.772 6.048l.78-2.412H64l-3.692 10.352c-.39 1.057-.872 1.818-1.484 2.245-.612.426-1.484.63-2.634.63-.39 0-.724-.018-1.02-.055V14.97h.89c1.057 0 1.577-.65 1.577-1.54 0-.445-.149-1.094-.446-1.929l-2.746-7.866h2.487l.779 2.393c.575 1.8 1.076 3.58 1.521 5.343.408-1.521.928-3.302 1.54-5.324Z"
|
|
||||||
- />
|
|
||||||
- </Svg>
|
|
||||||
+ <Text style={[
|
|
||||||
+ a.font_bold,
|
|
||||||
+ {
|
|
||||||
+ fontSize,
|
|
||||||
+ color: fill || t.palette.primary_500,
|
|
||||||
+ letterSpacing: -0.5
|
|
||||||
+ },
|
|
||||||
+ style
|
|
||||||
+ ]}>
|
|
||||||
+ Aiat
|
|
||||||
+ </Text>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
diff --git a/src/App.native.tsx b/src/App.native.tsx
|
|
||||||
index 2c4d6fa41..b69e2b18d 100644
|
|
||||||
--- a/src/App.native.tsx
|
|
||||||
+++ b/src/App.native.tsx
|
|
||||||
@@ -95,7 +95,7 @@ if (isAndroid) {
|
|
||||||
* Begin geolocation ASAP
|
|
||||||
*/
|
|
||||||
Geo.resolve()
|
|
||||||
-prefetchAgeAssuranceConfig()
|
|
||||||
+// // // prefetchAgeAssuranceConfig()
|
|
||||||
prefetchLiveEvents()
|
|
||||||
|
|
||||||
function InnerApp() {
|
|
||||||
diff --git a/src/routes.ts b/src/routes.ts
|
|
||||||
index f325539c7..3e2c7b3eb 100644
|
|
||||||
--- a/src/routes.ts
|
|
||||||
+++ b/src/routes.ts
|
|
||||||
@@ -72,9 +72,11 @@ export const router = new Router<AllNavigatableRoutes>({
|
|
||||||
FindContactsSettings: '/settings/find-contacts',
|
|
||||||
// support
|
|
||||||
Support: '/support',
|
|
||||||
- PrivacyPolicy: '/support/privacy',
|
|
||||||
- TermsOfService: '/support/tos',
|
|
||||||
+ PrivacyPolicy: ['/support/privacy-policy', '/about/support/privacy-policy'],
|
|
||||||
+ TermsOfService: ['/support/tos', '/about/support/tos'],
|
|
||||||
CommunityGuidelines: '/support/community-guidelines',
|
|
||||||
+ License: ['/support/license', '/about/support/license'],
|
|
||||||
+ AppInfo: '/support/app',
|
|
||||||
CopyrightPolicy: '/support/copyright',
|
|
||||||
// hashtags
|
|
||||||
Hashtag: '/hashtag/:tag',
|
|
||||||
diff --git a/src/state/session/agent.ts b/src/state/session/agent.ts
|
|
||||||
index 5c8ce3b97..ee85beb08 100644
|
|
||||||
--- a/src/state/session/agent.ts
|
|
||||||
+++ b/src/state/session/agent.ts
|
|
||||||
@@ -47,7 +47,8 @@ export function createPublicAgent() {
|
|
||||||
configureModerationForGuest() // Side effect but only relevant for tests
|
|
||||||
|
|
||||||
const agent = new BskyAppAgent({service: PUBLIC_BSKY_SERVICE})
|
|
||||||
- agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
|
||||||
+ // Disable proxy for self-hosted environments
|
|
||||||
+ // agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
|
||||||
return agent
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -88,7 +89,8 @@ export async function createAgentAndResume(
|
|
||||||
// after session is attached
|
|
||||||
const aa = prefetchAgeAssuranceData({agent})
|
|
||||||
|
|
||||||
- agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
|
||||||
+ // Disable proxy for self-hosted environments
|
|
||||||
+ // agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
|
||||||
|
|
||||||
return agent.prepare({
|
|
||||||
resolvers: [gates, moderation, aa],
|
|
||||||
@@ -127,7 +129,8 @@ export async function createAgentAndLogin(
|
|
||||||
const moderation = configureModerationForAccount(agent, account)
|
|
||||||
const aa = prefetchAgeAssuranceData({agent})
|
|
||||||
|
|
||||||
- agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
|
||||||
+ // Disable proxy for self-hosted environments
|
|
||||||
+ // agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
|
||||||
|
|
||||||
return agent.prepare({
|
|
||||||
resolvers: [gates, moderation, aa],
|
|
||||||
@@ -299,7 +302,8 @@ export async function createAgentAndCreateAccount(
|
|
||||||
logger.error(e, {message: `session: failed snoozeEmailConfirmationPrompt`})
|
|
||||||
}
|
|
||||||
|
|
||||||
- agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
|
||||||
+ // Disable proxy for self-hosted environments
|
|
||||||
+ // agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
|
||||||
|
|
||||||
return agent.prepare({
|
|
||||||
resolvers: [gates, moderation, aa],
|
|
||||||
@@ -1,224 +0,0 @@
|
|||||||
--- a/src/screens/Settings/AboutSettings.tsx
|
|
||||||
+++ b/src/screens/Settings/AboutSettings.tsx
|
|
||||||
@@ -79,7 +79,7 @@
|
|
||||||
<Layout.Content>
|
|
||||||
<SettingsList.Container>
|
|
||||||
<SettingsList.LinkItem
|
|
||||||
- to="https://bsky.social/about/support/tos"
|
|
||||||
+ to="/support/tos"
|
|
||||||
label={_(msg`Terms of Service`)}>
|
|
||||||
<SettingsList.ItemIcon icon={NewspaperIcon} />
|
|
||||||
<SettingsList.ItemText>
|
|
||||||
@@ -87,7 +87,7 @@
|
|
||||||
</SettingsList.ItemText>
|
|
||||||
</SettingsList.LinkItem>
|
|
||||||
<SettingsList.LinkItem
|
|
||||||
- to="https://bsky.social/about/support/privacy-policy"
|
|
||||||
+ to="/support/privacy-policy"
|
|
||||||
label={_(msg`Privacy Policy`)}>
|
|
||||||
<SettingsList.ItemIcon icon={NewspaperIcon} />
|
|
||||||
<SettingsList.ItemText>
|
|
||||||
--- a/src/screens/Takendown.tsx
|
|
||||||
+++ b/src/screens/Takendown.tsx
|
|
||||||
@@ -210,10 +210,10 @@
|
|
||||||
<Trans>
|
|
||||||
Your account was found to be in violation of the{' '}
|
|
||||||
<SimpleInlineLinkText
|
|
||||||
- label={_(msg`Bluesky Social Terms of Service`)}
|
|
||||||
- to="https://bsky.social/about/support/tos"
|
|
||||||
+ label={_(msg`syu.is Terms of Service`)}
|
|
||||||
+ to="/support/tos"
|
|
||||||
style={[a.text_md, a.leading_snug]}>
|
|
||||||
- Bluesky Social Terms of Service
|
|
||||||
+ syu.is Terms of Service
|
|
||||||
</SimpleInlineLinkText>
|
|
||||||
. You have been sent an email outlining the specific violation
|
|
||||||
and suspension period, if applicable. You can appeal this
|
|
||||||
--- a/src/view/screens/PrivacyPolicy.tsx
|
|
||||||
+++ b/src/view/screens/PrivacyPolicy.tsx
|
|
||||||
@@ -1,52 +1,49 @@
|
|
||||||
import React from 'react'
|
|
||||||
-import {View} from 'react-native'
|
|
||||||
-import {msg} from '@lingui/core/macro'
|
|
||||||
-import {useLingui} from '@lingui/react'
|
|
||||||
-import {Trans} from '@lingui/react/macro'
|
|
||||||
-import {useFocusEffect} from '@react-navigation/native'
|
|
||||||
-
|
|
||||||
-import {usePalette} from '#/lib/hooks/usePalette'
|
|
||||||
-import {
|
|
||||||
- type CommonNavigatorParams,
|
|
||||||
- type NativeStackScreenProps,
|
|
||||||
-} from '#/lib/routes/types'
|
|
||||||
-import {s} from '#/lib/styles'
|
|
||||||
-import {useSetMinimalShellMode} from '#/state/shell'
|
|
||||||
-import {TextLink} from '#/view/com/util/Link'
|
|
||||||
-import {Text} from '#/view/com/util/text/Text'
|
|
||||||
-import {ScrollView} from '#/view/com/util/Views'
|
|
||||||
+import {ScrollView} from 'react-native'
|
|
||||||
import * as Layout from '#/components/Layout'
|
|
||||||
-import {ViewHeader} from '../com/util/ViewHeader'
|
|
||||||
+import {useSetTitle} from '#/lib/hooks/useSetTitle'
|
|
||||||
+import {atoms as a, useTheme} from '#/alf'
|
|
||||||
+import {Text} from '#/components/Typography'
|
|
||||||
|
|
||||||
-type Props = NativeStackScreenProps<CommonNavigatorParams, 'PrivacyPolicy'>
|
|
||||||
-export const PrivacyPolicyScreen = (_props: Props) => {
|
|
||||||
- const pal = usePalette('default')
|
|
||||||
- const {_} = useLingui()
|
|
||||||
- const setMinimalShellMode = useSetMinimalShellMode()
|
|
||||||
+export function PrivacyPolicyScreen() {
|
|
||||||
+ useSetTitle('Privacy Policy')
|
|
||||||
+ const t = useTheme()
|
|
||||||
|
|
||||||
- useFocusEffect(
|
|
||||||
- React.useCallback(() => {
|
|
||||||
- setMinimalShellMode(false)
|
|
||||||
- }, [setMinimalShellMode]),
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
return (
|
|
||||||
<Layout.Screen>
|
|
||||||
- <ViewHeader title={_(msg`Privacy Policy`)} />
|
|
||||||
- <ScrollView style={[s.hContentRegion, pal.view]}>
|
|
||||||
- <View style={[s.p20]}>
|
|
||||||
- <Text style={pal.text}>
|
|
||||||
- <Trans>
|
|
||||||
- The Privacy Policy has been moved to{' '}
|
|
||||||
- <TextLink
|
|
||||||
- style={pal.link}
|
|
||||||
- href="https://bsky.social/about/support/privacy-policy"
|
|
||||||
- text="bsky.social/about/support/privacy-policy"
|
|
||||||
- />
|
|
||||||
- </Trans>
|
|
||||||
- </Text>
|
|
||||||
- </View>
|
|
||||||
- <View style={s.footerSpacer} />
|
|
||||||
+ <ScrollView
|
|
||||||
+ style={[a.flex_1, {backgroundColor: t.palette.white}]}
|
|
||||||
+ contentContainerStyle={[a.p_lg, a.pt_5xl, a.pb_5xl]}>
|
|
||||||
+ <Text style={[a.text_2xl, a.font_bold, a.mb_lg]}>Privacy Policy</Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_lg, a.mb_md]}>Data Collection</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ syu.is collects minimal data necessary to provide the service. This includes your account information, posts, and interactions on the AT Protocol network.
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_lg, a.mb_md]}>Data Storage</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ Your data is stored on the AT Protocol network. Posts and profile information are public by default as part of the decentralized social network.
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_lg, a.mb_md]}>Third Parties</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ We do not sell your personal information to third parties. Your data may be visible to other users and services on the AT Protocol network.
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_lg, a.mb_md]}>Contact</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ For privacy-related questions, please contact the administrator.
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_xl, a.mb_md]}>日本語</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ syu.isはサービス提供に必要な最小限のデータのみを収集します。投稿やプロフィール情報はAT Protocolネットワーク上で公開されます。個人情報を第三者に販売することはありません。
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_sm, a.mt_xl, {color: t.palette.contrast_500}]}>
|
|
||||||
+ Last updated: 2026
|
|
||||||
+ </Text>
|
|
||||||
</ScrollView>
|
|
||||||
</Layout.Screen>
|
|
||||||
)
|
|
||||||
--- a/src/view/screens/TermsOfService.tsx
|
|
||||||
+++ b/src/view/screens/TermsOfService.tsx
|
|
||||||
@@ -1,50 +1,49 @@
|
|
||||||
import React from 'react'
|
|
||||||
-import {View} from 'react-native'
|
|
||||||
-import {msg} from '@lingui/core/macro'
|
|
||||||
-import {useLingui} from '@lingui/react'
|
|
||||||
-import {Trans} from '@lingui/react/macro'
|
|
||||||
-import {useFocusEffect} from '@react-navigation/native'
|
|
||||||
-
|
|
||||||
-import {usePalette} from '#/lib/hooks/usePalette'
|
|
||||||
-import {
|
|
||||||
- type CommonNavigatorParams,
|
|
||||||
- type NativeStackScreenProps,
|
|
||||||
-} from '#/lib/routes/types'
|
|
||||||
-import {s} from '#/lib/styles'
|
|
||||||
-import {useSetMinimalShellMode} from '#/state/shell'
|
|
||||||
-import {TextLink} from '#/view/com/util/Link'
|
|
||||||
-import {Text} from '#/view/com/util/text/Text'
|
|
||||||
-import {ScrollView} from '#/view/com/util/Views'
|
|
||||||
+import {ScrollView} from 'react-native'
|
|
||||||
import * as Layout from '#/components/Layout'
|
|
||||||
-import {ViewHeader} from '../com/util/ViewHeader'
|
|
||||||
+import {useSetTitle} from '#/lib/hooks/useSetTitle'
|
|
||||||
+import {atoms as a, useTheme} from '#/alf'
|
|
||||||
+import {Text} from '#/components/Typography'
|
|
||||||
|
|
||||||
-type Props = NativeStackScreenProps<CommonNavigatorParams, 'TermsOfService'>
|
|
||||||
-export const TermsOfServiceScreen = (_props: Props) => {
|
|
||||||
- const pal = usePalette('default')
|
|
||||||
- const setMinimalShellMode = useSetMinimalShellMode()
|
|
||||||
- const {_} = useLingui()
|
|
||||||
+export function TermsOfServiceScreen() {
|
|
||||||
+ useSetTitle('Terms of Service')
|
|
||||||
+ const t = useTheme()
|
|
||||||
|
|
||||||
- useFocusEffect(
|
|
||||||
- React.useCallback(() => {
|
|
||||||
- setMinimalShellMode(false)
|
|
||||||
- }, [setMinimalShellMode]),
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
return (
|
|
||||||
<Layout.Screen>
|
|
||||||
- <ViewHeader title={_(msg`Terms of Service`)} />
|
|
||||||
- <ScrollView style={[s.hContentRegion, pal.view]}>
|
|
||||||
- <View style={[s.p20]}>
|
|
||||||
- <Text style={pal.text}>
|
|
||||||
- <Trans>The Terms of Service have been moved to</Trans>{' '}
|
|
||||||
- <TextLink
|
|
||||||
- style={pal.link}
|
|
||||||
- href="https://bsky.social/about/support/tos"
|
|
||||||
- text="bsky.social/about/support/tos"
|
|
||||||
- />
|
|
||||||
- </Text>
|
|
||||||
- </View>
|
|
||||||
- <View style={s.footerSpacer} />
|
|
||||||
+ <ScrollView
|
|
||||||
+ style={[a.flex_1, {backgroundColor: t.palette.white}]}
|
|
||||||
+ contentContainerStyle={[a.p_lg, a.pt_5xl, a.pb_5xl]}>
|
|
||||||
+ <Text style={[a.text_2xl, a.font_bold, a.mb_lg]}>Terms of Service</Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_lg, a.mb_md]}>Acceptance</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ By using syu.is, you agree to these terms. If you do not agree, please do not use the service.
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_lg, a.mb_md]}>Prohibited Content</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ Do not post illegal content, spam, or harass others. Do not impersonate others or spread misinformation.
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_lg, a.mb_md]}>Account Termination</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ The administrator reserves the right to suspend or terminate accounts that violate these terms.
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_lg, a.mb_md]}>Disclaimer</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ This service is provided "as is" without warranty of any kind.
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_lg, a.font_bold, a.mt_xl, a.mb_md]}>日本語</Text>
|
|
||||||
+ <Text style={[a.mb_md]}>
|
|
||||||
+ syu.isを利用することで、これらの利用規約に同意したものとみなします。違法なコンテンツの投稿、スパム、他者への嫌がらせは禁止です。管理者は規約違反のアカウントを停止する権利を有します。本サービスは現状のまま提供され、いかなる保証もありません。
|
|
||||||
+ </Text>
|
|
||||||
+
|
|
||||||
+ <Text style={[a.text_sm, a.mt_xl, {color: t.palette.contrast_500}]}>
|
|
||||||
+ Last updated: 2026
|
|
||||||
+ </Text>
|
|
||||||
</ScrollView>
|
|
||||||
</Layout.Screen>
|
|
||||||
)
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx
|
|
||||||
index 42a5fe417..8e7963512 100644
|
|
||||||
--- a/src/view/shell/Drawer.tsx
|
|
||||||
+++ b/src/view/shell/Drawer.tsx
|
|
||||||
@@ -294,17 +294,11 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
|
|
||||||
<>
|
|
||||||
<SearchMenuItem isActive={isAtSearch} onPress={onPressSearch} />
|
|
||||||
<HomeMenuItem isActive={isAtHome} onPress={onPressHome} />
|
|
||||||
- <ChatMenuItem isActive={isAtMessages} onPress={onPressMessages} />
|
|
||||||
<NotificationsMenuItem
|
|
||||||
isActive={isAtNotifications}
|
|
||||||
onPress={onPressNotifications}
|
|
||||||
/>
|
|
||||||
<FeedsMenuItem isActive={isAtFeeds} onPress={onPressMyFeeds} />
|
|
||||||
- <ListsMenuItem onPress={onPressLists} />
|
|
||||||
- <BookmarksMenuItem
|
|
||||||
- isActive={isAtBookmarks}
|
|
||||||
- onPress={onPressBookmarks}
|
|
||||||
- />
|
|
||||||
<ProfileMenuItem
|
|
||||||
isActive={isAtMyProfile}
|
|
||||||
onPress={onPressProfile}
|
|
||||||
@@ -359,17 +353,7 @@ let DrawerFooter = ({
|
|
||||||
),
|
|
||||||
},
|
|
||||||
]}>
|
|
||||||
- <Button
|
|
||||||
- label={_(msg`Send feedback`)}
|
|
||||||
- size="small"
|
|
||||||
- variant="solid"
|
|
||||||
- color="secondary"
|
|
||||||
- onPress={onPressFeedback}>
|
|
||||||
- <ButtonIcon icon={Message} position="left" />
|
|
||||||
- <ButtonText>
|
|
||||||
- <Trans>Feedback</Trans>
|
|
||||||
- </ButtonText>
|
|
||||||
- </Button>
|
|
||||||
+{/* Feedback button removed for syu.is */}
|
|
||||||
<Button
|
|
||||||
label={_(msg`Get help`)}
|
|
||||||
size="small"
|
|
||||||
@@ -697,15 +681,21 @@ function ExtraLinks() {
|
|
||||||
<InlineLinkText
|
|
||||||
style={[a.text_md]}
|
|
||||||
label={_(msg`Terms of Service`)}
|
|
||||||
- to="https://bsky.social/about/support/tos">
|
|
||||||
+ to="/support/tos">
|
|
||||||
<Trans>Terms of Service</Trans>
|
|
||||||
</InlineLinkText>
|
|
||||||
<InlineLinkText
|
|
||||||
style={[a.text_md]}
|
|
||||||
- to="https://bsky.social/about/support/privacy-policy"
|
|
||||||
+ to="/support/privacy-policy"
|
|
||||||
label={_(msg`Privacy Policy`)}>
|
|
||||||
<Trans>Privacy Policy</Trans>
|
|
||||||
</InlineLinkText>
|
|
||||||
+ <InlineLinkText
|
|
||||||
+ style={[a.text_md]}
|
|
||||||
+ to="/support/license"
|
|
||||||
+ label="License">
|
|
||||||
+ License
|
|
||||||
+ </InlineLinkText>
|
|
||||||
{kawaii && (
|
|
||||||
<Text style={t.atoms.text_contrast_medium}>
|
|
||||||
<Trans>
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
diff --git a/plugins/notificationsExtension/withNotificationsExtension.js b/plugins/notificationsExtension/withNotificationsExtension.js
|
|
||||||
index 6a00cfd23..f91decc08 100644
|
|
||||||
--- a/plugins/notificationsExtension/withNotificationsExtension.js
|
|
||||||
+++ b/plugins/notificationsExtension/withNotificationsExtension.js
|
|
||||||
@@ -10,7 +10,7 @@ const EXTENSION_NAME = 'BlueskyNSE'
|
|
||||||
const EXTENSION_CONTROLLER_NAME = 'NotificationService'
|
|
||||||
|
|
||||||
const withNotificationsExtension = config => {
|
|
||||||
- const soundFiles = ['dm.aiff']
|
|
||||||
+ const soundFiles = []
|
|
||||||
|
|
||||||
return withPlugins(config, [
|
|
||||||
// IOS
|
|
||||||
diff --git a/src/components/PolicyUpdateOverlay/updates/202508/index.tsx b/src/components/PolicyUpdateOverlay/updates/202508/index.tsx
|
|
||||||
index 8365057e8..59c8506a2 100644
|
|
||||||
--- a/src/components/PolicyUpdateOverlay/updates/202508/index.tsx
|
|
||||||
+++ b/src/components/PolicyUpdateOverlay/updates/202508/index.tsx
|
|
||||||
@@ -26,12 +26,12 @@ export function Content({state}: {state: PolicyUpdateState}) {
|
|
||||||
const links = {
|
|
||||||
terms: {
|
|
||||||
overridePresentation: false,
|
|
||||||
- to: `https://bsky.social/about/support/tos`,
|
|
||||||
+ to: `/support/tos`,
|
|
||||||
label: _(msg`Terms of Service`),
|
|
||||||
},
|
|
||||||
privacy: {
|
|
||||||
overridePresentation: false,
|
|
||||||
- to: `https://bsky.social/about/support/privacy-policy`,
|
|
||||||
+ to: `/support/privacy-policy`,
|
|
||||||
label: _(msg`Privacy Policy`),
|
|
||||||
},
|
|
||||||
copyright: {
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
diff --git a/src/Navigation.tsx b/src/Navigation.tsx
|
|
||||||
index fde223bd0..0e57c27a6 100644
|
|
||||||
--- a/src/Navigation.tsx
|
|
||||||
+++ b/src/Navigation.tsx
|
|
||||||
@@ -66,6 +66,8 @@ import {NotFoundScreen} from '#/view/screens/NotFound'
|
|
||||||
import {NotificationsScreen} from '#/view/screens/Notifications'
|
|
||||||
import {PostThreadScreen} from '#/view/screens/PostThread'
|
|
||||||
import {PrivacyPolicyScreen} from '#/view/screens/PrivacyPolicy'
|
|
||||||
+import {LicenseScreen} from '#/view/screens/License'
|
|
||||||
+import {AppInfoScreen} from '#/view/screens/AppInfo'
|
|
||||||
import {ProfileScreen} from '#/view/screens/Profile'
|
|
||||||
import {ProfileFeedLikedByScreen} from '#/view/screens/ProfileFeedLikedBy'
|
|
||||||
import {StorybookScreen} from '#/view/screens/Storybook'
|
|
||||||
@@ -337,6 +339,16 @@ function commonScreens(Stack: typeof Flat, unreadCountLabel?: string) {
|
|
||||||
getComponent={() => TermsOfServiceScreen}
|
|
||||||
options={{title: title(msg`Terms of Service`)}}
|
|
||||||
/>
|
|
||||||
+ <Stack.Screen
|
|
||||||
+ name="License"
|
|
||||||
+ getComponent={() => LicenseScreen}
|
|
||||||
+ options={{title: title(msg`License`)}}
|
|
||||||
+ />
|
|
||||||
+ <Stack.Screen
|
|
||||||
+ name="AppInfo"
|
|
||||||
+ getComponent={() => AppInfoScreen}
|
|
||||||
+ options={{title: title(msg`App Info`)}}
|
|
||||||
+ />
|
|
||||||
<Stack.Screen
|
|
||||||
name="CommunityGuidelines"
|
|
||||||
getComponent={() => CommunityGuidelinesScreen}
|
|
||||||
diff --git a/src/lib/routes/types.ts b/src/lib/routes/types.ts
|
|
||||||
index 0a3a0d545..ec6c43ff5 100644
|
|
||||||
--- a/src/lib/routes/types.ts
|
|
||||||
+++ b/src/lib/routes/types.ts
|
|
||||||
@@ -39,6 +39,8 @@ export type CommonNavigatorParams = {
|
|
||||||
Support: undefined
|
|
||||||
PrivacyPolicy: undefined
|
|
||||||
TermsOfService: undefined
|
|
||||||
+ License: undefined
|
|
||||||
+ AppInfo: undefined
|
|
||||||
CommunityGuidelines: undefined
|
|
||||||
CopyrightPolicy: undefined
|
|
||||||
LanguageSettings: undefined
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
diff --git a/src/screens/Signup/index.tsx b/src/screens/Signup/index.tsx
|
|
||||||
index aa6cd4156..37c7a38b0 100644
|
|
||||||
--- a/src/screens/Signup/index.tsx
|
|
||||||
+++ b/src/screens/Signup/index.tsx
|
|
||||||
@@ -211,20 +211,6 @@ export function Signup({onPressBack}: {onPressBack: () => void}) {
|
|
||||||
a.align_center,
|
|
||||||
]}>
|
|
||||||
<AppLanguageDropdown />
|
|
||||||
- <Text
|
|
||||||
- style={[
|
|
||||||
- a.flex_1,
|
|
||||||
- t.atoms.text_contrast_medium,
|
|
||||||
- !gtMobile && a.text_md,
|
|
||||||
- ]}>
|
|
||||||
- <Trans>Having trouble?</Trans>{' '}
|
|
||||||
- <InlineLinkText
|
|
||||||
- label={_(msg`Contact support`)}
|
|
||||||
- to={FEEDBACK_FORM_URL({email: state.email})}
|
|
||||||
- style={[!gtMobile && a.text_md]}>
|
|
||||||
- <Trans>Contact support</Trans>
|
|
||||||
- </InlineLinkText>
|
|
||||||
- </Text>
|
|
||||||
</View>
|
|
||||||
</View>
|
|
||||||
</ScreenTransition>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
diff --git a/src/view/com/auth/SplashScreen.web.tsx b/src/view/com/auth/SplashScreen.web.tsx
|
|
||||||
index d9185d778..504f521a4 100644
|
|
||||||
--- a/src/view/com/auth/SplashScreen.web.tsx
|
|
||||||
+++ b/src/view/com/auth/SplashScreen.web.tsx
|
|
||||||
@@ -94,14 +94,6 @@ export const SplashScreen = ({
|
|
||||||
</View>
|
|
||||||
)}
|
|
||||||
|
|
||||||
- <Text
|
|
||||||
- style={[
|
|
||||||
- a.text_md,
|
|
||||||
- a.font_semi_bold,
|
|
||||||
- t.atoms.text_contrast_medium,
|
|
||||||
- ]}>
|
|
||||||
- <Trans>What's up?</Trans>
|
|
||||||
- </Text>
|
|
||||||
</View>
|
|
||||||
|
|
||||||
<View
|
|
||||||