fix patch test

README.md

@@ -11,7 +11,7 @@
 |[at]mosphere|system|pds, bsky(appview), ozone, bgs, plc|
 |[a]uthenticated [t]ransfer|protocol|[did](https://www.w3.org/TR/did-core/)|
 
-- https://atproto.com/ja/guides/glossary
+- https://atproto.com/guides/glossary
 
 ## account
 
@@ -41,8 +41,8 @@ $ curl -sL "syu.is/xrpc/com.atproto.repo.listRecords?repo=${handle}&collection=a
 
 > at://did:plc:6qyecktefllvenje24fcxnie/app.bsky.feed.generator/app
 
-- https://syu.is/profile/ai.syui.ai/feed/app
-- https://feed.syu.is/xrpc/app.bsky.feed.getFeedSkeleton?feed=at://did:plc:4hqjfn7m6n5hno3doamuhgef/app.bsky.feed.generator/app
+- https://syu.is/profile/did:plc:6qyecktefllvenje24fcxnie/feed/app
+- https://feed.syu.is/xrpc/app.bsky.feed.getFeedSkeleton?feed=at://did:plc:6qyecktefllvenje24fcxnie/app.bsky.feed.generator/app
 
 ```json
 {

install.zsh

@@ -54,10 +54,8 @@ function at-repos-env() {
 	dport=5000
 
 	typeset -A PINNED_COMMITS
-	PINNED_COMMITS=(
-		[indigo]="d49b454196351c988ceb5ce1f5e21b689487b5ab"
-		[atproto]="104e6ed37b0589cc000109dc76316be35b2257e1"
-	)
+	PINNED_COMMITS=()
+	#PINNED_COMMITS=( [indigo]="d49b454196351c988ceb5ce1f5e21b689487b5ab" [atproto]="104e6ed37b0589cc000109dc76316be35b2257e1")
 }
 
 # Arrays for patch management
@@ -77,6 +75,7 @@ PATCH_FILES=(
 	"disable-statsig-sdk.diff"
 	"140-social-app-yarn-network-timeout.patch"
 	"130-atproto-ozone-enable-daemon-v2.patch"
+	"152-indigo-newpds-dayper-limit-pr707.diff"
 	"190-bgs-disable-ratelimit.patch"
 	"200-feed-generator-custom.patch"
 )
@@ -266,16 +265,21 @@ function at-repos-patch-apply-all() {
 		local repo=""
 
 		# Determine repo from filename
+		# Note: check indigo/bgs BEFORE pds to avoid "newpds" matching "pds"
 		if [[ $filename == *"social-app"* || $filename == *"statsig"* ]]; then
 			repo="social-app"
+		elif [[ $filename == *"indigo"* || $filename == *"bgs"* ]]; then
+			repo="indigo"
 		elif [[ $filename == *"atproto"* ]]; then
 			repo="atproto"
 		elif [[ $filename == *"pds"* ]]; then
 			repo="atproto"
-		elif [[ $filename == *"indigo"* || $filename == *"bgs"* ]]; then
-			repo="indigo"
 		elif [[ $filename == *"feed"* ]]; then
 			repo="feed-generator"
+			# feed-generatorパッチ適用前に既存のDockerfileを削除（upstreamと競合回避）
+			if [[ $filename == "200-feed-generator-custom.patch" ]]; then
+				rm -f "$d/repos/feed-generator/Dockerfile"
+			fi
 		fi
 
 		patch-apply "$title" "$repo" "$filename"
@@ -331,6 +335,54 @@ export const SOCIAL_APP_DOMAIN =\
 	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"
+	echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+}
+
 function at-repos-build-docker-atproto() {
 	cd $d
 	docker image prune -a
@@ -430,7 +482,7 @@ function at-repos-reset-bgs-db() {
 		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}\"}" \
+			-d "{\"hostname\":\"${host}\"}" \
 			-w "%{http_code}" -o /dev/null)
 		if [ "$result" = "200" ]; then
 			echo "✅ PDS crawl requested successfully"
@@ -533,6 +585,7 @@ case "$1" in
 		at-repos-social-app-ios-patch
 		at-repos-patch-apply-all
 		at-repos-ozone-patch
+		at-repos-feed-generator-newfiles
 		show-failed-patches
 		exit
 		;;
@@ -561,7 +614,7 @@ esac
 case "`cat /etc/hostname`" in
 	at)
 		if [ "$1" = "bgs-reset" ];then
-			at-repos-reset-bgs-db
+			# at-repos-reset-bgs-db
 			exit
 		fi
 		at-repos-pull-docker
@@ -574,6 +627,7 @@ case "`cat /etc/hostname`" in
 		at-repos-social-app-ios-patch
 		at-repos-patch-apply-all
 		at-repos-ozone-patch
+		at-repos-feed-generator-newfiles
 		show-failed-patches
 		at-repos-build-docker-atproto
 		at-repos-push-docker

ios/README.md

@@ -1,9 +1,7 @@
 今回の./ios (social-app)開発の要点をまとめます。
 
 1. MITのライセンスを遵守すること、iosアプリとして出品しても問題ないようにすること
-https://raw.githubusercontent.com/bluesky-social/social-app/refs/heads/main/LICENSE
-
 2. "Bluesky"という名称を使用しないこと。アイコンの変更。リンクの変更
+3. selfhostでも動くこと。
 
-3. selfhostでも動くこと。これはすでにpatchで実現しています。
-
+https://raw.githubusercontent.com/bluesky-social/social-app/refs/heads/main/LICENSE

ios/build.zsh

@@ -78,11 +78,11 @@ function cleanup_build {
 
 	# 3. CocoaPods
 	echo "3. Installing CocoaPods..."
-	# Ensure PATH includes Homebrew ruby gems if needed
-	export PATH="/opt/homebrew/lib/ruby/gems/3.4.0/bin:$PATH"
+	if [ -z "$1" ];then
 		cd ios
 		pod install
 		cd ..
+	fi
 
 	# 4. Signing (Automated)
 	echo "4. Configuring Xcode Signing..."
@@ -132,6 +132,9 @@ EOF
 
 case $1 in
 	i)
+		echo "Skipping cleanup_build..."
+		;;
+	*)
 		cleanup_build
 		;;
 esac
@@ -167,8 +170,15 @@ 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
-  echo "Error: store.mobileprovision not found at $MOBILEPROVISION"
+  # 親ディレクトリからコピーを試みる
+  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

ios/patching/005-social-app-ios-screens.patch

@@ -32,7 +32,7 @@ index 77f219e55..53f5e0cc0 100644
 -                    to="https://bsky.social/about/support/tos"
 +                    label={_(msg`syu.is Terms of Service`)}
 +                    to="https://syu.is/about/support/tos"
-                     style={[a.text_md, a.leading_normal]}>
+                     style={[a.text_md, a.leading_snug]}>
 -                    Bluesky Social Terms of Service
 +                    syu.is Terms of Service
                    </SimpleInlineLinkText>

ios/patching/013-social-app-ios-settings-remove-help.patch

@@ -1,8 +1,8 @@
 diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx
-index 6b0e184c0..42b609c9e 100644
+index 2fa5aa7de..3faf6a7b3 100644
 --- a/src/screens/Settings/Settings.tsx
 +++ b/src/screens/Settings/Settings.tsx
-@@ -203,24 +203,8 @@ export function SettingsScreen({}: Props) {
+@@ -205,26 +205,8 @@ export function SettingsScreen({}: Props) {
                <Trans>Notifications</Trans>
              </SettingsList.ItemText>
            </SettingsList.LinkItem>
@@ -14,7 +14,9 @@ index 6b0e184c0..42b609c9e 100644
 -              <Trans>Content and media</Trans>
 -            </SettingsList.ItemText>
 -          </SettingsList.LinkItem>
--          {isNative && findContactsEnabled && (
+-          {isNative &&
+-            findContactsEnabled &&
+-            !gate('disable_settings_find_contacts') && (
 -              <SettingsList.LinkItem
 -                to="/settings/find-contacts"
 -                label={_(msg`Find friends from contacts`)}>
@@ -24,12 +26,12 @@ index 6b0e184c0..42b609c9e 100644
 -                </SettingsList.ItemText>
 -              </SettingsList.LinkItem>
 -            )}
-+{/* Content and media removed for syu.is */}
-+{/* Find friends from contacts removed for syu.is */}
++          {/* Content and media removed for syu.is */}
++          {/* Find friends from contacts removed for syu.is */}
            <SettingsList.LinkItem
              to="/settings/appearance"
              label={_(msg`Appearance`)}>
-@@ -245,16 +229,6 @@ export function SettingsScreen({}: Props) {
+@@ -249,16 +231,6 @@ export function SettingsScreen({}: Props) {
                <Trans>Languages</Trans>
              </SettingsList.ItemText>
            </SettingsList.LinkItem>

ios/patching/037-social-app-ios-disable-contacts-nux.patch

@@ -1,13 +1,13 @@
-diff --git a/src/components/dialogs/nuxs/index.tsx b/src/components/dialogs/nuxs/index.tsx
+diff --git a/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx b/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx
 index 63e11a7f4..70fa993cf 100644
---- a/src/components/dialogs/nuxs/index.tsx
-+++ b/src/components/dialogs/nuxs/index.tsx
-@@ -46,7 +46,7 @@ const queuedNuxs: {
-     enabled: ({currentProfile}) => {
-       return (
+--- a/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx
++++ b/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx
+@@ -25,7 +25,7 @@ export const enabled = createIsEnabledCheck(props => {
+     !IS_E2E &&
      isNative &&
--        isExistingUserAsOf('2025-12-16T00:00:00.000Z', currentProfile.createdAt)
-+        isExistingUserAsOf('2099-12-16T00:00:00.000Z', currentProfile.createdAt)
-       )
-     },
-   },
+     isExistingUserAsOf(
+-      '2025-12-16T00:00:00.000Z',
++      '2099-12-16T00:00:00.000Z',
+       props.currentProfile.createdAt,
+     ) &&
+     isFindContactsFeatureEnabled(props.geolocation.countryCode)

ios/preview.zsh

@@ -70,8 +70,6 @@ npx expo prebuild --platform ios --clean
 
 # 3. CocoaPods
 echo "3. Installing CocoaPods..."
-# Ensure PATH includes Homebrew ruby gems if needed
-export PATH="/opt/homebrew/lib/ruby/gems/3.4.0/bin:$PATH"
 cd ios
 pod install
 cd ..

patching/152-indigo-newpds-dayper-limit-pr707.diff

@@ -0,0 +1,106 @@
+diff --git a/bgs/bgs.go b/bgs/bgs.go
+index 35dfab9d..7e225f6c 100644
+--- a/bgs/bgs.go
++++ b/bgs/bgs.go
+@@ -112,6 +112,7 @@ type BGSConfig struct {
+ 	DefaultRepoLimit     int64
+ 	ConcurrencyPerPDS    int64
+ 	MaxQueuePerPDS       int64
++	InitialNewPDSPerDayLimit int64
+ 	NumCompactionWorkers int
+ }
+ 
+@@ -122,6 +123,7 @@ func DefaultBGSConfig() *BGSConfig {
+ 		DefaultRepoLimit:     100,
+ 		ConcurrencyPerPDS:    100,
+ 		MaxQueuePerPDS:       1_000,
++	        InitialNewPDSPerDayLimit: 10,
+ 		NumCompactionWorkers: 2,
+ 	}
+ }
+@@ -159,6 +161,7 @@ func NewBGS(db *gorm.DB, ix *indexer.Indexer, repoman *repomgr.RepoManager, evtm
+ 	slOpts.DefaultRepoLimit = config.DefaultRepoLimit
+ 	slOpts.ConcurrencyPerPDS = config.ConcurrencyPerPDS
+ 	slOpts.MaxQueuePerPDS = config.MaxQueuePerPDS
++	slOpts.DefaultNewPDSPerDayLimit = config.InitialNewPDSPerDayLimit
+ 	s, err := NewSlurper(db, bgs.handleFedEvent, slOpts)
+ 	if err != nil {
+ 		return nil, err
+diff --git a/bgs/fedmgr.go b/bgs/fedmgr.go
+index 42ce7407..9072ba05 100644
+--- a/bgs/fedmgr.go
++++ b/bgs/fedmgr.go
+@@ -45,6 +45,7 @@ type Slurper struct {
+ 	MaxQueuePerPDS    int64
+ 
+ 	NewPDSPerDayLimiter *slidingwindow.Limiter
++	initialNewPDSPerDayLimit   int64
+ 
+ 	newSubsDisabled bool
+ 	trustedDomains  []string
+@@ -70,6 +71,7 @@ type SlurperOptions struct {
+ 	DefaultRepoLimit      int64
+ 	ConcurrencyPerPDS     int64
+ 	MaxQueuePerPDS        int64
++	DefaultNewPDSPerDayLimit int64
+ }
+ 
+ func DefaultSlurperOptions() *SlurperOptions {
+@@ -82,6 +84,7 @@ func DefaultSlurperOptions() *SlurperOptions {
+ 		DefaultRepoLimit:      100,
+ 		ConcurrencyPerPDS:     100,
+ 		MaxQueuePerPDS:        1_000,
++		DefaultNewPDSPerDayLimit: 10,
+ 	}
+ }
+ 
+@@ -112,6 +115,7 @@ func NewSlurper(db *gorm.DB, cb IndexCallback, opts *SlurperOptions) (*Slurper,
+ 		ssl:                   opts.SSL,
+ 		shutdownChan:          make(chan bool),
+ 		shutdownResult:        make(chan []error),
++		initialNewPDSPerDayLimit:     opts.DefaultNewPDSPerDayLimit,
+ 	}
+ 	if err := s.loadConfig(); err != nil {
+ 		return nil, err
+@@ -224,13 +228,15 @@ func (s *Slurper) loadConfig() error {
+ 	}
+ 
+ 	if sc.ID == 0 {
+-		if err := s.db.Create(&SlurpConfig{}).Error; err != nil {
++		sc.NewPDSPerDayLimit = s.initialNewPDSPerDayLimit
++		if err := s.db.Create(&SlurpConfig{ NewPDSPerDayLimit: s.initialNewPDSPerDayLimit, }).Error; err != nil {
+ 			return err
+ 		}
+ 	}
+ 
+ 	s.newSubsDisabled = sc.NewSubsDisabled
+ 	s.trustedDomains = sc.TrustedDomains
++	s.initialNewPDSPerDayLimit = sc.NewPDSPerDayLimit
+ 
+ 	s.NewPDSPerDayLimiter, _ = slidingwindow.NewLimiter(time.Hour*24, sc.NewPDSPerDayLimit, windowFunc)
+ 
+diff --git a/cmd/bigsky/main.go b/cmd/bigsky/main.go
+index 540796f5..cb946aed 100644
+--- a/cmd/bigsky/main.go
++++ b/cmd/bigsky/main.go
+@@ -195,6 +195,12 @@ func run(args []string) error {
+ 			EnvVars: []string{"RELAY_EVENT_PLAYBACK_TTL"},
+ 			Value:   72 * time.Hour,
+ 		},
++		&cli.Int64Flag{
++			Name:    "newpds-perday-limit",
++			EnvVars: []string{"RELAY_NEWPDS_PERDAY_LIMIT"},
++			Value:   10,
++			Usage:   "initial value for NewPDSPerDayLimit",
++		},
+ 		&cli.IntFlag{
+ 			Name:    "num-compaction-workers",
+ 			EnvVars: []string{"RELAY_NUM_COMPACTION_WORKERS"},
+@@ -418,6 +424,7 @@ func runBigsky(cctx *cli.Context) error {
+ 	bgsConfig.ConcurrencyPerPDS = cctx.Int64("concurrency-per-pds")
+ 	bgsConfig.MaxQueuePerPDS = cctx.Int64("max-queue-per-pds")
+ 	bgsConfig.DefaultRepoLimit = cctx.Int64("default-repo-limit")
++	bgsConfig.InitialNewPDSPerDayLimit = cctx.Int64("newpds-perday-limit")
+ 	bgsConfig.NumCompactionWorkers = cctx.Int("num-compaction-workers")
+ 	bgs, err := libbgs.NewBGS(db, ix, repoman, evtman, cachedidr, rf, hr, bgsConfig)
+ 	if err != nil {