add patch social-app
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +1,2 @@
|
|||||||
repos
|
repos
|
||||||
|
.claude
|
||||||
|
|||||||
@@ -1 +1,3 @@
|
|||||||
ATP_APPVIEW_HOST=https://bsky.${host}
|
ATP_APPVIEW_HOST=https://public.api.bsky.app
|
||||||
|
EXPO_PUBLIC_BLUESKY_PROXY_DID=did:web:api.bsky.app
|
||||||
|
EXPO_PUBLIC_ENV=production
|
||||||
|
|||||||
88
install.zsh
88
install.zsh
@@ -73,6 +73,7 @@ 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##*/}
|
||||||
|
git stash
|
||||||
if ! git pull;then
|
if ! git pull;then
|
||||||
rm -rf $d/repos/${repo##*/}
|
rm -rf $d/repos/${repo##*/}
|
||||||
at-repos-clone
|
at-repos-clone
|
||||||
@@ -100,9 +101,8 @@ function at-repos-social-app-icon-origin() {
|
|||||||
curl -sL $icon -o $d/icons/Logotype.tsx
|
curl -sL $icon -o $d/icons/Logotype.tsx
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-social-app-write() {
|
function at-repos-social-app-avatar-write() {
|
||||||
did_admin=did:plc:6qyecktefllvenje24fcxnie
|
did_admin=did:plc:6qyecktefllvenje24fcxnie
|
||||||
|
|
||||||
dt=$d/repos/social-app/src
|
dt=$d/repos/social-app/src
|
||||||
cd $dt
|
cd $dt
|
||||||
grep -R syu.is .|cut -d : -f 1|sort -u|xargs sed -i "s/syu.is/${host}/g"
|
grep -R syu.is .|cut -d : -f 1|sort -u|xargs sed -i "s/syu.is/${host}/g"
|
||||||
@@ -123,7 +123,7 @@ function at-repos-social-app-write() {
|
|||||||
grep -R $did_admin .|cut -d : -f 1|sort -u|xargs sed -i "s/${did_admin}/${did}/g"
|
grep -R $did_admin .|cut -d : -f 1|sort -u|xargs sed -i "s/${did_admin}/${did}/g"
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-service-bsky-api-patch() {
|
function at-repos-atproto-service-bsky-api-patch() {
|
||||||
# https://github.com/itaru2622/bluesky-selfhost-env/blob/master/patching/105-atproto-services-for-docker.diff
|
# https://github.com/itaru2622/bluesky-selfhost-env/blob/master/patching/105-atproto-services-for-docker.diff
|
||||||
f=$d/repos/atproto/services/bsky/api.js
|
f=$d/repos/atproto/services/bsky/api.js
|
||||||
curl -sL https://raw.githubusercontent.com/bluesky-social/atproto/refs/heads/main/services/bsky/api.js -o $f
|
curl -sL https://raw.githubusercontent.com/bluesky-social/atproto/refs/heads/main/services/bsky/api.js -o $f
|
||||||
@@ -135,7 +135,7 @@ function at-service-bsky-api-patch() {
|
|||||||
popd
|
popd
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-service-pds-index-patch() {
|
function at-repos-atproto-service-pds-index-patch() {
|
||||||
f=$d/repos/atproto/services/pds/index.js
|
f=$d/repos/atproto/services/pds/index.js
|
||||||
curl -sL https://raw.githubusercontent.com/bluesky-social/atproto/refs/heads/main/services/pds/index.js -o $f
|
curl -sL https://raw.githubusercontent.com/bluesky-social/atproto/refs/heads/main/services/pds/index.js -o $f
|
||||||
d_=$d/repos/atproto
|
d_=$d/repos/atproto
|
||||||
@@ -146,7 +146,17 @@ function at-service-pds-index-patch() {
|
|||||||
popd
|
popd
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-social-app-patch() {
|
function at-repos-social-app-agent-patch() {
|
||||||
|
f=$d/repos/social-app/src/state/session/agent.ts
|
||||||
|
p_=$d/patching/8980-social-app-disable-proxy.diff
|
||||||
|
d_=$d/repos/social-app
|
||||||
|
echo "applying patch: under ${f} for ${p_}"
|
||||||
|
pushd ${d_}
|
||||||
|
patch -p1 < ${p_}
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
function at-repos-social-app-docker-patch() {
|
||||||
f=$d/repos/social-app/Dockerfile
|
f=$d/repos/social-app/Dockerfile
|
||||||
p_=$d/patching/social-app-dockerfile.diff
|
p_=$d/patching/social-app-dockerfile.diff
|
||||||
d_=$d/repos/social-app
|
d_=$d/repos/social-app
|
||||||
@@ -176,19 +186,31 @@ function at-repos-ozone-patch() {
|
|||||||
pushd ${d_}
|
pushd ${d_}
|
||||||
patch -p1 < ${p_}
|
patch -p1 < ${p_}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
#cp -rf $d/repos/atproto/service/ozone/* $d/ozone/service/
|
#cp -rf $d/repos/atproto/service/ozone/* $d/ozone/service/
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-docker() {
|
function at-repos-build-docker-atproto() {
|
||||||
cd $d
|
cd $d
|
||||||
docker compose build
|
docker image prune -a
|
||||||
# docker compose up -d
|
docker compose build --no-cache bsky plc pds jetstream bgs ozone
|
||||||
# docker compose up -d --no-build
|
|
||||||
# docker compose up -d --pull always
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-regi-docker() {
|
function at-repos-build-docker-social() {
|
||||||
|
cd $d
|
||||||
|
docker compose build --no-cache social-app
|
||||||
|
}
|
||||||
|
|
||||||
|
function at-repos-build-docker-tag() {
|
||||||
|
docker restart registry
|
||||||
|
docker stop registry
|
||||||
|
docker rm registry
|
||||||
|
docker volume rm registry-data 2>/dev/null || true
|
||||||
|
docker run -d -p 5000:5000 --name registry \
|
||||||
|
--restart=always \
|
||||||
|
-v registry-data:/var/lib/registry \
|
||||||
|
registry:2
|
||||||
|
sleep 3
|
||||||
|
|
||||||
docker run -d -p ${dport}:${dport} --name registry --restart=always registry:2
|
docker run -d -p ${dport}:${dport} --name registry --restart=always registry:2
|
||||||
docker tag at-pds:latest localhost:${dport}/pds:latest
|
docker tag at-pds:latest localhost:${dport}/pds:latest
|
||||||
docker tag at-ozone-web:latest localhost:${dport}/ozone-web:latest
|
docker tag at-ozone-web:latest localhost:${dport}/ozone-web:latest
|
||||||
@@ -210,19 +232,35 @@ function at-regi-docker() {
|
|||||||
docker push localhost:${dport}/plc:latest
|
docker push localhost:${dport}/plc:latest
|
||||||
docker push localhost:${dport}/social-app:latest
|
docker push localhost:${dport}/social-app:latest
|
||||||
|
|
||||||
docker restart registry
|
cd $d
|
||||||
|
docker compose down
|
||||||
}
|
}
|
||||||
|
|
||||||
at-repos-env
|
function at-repos-pull-docker() {
|
||||||
at-repos-clone
|
cd $d
|
||||||
at-repos-pull
|
docker image prune -a
|
||||||
at-repos-social-app-icon
|
docker compose up -d --pull always
|
||||||
at-repos-social-app-icon-origin
|
}
|
||||||
at-repos-social-app-write
|
|
||||||
at-service-bsky-api-patch
|
|
||||||
at-service-pds-index-patch
|
|
||||||
at-repos-social-app-patch
|
|
||||||
at-repos-ozone-patch
|
|
||||||
at-repos-docker
|
|
||||||
# at-regi-docker
|
|
||||||
|
|
||||||
|
|
||||||
|
at-repos-env
|
||||||
|
|
||||||
|
case "`cat /etc/hostname`" in
|
||||||
|
at)
|
||||||
|
at-repos-pull-docker
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
at-repos-clone
|
||||||
|
at-repos-pull
|
||||||
|
at-repos-social-app-icon
|
||||||
|
at-repos-social-app-icon-origin
|
||||||
|
at-repos-social-app-avatar-write
|
||||||
|
at-repos-atproto-service-bsky-api-patch
|
||||||
|
at-repos-atproto-service-pds-index-patch
|
||||||
|
at-repos-social-app-docker-patch
|
||||||
|
at-repos-social-app-agent-patch
|
||||||
|
at-repos-ozone-patch
|
||||||
|
at-repos-build-docker-atproto
|
||||||
|
at-repos-build-docker-social
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- repos/atproto/services/bsky/api.js 2025-12-03 11:04:54
|
--- a/services/bsky/api.js 2025-12-03 11:04:54
|
||||||
+++ patching/api.js 2025-12-03 11:00:02
|
+++ b/services/bsky/api.js 2025-12-03 11:00:02
|
||||||
@@ -1,62 +1,105 @@
|
@@ -1,62 +1,105 @@
|
||||||
/* eslint-env node */
|
/* eslint-env node */
|
||||||
/* eslint-disable import/order */
|
/* eslint-disable import/order */
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- repos/atproto/services/pds/index.js 2025-12-03 11:04:54
|
--- a/services/pds/index.js 2025-12-03 11:04:54
|
||||||
+++ patching/index.js 2025-12-02 22:11:39
|
+++ b/services/pds/index.js 2025-12-02 22:11:39
|
||||||
@@ -1,5 +1,5 @@
|
@@ -1,5 +1,5 @@
|
||||||
/* eslint-env node */
|
/* eslint-env node */
|
||||||
-
|
-
|
||||||
|
|||||||
44
patching/8980-social-app-disable-proxy.diff
Normal file
44
patching/8980-social-app-disable-proxy.diff
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
diff --git a/src/state/session/agent.ts b/src/state/session/agent.ts
|
||||||
|
index 36d19299b..ba095436a 100644
|
||||||
|
--- a/src/state/session/agent.ts
|
||||||
|
+++ b/src/state/session/agent.ts
|
||||||
|
@@ -39,7 +39,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
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -77,7 +78,8 @@ export async function createAgentAndResume(
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
||||||
|
+ // Disable proxy for self-hosted environments
|
||||||
|
+ // agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
||||||
|
|
||||||
|
return agent.prepare(gates, moderation, onSessionChange)
|
||||||
|
}
|
||||||
|
@@ -112,7 +114,8 @@ export async function createAgentAndLogin(
|
||||||
|
const gates = tryFetchGates(account.did, 'prefer-fresh-gates')
|
||||||
|
const moderation = configureModerationForAccount(agent, account)
|
||||||
|
|
||||||
|
- agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
||||||
|
+ // Disable proxy for self-hosted environments
|
||||||
|
+ // agent.configureProxy(BLUESKY_PROXY_HEADER.get())
|
||||||
|
|
||||||
|
return agent.prepare(gates, moderation, onSessionChange)
|
||||||
|
}
|
||||||
|
@@ -201,7 +204,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(gates, moderation, onSessionChange)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user