fix install.zsh

2025-12-06 12:53:56 +09:00
parent ce9abf1ef9
commit 9e284d1a18
4 changed files with 261 additions and 229 deletions
--- a/icons/title.svg
+++ b/icons/title.svg
--- a/icons/Logotype.tsx
+++ b/icons/Logotype.tsx
@@ -1,52 +0,0 @@
-import React from 'react'
-import Svg, {Path, SvgProps, PathProps} 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)
-
-  return (
-    <Svg
-      fill="none"
-      viewBox="0 0 2821.6379 794.29016"
-      {...rest}
-      width={size}
-      height={Number(size) * ratio}>
-      <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>
-  )
-}
--- a/install.zsh
+++ b/install.zsh
@@ -1,24 +1,26 @@
 #!/bin/zsh

-# ./install.zsh $HOST
-repos_v='{}'
 function at-repos-env() {
-	host=$1
-	if [ -z "$1" ];then
-		host=syu.is
-	fi
+	host=syu.is
 	did=did:plc:6qyecktefllvenje24fcxnie
-	icon=https://git.syui.ai/ai/at/raw/branch/main/icons/Logotype.tsx
 	repos=(
-		https://github.com/did-method-plc/did-method-plc
-		https://github.com/bluesky-social/indigo
-		https://github.com/bluesky-social/atproto
-		https://github.com/bluesky-social/social-app
-		https://github.com/bluesky-social/feed-generator
-		https://github.com/bluesky-social/ozone
-		https://github.com/bluesky-social/jetstream
+		"https://github.com/did-method-plc/did-method-plc"
+		"https://github.com/bluesky-social/indigo"
+		"https://github.com/bluesky-social/atproto"
+		"https://github.com/bluesky-social/social-app"
+		"https://github.com/bluesky-social/feed-generator"
+		"https://github.com/bluesky-social/ozone"
+		"https://github.com/bluesky-social/jetstream"
+	)
+	services=(
+		"bsky"
+		"plc"
+		"pds"
+		"jetstream"
+		"bgs"
+		"ozone"
+		"social-app"
 	)
-	services=( bsky plc pds jetstream bgs ozone social-app )
 	d=${0:a:h}
 	dh=${0:a:h:h}
 	name=${host%%.*}
@@ -26,28 +28,24 @@ function at-repos-env() {
 	dport=5000
 }

-function at-repos-json() {
-	f=~/.config/atproto/token.json
-	j="{ \"did\": \"did:plc:6qyecktefllvenje24fcxnie\", \"didDoc\": { \"service\": [ { \"serviceEndpoint\": \"https://syu.is\" } ] }, \"handle\": \"ai.syu.is\", \"accessJwt\": \"xxx\" }"
-	if [ ! -f "$f" ];then
-		mkdir -p ~/.config/atproto
-		echo $j >> $f
-	fi
-	echo $f
-}
+# Arrays for patch management
+typeset -a FAILED_PATCHES

-function at-repos-token() {
-	at-repos-json
-	if [ -z "$host" ] && [ -f $f ];then
-		host=`cat $f|jq -r ".didDoc.service.[].serviceEndpoint"`
-		handle=`cat $f|jq -r ".handle"`
-		did=`cat $f|jq -r ".did"`
-		token=`cat $f|jq -r ".token"`
-		host=${host##*/}
-	fi
-	name=${host%%.*}
-	domain=${host##*.}
-}
+# Patch file lists
+typeset -a PATCH_FILES_CURL
+PATCH_FILES_CURL=(
+	"4367-atproto-services-bsky-api.diff:https://raw.githubusercontent.com/bluesky-social/atproto/refs/heads/main/services/bsky/api.js:services/bsky/api.js"
+	"4367-atproto-services-pds-index.diff:https://raw.githubusercontent.com/bluesky-social/atproto/refs/heads/main/services/pds/index.js:services/pds/index.js"
+)
+
+typeset -a PATCH_FILES
+PATCH_FILES=(
+	"170-pds-oauth-same-site-fix.patch"
+	"8980-social-app-disable-proxy.diff"
+	"disable-statsig-sdk.diff"
+	"140-social-app-yarn-network-timeout.patch"
+	"130-atproto-ozone-enable-daemon-v2.patch"
+)

 function at-repos-clone() {
 	if [ ! -d $d/repos ];then
@@ -90,18 +88,6 @@ function at-repos-pull() {
 	cd $d
 }

-function at-repos-social-app-icon() {
-	curl -sL https://raw.githubusercontent.com/bluesky-social/social-app/main/src/view/icons/Logotype.tsx -o $d/repos/social-app/src/view/icons/Logotype.tsx
-	if [ -d $d/icons ];then
-		mkdir -p $d/icons
-	fi
-	cp -rf $d/repos/social-app/src/view/icons/Logotype.tsx $d/icons/
-}
-
-function at-repos-social-app-icon-origin() {
-	curl -sL $icon -o $d/icons/Logotype.tsx
-}
-
 function at-repos-social-app-avatar-write() {
 	did_admin=did:plc:6qyecktefllvenje24fcxnie
 	dt=$d/repos/social-app/src
@@ -128,155 +114,185 @@ function at-repos-social-app-avatar-write() {
 	grep -R $did_admin .|cut -d : -f 1|sort -u|xargs sed -i "s/${did_admin}/${did}/g"
 }

-function at-repos-atproto-service-bsky-api-patch() {
-	#	https://github.com/itaru2622/bluesky-selfhost-env/blob/master/patching/105-atproto-services-for-docker.diff
-	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
-	d_=$d/repos/atproto
-	p_=$d/patching/4367-atproto-services-bsky-api.diff
-	echo "applying patch: under ${f} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
+# Common patch function with status detection
+function apply-patch() {
+	local patch_name=$1
+	local target_dir=$2
+	local patch_file=$3
+
+	echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+	echo "📝 Patch: ${patch_name}"
+	echo "   Target: ${target_dir}"
+	echo "   File: ${patch_file}"
+
+	pushd ${target_dir} > /dev/null
+
+	# Check if patch is already applied (reverse dry-run succeeds)
+	if patch --dry-run -p1 -R < ${patch_file} > /dev/null 2>&1; then
+		echo "✅ Already applied - skipping"
+		popd > /dev/null
+		echo ""
+		return 0
+	fi
+
+	# Check if patch can be applied (forward dry-run succeeds)
+	if patch --dry-run -p1 < ${patch_file} > /dev/null 2>&1; then
+		echo "🔧 Applying patch..."
+		if patch -p1 < ${patch_file}; then
+			echo "✅ Applied successfully"
+			popd > /dev/null
+			echo ""
+			return 0
+		else
+			echo "❌ Failed to apply"
+			FAILED_PATCHES+=("${patch_name} (${patch_file})")
+			popd > /dev/null
+			echo ""
+			return 1
+		fi
+	else
+		echo "⚠️  Cannot apply - file may have been modified"
+		echo "   Please check manually"
+		FAILED_PATCHES+=("${patch_name} (${patch_file}) - file modified")
+		popd > /dev/null
+		echo ""
+		return 1
+	fi
 }

-function at-repos-atproto-service-pds-index-patch() {
-	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
-	d_=$d/repos/atproto
-	p_=$d/patching/4367-atproto-services-pds-index.diff
-	echo "applying patch: under ${f} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
+# Function to display failed patches summary
+function show-failed-patches() {
+	if [ ${#FAILED_PATCHES[@]} -eq 0 ]; then
+		echo ""
+		echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+		echo "✅ All patches applied successfully!"
+		echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+		echo ""
+		return 0
+	fi
+
+	echo ""
+	echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+	echo "⚠️  FAILED PATCHES SUMMARY"
+	echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+	echo ""
+	echo "The following patches could not be applied:"
+	echo ""
+	for failed_patch in "${FAILED_PATCHES[@]}"; do
+		echo "  ❌ ${failed_patch}"
+	done
+	echo ""
+	echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+	echo ""
 }

-function at-repos-atproto-oauth-same-site-patch() {
-	f=$d/repos/atproto/packages/oauth/oauth-provider/src/router/create-authorization-page-middleware.ts
-	d_=$d/repos/atproto
-	p_=$d/patching/170-pds-oauth-same-site-fix.patch
-	echo "applying patch: under ${f} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
+# Helper function for applying patches
+function patch-apply() {
+	local name=$1
+	local target=$2
+	local patch_file=$3
+	apply-patch "${name}" "$d/repos/${target}" "$d/patching/${patch_file}"
 }

-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
+# Helper function for patches with curl download
+function patch-apply-with-curl() {
+	local name=$1
+	local target=$2
+	local patch_file=$3
+	local download_url=$4
+	local download_target=$5
+
+	curl -sL "${download_url}" -o "$d/repos/${target}/${download_target}"
+	apply-patch "${name}" "$d/repos/${target}" "$d/patching/${patch_file}"
 }

-function at-repos-social-app-disable-external-services-patch() {
-	f=$d/repos/social-app/src/state/geolocation/const.ts
-	p_=$d/patching/8980-social-app-disable-external-services.diff
-	d_=$d/repos/social-app
-	echo "applying patch: under ${f} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
-}
+# Auto-apply patches from list
+function at-repos-patch-apply-all() {
+	# Apply curl patches
+	for patch_info in "${PATCH_FILES_CURL[@]}"; do
+		local filename="${patch_info%%:*}"
+		local rest="${patch_info#*:}"
+		local download_url="${rest%%:*}"
+		local download_target="${rest#*:}"

-function at-repos-social-app-statsig-patch() {
-	f=$d/repos/social-app/src/lib/statsig/statsig.tsx
-	p_=$d/patching/disable-statsig-sdk.diff
-	d_=$d/repos/social-app
-	echo "applying patch: under ${f} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
-}
+		local title="${filename%.*}"
+		local repo=""

-function at-repos-social-app-dockerfile-yarn-timeout-patch() {
-	f=$d/repos/social-app/Dockerfile
-	p_=$d/patching/140-social-app-yarn-network-timeout.patch
-	d_=$d/repos/social-app
-	echo "applying patch: under ${f} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
-}
+		# Determine repo from filename
+		if [[ $filename == *"atproto"* ]]; then
+			repo="atproto"
+		elif [[ $filename == *"pds"* ]]; then
+			repo="atproto"
+		fi

-function at-repos-atproto-service-ozone-api-patch() {
-	f=$d/repos/atproto/services/ozone/api.js
-	d_=$d/repos/atproto
-	p_=$d/patching/130-atproto-ozone-enable-daemon-v2.patch
-	echo "applying patch: under ${f} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
+		patch-apply-with-curl "$title" "$repo" "$filename" "$download_url" "$download_target"
+	done
+
+	# Apply regular patches
+	for filename in "${PATCH_FILES[@]}"; do
+		local title="${filename%.*}"
+		local repo=""
+
+		# Determine repo from filename
+		if [[ $filename == *"social-app"* || $filename == *"statsig"* ]]; then
+			repo="social-app"
+		elif [[ $filename == *"atproto"* ]]; then
+			repo="atproto"
+		elif [[ $filename == *"pds"* ]]; then
+			repo="atproto"
+		fi
+
+		patch-apply "$title" "$repo" "$filename"
+	done
 }

 function at-repos-ozone-patch() {
-	#DOMAIN=syu.is
 	cd $d/repos
 	d_=$d/repos/ozone
 	rm -rf ${d_}
-	p_=$d/patching/120-ozone-runtimeEnvVars.diff
 	git clone https://github.com/bluesky-social/ozone
-	cd ${d_}
-	pushd ${d_}
-	echo "applying patch: under ${d_} for ${p_}"
-	patch -p1 < ${p_}
-	popd

-	p_=$d/patching/122-ozone-enable-daemon.diff
-	echo "applying patch: under ${d_} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
+	apply-patch "Ozone enable daemon" "${d_}" "$d/patching/122-ozone-enable-daemon.diff"

-	p_=$d/patching/130-ozone-skip-did-check.patch
-	echo "applying patch: under ${d_} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
+	if [ -f "$d/patching/150-ozone-plc-fix.patch" ]; then
+		apply-patch "Ozone plc fix" "${d_}" "$d/patching/150-ozone-plc-fix.patch"
+	fi

-	p_=$d/patching/150-ozone-plc-fix.patch
-	echo "applying patch: under ${d_} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
+	if [ -f "$d/patching/160-ozone-oauth-redirect-fix.patch" ]; then
+		apply-patch "Ozone oauth redirect fix" "${d_}" "$d/patching/160-ozone-oauth-redirect-fix.patch"
+	fi

-	p_=$d/patching/160-ozone-oauth-redirect-fix.patch
-	echo "applying patch: under ${d_} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_}
-	popd
+	# Apply constants fix and do additional sed replacements
+	pushd ${d_} > /dev/null
+	if [ -f "$d/patching/121-ozone-constants-fix.patch" ]; then
+		patch -p1 < "$d/patching/121-ozone-constants-fix.patch" 2>/dev/null || true
+	fi

-	p_=$d/patching/121-ozone-constants-fix.patch
-	echo "applying patch: under ${d_} for ${p_}"
-	pushd ${d_}
-	patch -p1 < ${p_} || true
 	# Replace process.env with env()
-	sed -i 's/process\.env\.\(NEXT_PUBLIC_[A-Z_]*\)/env('\''\1'\'')/g' lib/constants.ts
-	sed -i 's/process\.env\.NODE_ENV/env('\''NODE_ENV'\'')/g' lib/constants.ts
+	sed -i 's/process\.env\.\(NEXT_PUBLIC_[A-Z_]*\)/env('\''\1'\'')/g' lib/constants.ts 2>/dev/null || true
+	sed -i 's/process\.env\.NODE_ENV/env('\''NODE_ENV'\'')/g' lib/constants.ts 2>/dev/null || true
 	# Add missing SOCIAL_APP_DOMAIN constant after SOCIAL_APP_URL
 	sed -i '/^export const SOCIAL_APP_URL =/,/^$/{ /^$/a\
 export const SOCIAL_APP_DOMAIN =\
  env('\''NEXT_PUBLIC_SOCIAL_APP_DOMAIN'\'') || '\''bsky.app'\''\

-	}' lib/constants.ts
+	}' lib/constants.ts 2>/dev/null || true
 	# Fix multiline process.env patterns
 	sed -i '/^export const NEW_ACCOUNT_MARKER_THRESHOLD_IN_DAYS = process\.env$/,/^  : 7$/ {
 		s/^export const NEW_ACCOUNT_MARKER_THRESHOLD_IN_DAYS = process\.env$/export const NEW_ACCOUNT_MARKER_THRESHOLD_IN_DAYS = env('\''NEXT_PUBLIC_NEW_ACCOUNT_MARKER_THRESHOLD_IN_DAYS'\'')/
 		/^  \.NEXT_PUBLIC_NEW_ACCOUNT_MARKER_THRESHOLD_IN_DAYS$/d
-	}' lib/constants.ts
+	}' lib/constants.ts 2>/dev/null || true
 	sed -i '/^export const YOUNG_ACCOUNT_MARKER_THRESHOLD_IN_DAYS = process\.env$/,/^  : 30$/ {
 		s/^export const YOUNG_ACCOUNT_MARKER_THRESHOLD_IN_DAYS = process\.env$/export const YOUNG_ACCOUNT_MARKER_THRESHOLD_IN_DAYS = env('\''NEXT_PUBLIC_YOUNG_ACCOUNT_MARKER_THRESHOLD_IN_DAYS'\'')/
 		/^  \.NEXT_PUBLIC_YOUNG_ACCOUNT_MARKER_THRESHOLD_IN_DAYS$/d
-	}' lib/constants.ts
+	}' lib/constants.ts 2>/dev/null || true
 	sed -i '/^export const HIGH_PROFILE_FOLLOWER_THRESHOLD = process\.env$/,/^  : Infinity$/ {
 		s/^export const HIGH_PROFILE_FOLLOWER_THRESHOLD = process\.env$/export const HIGH_PROFILE_FOLLOWER_THRESHOLD = env('\''NEXT_PUBLIC_HIGH_PROFILE_FOLLOWER_THRESHOLD'\'')/
 		/^  \.NEXT_PUBLIC_HIGH_PROFILE_FOLLOWER_THRESHOLD$/d
-	}' lib/constants.ts
+	}' lib/constants.ts 2>/dev/null || true
 	# Fix parseInt() to handle undefined by adding || ''
-	sed -i "s/parseInt(env('\([^']*\)'))/parseInt(env('\1') || '0')/g" lib/constants.ts
-	popd
+	sed -i "s/parseInt(env('\([^']*\)'))/parseInt(env('\1') || '0')/g" lib/constants.ts 2>/dev/null || true
+	popd > /dev/null
 }

 function at-repos-build-docker-atproto() {
@@ -312,6 +328,10 @@ function at-repos-push-docker() {
 			service=${services[$i]}
 			docker tag at-${service}:latest localhost:${dport}/${service}:latest
 			docker push localhost:${dport}/${service}:latest
+			if [ "$service" == "ozone" ]];then
+				docker tag at-${service}-web:latest localhost:${dport}/${service}-web:latest
+				docker push localhost:${dport}/${service}-web:latest
+			fi
 		done
 	else
 		docker tag at-${1}:latest localhost:${dport}/${1}:latest
@@ -326,38 +346,51 @@ function at-repos-pull-docker() {
 }

 at-repos-env
+case "$1" in 
+	pull)
+		at-repos-clone
+		at-repos-pull
+		exit
+		;;
+	patch)
+		at-repos-social-app-avatar-write
+		at-repos-patch-apply-all
+		at-repos-ozone-patch
+		show-failed-patches
+		exit
+		;;
+	build)
+		at-repos-build-docker-atproto $2
+		exit
+		;;
+	push)
+		at-repos-push-docker $2
+		exit
+		;;
+	reset)
+		at-repos-push-reset
+		exit
+		;;
+	down)
+		cd $d;docker compose down
+		exit
+		;;
+esac
+
 case "`cat /etc/hostname`" in
 	at)
 		at-repos-pull-docker
 		exit
 		;;
 	*)
-		if [ "$1" = "r" ];then
-			at-repos-push-reset
-			exit
-		fi
 		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-social-app-agent-patch
-		at-repos-social-app-disable-external-services-patch
-		at-repos-social-app-statsig-patch
-		at-repos-social-app-dockerfile-yarn-timeout-patch
-		at-repos-atproto-service-bsky-api-patch
-		at-repos-atproto-service-pds-index-patch
-		at-repos-atproto-oauth-same-site-patch
-		at-repos-atproto-service-ozone-api-patch
+		at-repos-patch-apply-all
 		at-repos-ozone-patch
-		if [ -n "$1" ];then
-			at-repos-build-docker-atproto $1
-			at-repos-push-docker $1
-			exit
-		fi
+		show-failed-patches
 		at-repos-build-docker-atproto
 		at-repos-push-docker
 		cd $d; docker compose down
 		;;
 esac
-
--- a/patching/180-social-app-logotype.patch
+++ b/patching/180-social-app-logotype.patch
@@ -0,0 +1,51 @@
+--- src/view/icons/Logotype.tsx	2025-12-03 22:43:39
+++ /Users/syui/ai/at/patching/Logotype.tsx	2025-12-06 13:05:03
+@@ -1,4 +1,5 @@
+-import Svg, {Path, type PathProps, type SvgProps} from 'react-native-svg'
+import React from 'react'
+import Svg, {Path, SvgProps, PathProps} from 'react-native-svg'
+ 
+ import {usePalette} from '#/lib/hooks/usePalette'
+ 
+@@ -15,14 +16,37 @@
+   return (
+     <Svg
+       fill="none"
+-      viewBox="0 0 64 17"
+      viewBox="0 0 2821.6379 794.29016"
+       {...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"
+      <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>
+   )
+ }