diff --git a/.gitignore b/.gitignore index c05e777..bcb2719 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ repos +.claude diff --git a/README.md b/README.md index 661222a..a6bab35 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ # at -https://github.com/bluesky-social/atproto +- https://github.com/bluesky-social/atproto +- https://github.com/bluesky-social/atproto/discussions/2026 |word|name|example| |---|---|---| -|at|uri|at://ai.syu.is| -|@|user|@ai.syu.is| +|at|uri|at://example.com| +|@|user|@example.com| |[at]proto|repo|`git@github.com:bluesky-social/atproto`| |[at]mosphere|system|pds, bsky(appview), ozone, bgs, plc| |[a]uthenticated [t]ransfer|protocol|[did](https://www.w3.org/TR/did-core/)| @@ -14,16 +15,13 @@ https://github.com/bluesky-social/atproto ## account -[@ai.syu.is](https://web.syu.is/profile/ai.syu.is) - +- [ai@syu.is](https://syu.is/profile/did:plc:6qyecktefllvenje24fcxnie) +- [ai@bsky.app](https://bsky.app/profile/did:plc:6qyecktefllvenje24fcxnie) - https://plc.syu.is/did:plc:6qyecktefllvenje24fcxnie -- https://plc.directory/did:plc:ytvoptig4ddshmwdsjmhtcym - -[@yui.syui.ai](https://bsky.app/profile/did:plc:4hqjfn7m6n5hno3doamuhgef) +- https://plc.directory/did:plc:6qyecktefllvenje24fcxnie ```sh $ curl -sL syu.is/xrpc/_health -{"version":"0.4.65"} # latest # https://github.com/bluesky-social/atproto/blob/main/packages/pds/package.json @@ -31,10 +29,11 @@ $ curl -sL https://raw.githubusercontent.com/bluesky-social/atproto/refs/heads/m ``` ```sh -$ curl -sL "syu.is/xrpc/com.atproto.repo.describeRepo?repo=ai.syu.is" |jq -r .did +$ 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=ai.syu.is&collection=app.bsky.feed.post&reverse=true&limit=1" +$ 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"} ``` @@ -46,80 +45,4 @@ $ curl -sL "syu.is/xrpc/com.atproto.repo.listRecords?repo=ai.syu.is&collection=a - https://feed.syu.is/xrpc/app.bsky.feed.getFeedSkeleton?feed=at://did:plc:4hqjfn7m6n5hno3doamuhgef/app.bsky.feed.generator/cmd - https://desc.syu.is/xrpc/app.bsky.feed.getFeedSkeleton?feed=at://did:plc:6qyecktefllvenje24fcxnie/app.bsky.feed.generator/cmd -## link -- https://github.com/bluesky-social/atproto -- https://github.com/itaru2622/bluesky-selfhost-env -- https://github.com/bluesky-social/atproto/discussions/2026 - -## self-host - -currently, bsky and bsync require patches to function properly. additionally, social-app is not displaying avatars. for components that are not working, it's recommended to use [itaru2622/bluesky-selfhost-env](https://github.com/itaru2622/bluesky-selfhost-env). this repository provides an environment for self-hosting bluesky. - -- bsky = appview -- ozone = mod - -|name|service|patch| -|---|---|---| -|pds|https://github.com/bluesky-social/atproto/blob/main/services/pds/Dockerfile|| -|bsky|https://github.com/bluesky-social/atproto/blob/main/services/bsky/Dockerfile|[itaru2622/bluesky-atproto-bsky](https://github.com/itaru2622/bluesky-selfhost-env/blob/master/patching/105-atproto-services-for-docker.diff)| -|bsync|https://github.com/bluesky-social/atproto/blob/main/services/bsync/Dockerfile|| -|ozone|https://github.com/bluesky-social/atproto/blob/main/services/ozone/Dockerfile|| -|plc|https://github.com/did-method-plc/did-method-plc/tree/main/packages/server|| -|bgs|https://github.com/bluesky-social/indigo/tree/main/cmd/bigsky|| -|feed|https://github.com/bluesky-social/feed-generator|| -|web|https://github.com/bluesky-social/social-app|[bluesky-selfhost-env](https://github.com/itaru2622/bluesky-selfhost-env/blob/master/patching/160-social-app-disable-hackModifyThumbnailPath.diff)| - -```sh -# BSKY_IMG_URI_ENDPOINT, BSKY_BLOB_CACHE_LOC -# avatar link example -1. https://appview.${host}/img/avatar/plain/${did}/${cid}@jpeg -2. https://${host}/xrpc/com.atproto.sync.getBlob?did=${did}&cid=${cid} -``` - -docker compose will not be published unless you write ports. it is only valid internally. add ports only for what you want to publish. - -## api - -```sh -# create account -url=https://${pds}/xrpc/com.atproto.server.createAccount -json="{\"email\": \"$email\", \"handle\": \"$handle\", \"password\": \"$password\"}" -curl -X POST -H "Content-Type: application/json" -d $json -sL $url -``` - -change `src/pds/handle` to use a name of 3 characters or less. also, you cannot create an account with a name of 3 characters or less from social-app (web client). please create it from api. - -- [/atproto/packages/pds/src/handle/index.ts](https://github.com/bluesky-social/atproto/blame/d4d5a6edba972c0e9976289bde8bc0b42ff547ca/packages/pds/src/handle/index.ts#L86-L88) - -```sh -# invite code -admin_password=xxx -url=https://$host/xrpc/com.atproto.server.createInviteCode -json="{\"useCount\":1}" -curl -X POST -u admin:${admin_password} -H "Content-Type: application/json" -d "$json" -sL $url -``` - -## oauth - -```sh -# https://github.com/bluesky-social/cookbook/tree/main/python-oauth-web-app -$ cd ./repos/cookbook/python-oauth-web-app -$ rye sync -$ rye run python3 -c 'import secrets; print(secrets.token_hex())'|xargs echo FLASK_SECRET_KEY|tr -d ' ' >> .env -$ rye run python3 generate_jwk.py |xargs echo FLASK_CLIENT_SECRET_JWK|tr -d ' ' >> .env -$ cat .env -$ rye run flask run -``` - -please access `127.0.0.1:5000`. it may not work if you use localhost. - -also, oauth doesn't work on localhost. use [ngrok](https://ngrok.com/), [tailscale](https://tailscale.com/), [cloudflare](https://github.com/cloudflare/cloudflared). - -```sh -$ ngrok http http://localhost:5000 -``` - -```sh -$ cloudflared tunnel --url http://localhost:5000 -``` diff --git a/at.json b/at.json deleted file mode 100644 index 7761e07..0000000 --- a/at.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "atmosphere": { - "name": "at", - "repo": "https://github.com/bluesky-social/atproto", - "uri": "https://atproto.com/ja/guides/glossary", - "exosphere": { - "km":[{ "min": 700, "max": 10000 }], - "tag": [ "universe" ] - }, - "thermosphere": { - "km":[{ "min": 80, "max": 700 }], - "tag": [ "aurora" ] - }, - "mesosphere": { - "km":[{ "min": 50, "max": 80 }], - "tag": [ "meteor" ] - }, - "stratosphere": { - "km":[{ "min": 12, "max": 50 }], - "tag": [ "ozone", "bigsky" ], - "service":[ - { "name":"ozone", "repo":"https://github.com/bluesky-social/atproto/tree/main/services/ozone" }, - { "name":"bgs", "repo":"https://github.com/bluesky-social/indigo/tree/main/cmd/bigsky" } - ] - }, - "troposphere": { - "km":[{ "min": 0, "max": 12 }], - "tag": [ "bluesky"], - "service":[ - { "name":"bsky", "repo":"https://github.com/bluesky-social/atproto/tree/main/services/bsky", "tag":[ "api", "appview" ] }, - { "name":"bsync","repo":"https://github.com/bluesky-social/atproto/tree/main/services/bsync" }, - { "name":"pds", "repo":"https://github.com/bluesky-social/atproto/tree/main/services/pds" } - ] - }, - "other": { - "tag": [ "plc", "feed", "oauth", "social-app", "stream" ], - "service":[ - { "name":"plc", "repo":"https://github.com/did-method-plc/did-method-plc/tree/main/packages/server", "tag" : [ "did" ] }, - { "name":"social-app", "repo":"https://github.com/bluesky-social/social-app", "tag": [ "web" ] }, - { "name":"oauth", "repo":"https://github.com/bluesky-social/cookbook/tree/main/python-oauth-web-app" }, - { "name":"feed", "repo":"https://github.com/bluesky-social/feed-generator" }, - { "name":"stream", "repo":"https://github.com/bluesky-social/jetstream" } - ] - } - }, - "ref": "https://en.wikipedia.org/wiki/Atmosphere_of_Earth" -} diff --git a/compose.yml b/compose.yml index 813393a..22fda73 100644 --- a/compose.yml +++ b/compose.yml @@ -48,10 +48,30 @@ services: - ./envs/pds volumes: - ./data/pds/:/data/ + command: node --enable-source-maps index.js depends_on: database: condition: service_healthy + bsky: + ports: + - 2584:2584 + build: + context: ./repos/atproto/ + dockerfile: services/bsky/Dockerfile + restart: always + env_file: + - ./envs/bsky + user: root + volumes: + - ./data/bsky/:/data/ + command: node --enable-source-maps api.js + depends_on: + database: + condition: service_healthy + redis: + condition: service_healthy + bgs: ports: - 2470:2470 @@ -78,25 +98,6 @@ services: - ./envs/social-app command: "/usr/bin/bskyweb serve" - bsky: - ports: - - 2584:2584 - build: - context: ./repos/atproto/ - dockerfile: services/bsky/Dockerfile - restart: always - env_file: - - ./envs/bsky - user: root - volumes: - - ./data/bsky/:/data/ - command: node --enable-source-maps api.js - depends_on: - database: - condition: service_healthy - redis: - condition: service_healthy - jetstream: build: context: ./repos/jetstream/ @@ -136,13 +137,3 @@ services: env_file: - ./envs/ozone - ozone-daemon: - build: - context: ./repos/atproto/ - dockerfile: services/ozone/Dockerfile - restart: always - command: node --enable-source-maps daemon.js - volumes: - - ./data/ozone/:/data/ - env_file: - - ./envs/ozone diff --git a/envs/bgs b/envs/bgs index fa79239..a5097f3 100644 --- a/envs/bgs +++ b/envs/bgs @@ -2,5 +2,5 @@ DATABASE_URL=postgres://postgres:postgres@database/bgs CARSTORE_DATABASE_URL=postgres://postgres:postgres@database/carstore DATA_DIR=/data ATP_PLC_HOST=https://plc.${host} - -BGS_ADMIN_KEY +BGS_NEW_PDS_PER_DAY_LIMIT=1000 +BGS_ADMIN_KEY= diff --git a/envs/pds b/envs/pds index fabc2a4..b2f0241 100644 --- a/envs/pds +++ b/envs/pds @@ -6,6 +6,8 @@ PDS_BLOBSTORE_DISK_LOCATION=/data/img/static PDS_BSKY_APP_VIEW_DID=did:web:bsky.${host} PDS_BSKY_APP_VIEW_URL=https://bsky.${host} PDS_CRAWLERS=https://bgs.${host} +PDS_SEQUENCER_ENABLED=true +PDS_SEQUENCER_DB_LOCATION=/data/sequencer.sqlite PDS_DEV_MODE=true PDS_DID_PLC_URL=https://plc.${host} PDS_ENABLE_DID_DOC_WITH_SESSION=true diff --git a/envs/social-app b/envs/social-app index a6752de..a1bc28f 100644 --- a/envs/social-app +++ b/envs/social-app @@ -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 diff --git a/install.zsh b/install.zsh index 94339c8..a71a699 100755 --- a/install.zsh +++ b/install.zsh @@ -18,6 +18,7 @@ function at-repos-env() { https://github.com/bluesky-social/ozone https://github.com/bluesky-social/jetstream ) + services=( bsky plc pds jetstream bgs ozone social-app ) d=${0:a:h} dh=${0:a:h:h} name=${host%%.*} @@ -73,6 +74,7 @@ function at-repos-pull() { echo $repo if [ -d $d/repos/${repo##*/} ];then cd $d/repos/${repo##*/} + git stash if ! git pull;then rm -rf $d/repos/${repo##*/} at-repos-clone @@ -100,15 +102,60 @@ function at-repos-social-app-icon-origin() { 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 - dt=$d/repos/social-app/src cd $dt grep -R syu.is .|cut -d : -f 1|sort -u|xargs sed -i "s/syu.is/${host}/g" grep -R web.syu.is .|cut -d : -f 1|sort -u|xargs sed -i "s/web.syu.is/web.${host}/g" f=$dt/lib/constants.ts - sed -i "s/public.api.web/bsky/g" $f + sed -i "s#export const BSKY_SERVICE = 'https://bsky.social'#export const BSKY_SERVICE = 'https://${host}'#g" $f + sed -i "s#export const BSKY_SERVICE_DID = 'did:web:bsky.social'#export const BSKY_SERVICE_DID = 'did:web:${host}'#g" $f + sed -i "s#export const PUBLIC_BSKY_SERVICE = 'https://public.api.bsky.app'#export const PUBLIC_BSKY_SERVICE = 'https://bsky.${host}'#g" $f + sed -i "s#export const PUBLIC_APPVIEW = 'https://api.bsky.app'#export const PUBLIC_APPVIEW = 'https://bsky.${host}'#g" $f + sed -i "s#export const PUBLIC_APPVIEW_DID = 'did:web:api.bsky.app'#export const PUBLIC_APPVIEW_DID = 'did:web:bsky.${host}'#g" $f + + # Disable external services (CORS fix) + f=$dt/state/geolocation/const.ts + curl -sL https://raw.githubusercontent.com/bluesky-social/social-app/refs/heads/main/src/state/geolocation/const.ts -o $f + cat > $f << 'GEOEOF' +import {type GeolocationStatus} from '#/state/geolocation/types' +import {BAPP_CONFIG_DEV_URL, IS_DEV} from '#/env' +import {type Device} from '#/storage' + +export const IPCC_URL = `https://bsky.app/ipcc` +// Disabled for self-hosted environment to avoid CORS errors +export const BAPP_CONFIG_URL_PROD = null +export const BAPP_CONFIG_URL = null +export const GEOLOCATION_CONFIG_URL = BAPP_CONFIG_URL + +export const DEFAULT_GEOLOCATION_CONFIG: Device['geolocation'] = { + countryCode: undefined, + regionCode: undefined, + ageRestrictedGeos: [], + ageBlockedGeos: [], +} + +export const DEFAULT_GEOLOCATION_STATUS: GeolocationStatus = { + countryCode: undefined, + regionCode: undefined, + isAgeRestrictedGeo: false, + isAgeBlockedGeo: false, +} +GEOEOF + + # Add null check to geolocation config.ts to prevent fetch(null) errors + f=$dt/state/geolocation/config.ts + curl -sL https://raw.githubusercontent.com/bluesky-social/social-app/refs/heads/main/src/state/geolocation/config.ts -o $f + # Add null check at the beginning of getGeolocationConfig function (after line with 'url: string,') + sed -i "s/): Promise {/): Promise {\n if (!url) return undefined/" $f + + # Disable Statsig (CORS fix) + f=$dt/lib/statsig/statsig.tsx + sed -i "s#api: 'https://events.bsky.app/v2'#api: '' // Disabled for self-hosted#g" $f + # Disable SDK initialization to prevent statsigapi.net connections + sed -i "s#const SDK_KEY = 'client-SXJakO39w9vIhl3D44u8UupyzFl4oZ2qPIkjwcvuPsV'#const SDK_KEY = '' // Disabled for self-hosted#g" $f + f=$dt/view/icons/Logotype.tsx o=$d/icons/Logotype.tsx cp -rf $o $f @@ -123,31 +170,53 @@ function at-repos-social-app-write() { grep -R $did_admin .|cut -d : -f 1|sort -u|xargs sed -i "s/${did_admin}/${did}/g" } -function at-repos-bsky-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 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/105-atproto-services-for-docker.diff - cd ${d_} - if [ ! -f ${p_} ];then - # https://github.com/itaru2622/bluesky-selfhost-env/blob/master/patching/105-atproto-services-for-docker.diff - echo download patch: https://github.com/itaru2622/bluesky-selfhost-env/blob/master/patching/105-atproto-services-for-docker.diff - curl -sL https://raw.githubusercontent.com/itaru2622/bluesky-selfhost-env/refs/heads/master/patching/105-atproto-services-for-docker.diff -o ${p_} - else - echo local patch - fi + p_=$d/patching/4367-atproto-services-bsky-api.diff echo "applying patch: under ${f} for ${p_}" pushd ${d_} patch -p1 < ${p_} popd } -function at-repos-social-app-patch() { - f=$d/repos/social-app/Dockerfile - p_=$d/patching/social-app-dockerfile.diff +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 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 - cd ${d_} - curl -sLO https://raw.githubusercontent.com/bluesky-social/social-app/refs/heads/main/Dockerfile + echo "applying patch: under ${f} for ${p_}" + pushd ${d_} + patch -p1 < ${p_} + popd +} + +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 +} + +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.patch echo "applying patch: under ${f} for ${p_}" pushd ${d_} patch -p1 < ${p_} @@ -172,52 +241,89 @@ function at-repos-ozone-patch() { pushd ${d_} patch -p1 < ${p_} popd - #cp -rf $d/repos/atproto/service/ozone/* $d/ozone/service/ } -function at-repos-docker() { +function at-repos-build-docker-atproto() { cd $d - docker compose build - # docker compose up -d - # docker compose up -d --no-build - # docker compose up -d --pull always + docker image prune -a + if [ -z "$1" ];then + for ((i=1; i<=${#services}; i++)); do + service=${services[$i]} + docker compose build --no-cache $service + done + else + docker compose build --no-cache $1 + fi } -function at-regi-docker() { - docker run -d -p ${dport}:${dport} --name registry --restart=always registry:2 - docker tag at-pds:latest localhost:${dport}/pds:latest - docker tag at-ozone-web:latest localhost:${dport}/ozone-web:latest - docker tag at-bgs:latest localhost:${dport}/bgs:latest - docker tag at-jetstream:latest localhost:${dport}/jetstream:latest - docker tag at-bsky:latest localhost:${dport}/bsky:latest - docker tag at-ozone-daemon:latest localhost:${dport}/ozone-daemon:latest - docker tag at-ozone:latest localhost:${dport}/ozone:latest - docker tag at-plc:latest localhost:${dport}/plc:latest - docker tag at-social-app:latest localhost:${dport}/social-app:latest - - docker push localhost:${dport}/pds:latest - docker push localhost:${dport}/ozone-web:latest - docker push localhost:${dport}/bgs:latest - docker push localhost:${dport}/jetstream:latest - docker push localhost:${dport}/bsky:latest - docker push localhost:${dport}/ozone-daemon:latest - docker push localhost:${dport}/ozone:latest - docker push localhost:${dport}/plc:latest - docker push localhost:${dport}/social-app:latest - +function at-repos-push-reset() { docker restart registry + docker stop registry + docker rm registry + docker volume rm registry-data 2>/dev/null || true + docker run -d -p ${dport}:${dport} --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 +} + +function at-repos-push-docker() { + if [ -z "$1" ];then + for ((i=1; i<=${#services}; i++)); do + 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}: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 + docker push localhost:${dport}/${1}:latest + fi +} + +function at-repos-pull-docker() { + cd $d + docker image prune -a + docker compose up -d --pull always +} + +function at-origin-social-app() { + cp -rf $d/social-app-custom $d/repos/social-app } at-repos-env -at-repos-clone -at-repos-pull -at-repos-social-app-icon -at-repos-social-app-icon-origin -at-repos-social-app-write -at-repos-bsky-patch -at-repos-social-app-patch -at-repos-ozone-patch -at-repos-docker +case "`cat /etc/hostname`" in + at) + at-repos-pull-docker + exit + ;; + *) + at-repos-push-reset + 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-atproto-service-bsky-api-patch + at-repos-atproto-service-pds-index-patch + at-repos-atproto-service-ozone-api-patch + at-repos-ozone-patch + if [ -n "$1" ];then + at-repos-build-docker-atproto $1 + at-repos-push-docker $1 + exit + fi + at-repos-build-docker-atproto + at-repos-push-docker + cd $d; docker compose down + ;; +esac -# at-regi-docker diff --git a/item/card/0.png b/item/card/0.png deleted file mode 100644 index aca1696..0000000 Binary files a/item/card/0.png and /dev/null differ diff --git a/item/card/0.webp b/item/card/0.webp deleted file mode 100644 index 08a41bc..0000000 Binary files a/item/card/0.webp and /dev/null differ diff --git a/item/card/1.png b/item/card/1.png deleted file mode 100644 index 047e505..0000000 Binary files a/item/card/1.png and /dev/null differ diff --git a/item/card/1.webp b/item/card/1.webp deleted file mode 100644 index eb0ea6d..0000000 Binary files a/item/card/1.webp and /dev/null differ diff --git a/item/card/10.png b/item/card/10.png deleted file mode 100644 index e3731fa..0000000 Binary files a/item/card/10.png and /dev/null differ diff --git a/item/card/10.webp b/item/card/10.webp deleted file mode 100644 index ee5956f..0000000 Binary files a/item/card/10.webp and /dev/null differ diff --git a/item/card/11.png b/item/card/11.png deleted file mode 100644 index d34522b..0000000 Binary files a/item/card/11.png and /dev/null differ diff --git a/item/card/11.webp b/item/card/11.webp deleted file mode 100644 index 233dd2d..0000000 Binary files a/item/card/11.webp and /dev/null differ diff --git a/item/card/12.png b/item/card/12.png deleted file mode 100644 index e048e23..0000000 Binary files a/item/card/12.png and /dev/null differ diff --git a/item/card/12.webp b/item/card/12.webp deleted file mode 100644 index 6a3c2d4..0000000 Binary files a/item/card/12.webp and /dev/null differ diff --git a/item/card/13.png b/item/card/13.png deleted file mode 100644 index 97b061f..0000000 Binary files a/item/card/13.png and /dev/null differ diff --git a/item/card/13.webp b/item/card/13.webp deleted file mode 100644 index 8849df8..0000000 Binary files a/item/card/13.webp and /dev/null differ diff --git a/item/card/135.png b/item/card/135.png deleted file mode 100644 index f30f7d6..0000000 Binary files a/item/card/135.png and /dev/null differ diff --git a/item/card/135.webp b/item/card/135.webp deleted file mode 100644 index bc57704..0000000 Binary files a/item/card/135.webp and /dev/null differ diff --git a/item/card/136.mp4 b/item/card/136.mp4 deleted file mode 100644 index 41a1d84..0000000 Binary files a/item/card/136.mp4 and /dev/null differ diff --git a/item/card/136.png b/item/card/136.png deleted file mode 100644 index f26c89a..0000000 Binary files a/item/card/136.png and /dev/null differ diff --git a/item/card/136.webp b/item/card/136.webp deleted file mode 100644 index 54f95bf..0000000 Binary files a/item/card/136.webp and /dev/null differ diff --git a/item/card/14.png b/item/card/14.png deleted file mode 100644 index 40fb878..0000000 Binary files a/item/card/14.png and /dev/null differ diff --git a/item/card/14.webp b/item/card/14.webp deleted file mode 100644 index 2765f33..0000000 Binary files a/item/card/14.webp and /dev/null differ diff --git a/item/card/2.png b/item/card/2.png deleted file mode 100644 index 8f93449..0000000 Binary files a/item/card/2.png and /dev/null differ diff --git a/item/card/2.webp b/item/card/2.webp deleted file mode 100644 index 490139b..0000000 Binary files a/item/card/2.webp and /dev/null differ diff --git a/item/card/3.png b/item/card/3.png deleted file mode 100644 index c7a7b70..0000000 Binary files a/item/card/3.png and /dev/null differ diff --git a/item/card/3.webp b/item/card/3.webp deleted file mode 100644 index 31b3eb5..0000000 Binary files a/item/card/3.webp and /dev/null differ diff --git a/item/card/4.png b/item/card/4.png deleted file mode 100644 index bdda575..0000000 Binary files a/item/card/4.png and /dev/null differ diff --git a/item/card/4.webp b/item/card/4.webp deleted file mode 100644 index 12ae626..0000000 Binary files a/item/card/4.webp and /dev/null differ diff --git a/item/card/5.png b/item/card/5.png deleted file mode 100644 index 77d8de2..0000000 Binary files a/item/card/5.png and /dev/null differ diff --git a/item/card/5.webp b/item/card/5.webp deleted file mode 100644 index c9b2939..0000000 Binary files a/item/card/5.webp and /dev/null differ diff --git a/item/card/6.png b/item/card/6.png deleted file mode 100644 index c9dfc6b..0000000 Binary files a/item/card/6.png and /dev/null differ diff --git a/item/card/6.webp b/item/card/6.webp deleted file mode 100644 index c01dd20..0000000 Binary files a/item/card/6.webp and /dev/null differ diff --git a/item/card/7.png b/item/card/7.png deleted file mode 100644 index 613cb12..0000000 Binary files a/item/card/7.png and /dev/null differ diff --git a/item/card/7.webp b/item/card/7.webp deleted file mode 100644 index f266828..0000000 Binary files a/item/card/7.webp and /dev/null differ diff --git a/item/card/8.png b/item/card/8.png deleted file mode 100644 index 908ae01..0000000 Binary files a/item/card/8.png and /dev/null differ diff --git a/item/card/8.webp b/item/card/8.webp deleted file mode 100644 index f552fa7..0000000 Binary files a/item/card/8.webp and /dev/null differ diff --git a/item/card/9.png b/item/card/9.png deleted file mode 100644 index b315338..0000000 Binary files a/item/card/9.png and /dev/null differ diff --git a/item/card/9.webp b/item/card/9.webp deleted file mode 100644 index 6744937..0000000 Binary files a/item/card/9.webp and /dev/null differ diff --git a/item/card/readme.md b/item/card/readme.md deleted file mode 100644 index da2aba3..0000000 --- a/item/card/readme.md +++ /dev/null @@ -1,38 +0,0 @@ -# card - -カードの仕様を決定します。 - -基本的に`3:4`の`1620x2160`で生成していましたが、`4:5`の`1080x1350`で生成することにしました。これはwindows動画編集が4:5にしか対応していないからです。`.mov`から動画編集で`.mp4`に変換し、それを`.webp`にします。 - -comfyuiの動画生成はカードの大きさではなかなか思うような動画が作れませんでした。やはり`1920x1080(1080p)`からの生成が最適でした。 - -- [16:9] 1920x1080 (1080p) -- [16:9] 1280×720 (720p) -- [16:9] 854x480 (480p) -- [4:3] 2160x1620 -- [4:3] 1440x1080 -- [4:3] 1024×768 -- [4:3] 640×480 -- [4:5] 2025x1620 -- [4:5] 1536x2048 -- [4:5] 1080x1350 - -```bash -$ magick convert -resize 480x -quality 100 4.png 4.webp -$ magick convert -quality 100 1.png 1.webp - -$ magick convert -size 1620x2160 xc:white 1080p.png -$ magick convert -resize 1080x -quality 100 1.png 1.webp -``` - -```sh -$ ffmpeg -i 4.mp4 -vf "fps=15,setpts=PTS/4" -c:v libwebp -loop 1 -quality 100 4.webp -``` - -## list - - - - - - diff --git a/patching/130-atproto-ozone-enable-daemon.patch b/patching/130-atproto-ozone-enable-daemon.patch new file mode 100644 index 0000000..7a10d3d --- /dev/null +++ b/patching/130-atproto-ozone-enable-daemon.patch @@ -0,0 +1,33 @@ +--- a/services/ozone/api.js ++++ b/services/ozone/api.js +@@ -20,6 +20,7 @@ const { + MultiImageInvalidator, + } = require('@atproto/aws') + const { + Database, + OzoneService, ++ OzoneDaemon, + envToCfg, + envToSecrets, + httpLogger, +@@ -76,10 +77,17 @@ const main = async () => { + const ozone = await OzoneService.create(cfg, secrets, { imgInvalidator }) + + await ozone.start() + + httpLogger.info('ozone is running') + ++ // Start OzoneDaemon for label events ++ httpLogger.info('starting ozone daemon') ++ const daemon = await OzoneDaemon.create(cfg, secrets) ++ await daemon.start() ++ httpLogger.info('ozone daemon is running') ++ + // Graceful shutdown (see also https://aws.amazon.com/blogs/containers/graceful-shutdowns-with-ecs/) + process.on('SIGTERM', async () => { + httpLogger.info('ozone is stopping') + ++ await daemon.destroy() + await ozone.destroy() + + httpLogger.info('ozone is stopped') diff --git a/patching/105-atproto-services-for-docker.diff b/patching/4367-atproto-services-bsky-api.diff similarity index 52% rename from patching/105-atproto-services-for-docker.diff rename to patching/4367-atproto-services-bsky-api.diff index c428d6f..f887230 100644 --- a/patching/105-atproto-services-for-docker.diff +++ b/patching/4367-atproto-services-bsky-api.diff @@ -1,14 +1,89 @@ -diff --git a/services/bsky/api.js b/services/bsky/api.js -index 56c769b9d..5d14c0057 100644 ---- a/services/bsky/api.js -+++ b/services/bsky/api.js -@@ -44,19 +44,62 @@ const assert = require('node:assert') +--- a/services/bsky/api.js 2025-12-03 11:04:54 ++++ b/services/bsky/api.js 2025-12-03 11:00:02 +@@ -1,62 +1,105 @@ + /* eslint-env node */ + /* eslint-disable import/order */ +- ++// https://github.com/bluesky-social/atproto/blob/main/services/bsky/api.js + 'use strict' + +-const dd = require('dd-trace') ++//const dd = require('dd-trace') ++// ++//dd.tracer ++// .init() ++// .use('http2', { ++// client: true, // calls into dataplane ++// server: false, ++// }) ++// .use('express', { ++// hooks: { ++// request: (span, req) => { ++// maintainXrpcResource(span, req) ++// }, ++// }, ++// }) + +-dd.tracer +- .init() +- .use('http2', { +- client: true, // calls into dataplane +- server: false, +- }) +- .use('express', { +- hooks: { +- request: (span, req) => { +- maintainXrpcResource(span, req) +- }, +- }, +- }) +- + // modify tracer in order to track calls to dataplane as a service with proper resource names + const DATAPLANE_PREFIX = '/bsky.Service/' +-const origStartSpan = dd.tracer._tracer.startSpan +-dd.tracer._tracer.startSpan = function (name, options) { +- if ( +- name !== 'http.request' || +- options?.tags?.component !== 'http2' || +- !options?.tags?.['http.url'] +- ) { +- return origStartSpan.call(this, name, options) +- } +- const uri = new URL(options.tags['http.url']) +- if (!uri.pathname.startsWith(DATAPLANE_PREFIX)) { +- return origStartSpan.call(this, name, options) +- } +- options.tags['service.name'] = 'dataplane-bsky' +- options.tags['resource.name'] = uri.pathname.slice(DATAPLANE_PREFIX.length) +- return origStartSpan.call(this, name, options) +-} ++//const origStartSpan = dd.tracer._tracer.startSpan ++//dd.tracer._tracer.startSpan = function (name, options) { ++// if ( ++// name !== 'http.request' || ++// options?.tags?.component !== 'http2' || ++// !options?.tags?.['http.url'] ++// ) { ++// return origStartSpan.call(this, name, options) ++// } ++// const uri = new URL(options.tags['http.url']) ++// if (!uri.pathname.startsWith(DATAPLANE_PREFIX)) { ++// return origStartSpan.call(this, name, options) ++// } ++// options.tags['service.name'] = 'dataplane-bsky' ++// options.tags['resource.name'] = uri.pathname.slice(DATAPLANE_PREFIX.length) ++// return origStartSpan.call(this, name, options) ++//} + + // Tracer code above must come before anything else + const assert = require('node:assert') const cluster = require('node:cluster') const path = require('node:path') - + -const { BskyAppView, ServerConfig } = require('@atproto/bsky') -+const bsky = require('@atproto/bsky') // import all bsky features - const { Secp256k1Keypair } = require('@atproto/crypto') +-const { Secp256k1Keypair } = require('@atproto/crypto') ++const bsky = require('/app/packages/bsky') // import all bsky features ++const { Secp256k1Keypair } = require('/app/packages/crypto') const main = async () => { const env = getEnv() @@ -70,7 +145,7 @@ index 56c769b9d..5d14c0057 100644 } process.on('SIGTERM', shutdown) process.on('disconnect', shutdown) // when clustering -@@ -64,6 +107,12 @@ const main = async () => { +@@ -64,6 +107,12 @@ const getEnv = () => ({ serviceSigningKey: process.env.BSKY_SERVICE_SIGNING_KEY || undefined, diff --git a/patching/4367-atproto-services-pds-index.diff b/patching/4367-atproto-services-pds-index.diff new file mode 100644 index 0000000..a8165f8 --- /dev/null +++ b/patching/4367-atproto-services-pds-index.diff @@ -0,0 +1,20 @@ +--- a/services/pds/index.js 2025-12-03 11:04:54 ++++ b/services/pds/index.js 2025-12-02 22:11:39 +@@ -1,5 +1,5 @@ + /* eslint-env node */ +- ++// https://github.com/bluesky-social/atproto/blob/main/services/pds/index.js + 'use strict' + + const { +@@ -8,8 +8,8 @@ + envToSecrets, + httpLogger, + readEnv, +-} = require('@atproto/pds') +-const pkg = require('@atproto/pds/package.json') ++} = require('/app/packages/pds') ++const pkg = require('/app/packages/pds/package.json') + + const main = async () => { + const env = readEnv() diff --git a/patching/8980-social-app-disable-external-services.diff b/patching/8980-social-app-disable-external-services.diff new file mode 100644 index 0000000..74ffc22 --- /dev/null +++ b/patching/8980-social-app-disable-external-services.diff @@ -0,0 +1,17 @@ +--- a/src/state/geolocation/const.ts ++++ b/src/state/geolocation/const.ts +@@ -3,9 +3,10 @@ import {BAPP_CONFIG_DEV_URL, IS_DEV} from '#/env' + import {type Device} from '#/storage' + + export const IPCC_URL = `https://bsky.app/ipcc` +-export const BAPP_CONFIG_URL_PROD = `https://ip.bsky.app/config` +-export const BAPP_CONFIG_URL = IS_DEV +- ? (BAPP_CONFIG_DEV_URL ?? BAPP_CONFIG_URL_PROD) +- : BAPP_CONFIG_URL_PROD ++// Disabled for self-hosted environment to avoid CORS errors ++// export const BAPP_CONFIG_URL_PROD = `https://ip.bsky.app/config` ++// export const BAPP_CONFIG_URL = IS_DEV ++// ? (BAPP_CONFIG_DEV_URL ?? BAPP_CONFIG_URL_PROD) ++// : BAPP_CONFIG_URL_PROD ++export const BAPP_CONFIG_URL = null + export const GEOLOCATION_CONFIG_URL = BAPP_CONFIG_URL diff --git a/patching/8980-social-app-disable-proxy.diff b/patching/8980-social-app-disable-proxy.diff new file mode 100644 index 0000000..4bc454f --- /dev/null +++ b/patching/8980-social-app-disable-proxy.diff @@ -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) + } diff --git a/patching/social-app-dockerfile.diff b/patching/social-app-dockerfile.diff deleted file mode 100644 index 816cf15..0000000 --- a/patching/social-app-dockerfile.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Dockerfile -+++ b/Dockerfile -@@ -37,6 +37,7 @@ RUN \. "$NVM_DIR/nvm.sh" && \ - echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER" >> .env && \ - echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env && \ - npm install --global yarn && \ -+ yarn config set network-timeout 600000 && \ - yarn && \ - yarn intl:build && \ - EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() yarn build-web diff --git a/repos_extra/frontpage/diff.patch b/repos_extra/frontpage/diff.patch deleted file mode 100644 index bd90bf7..0000000 --- a/repos_extra/frontpage/diff.patch +++ /dev/null @@ -1,499 +0,0 @@ -diff --git a/packages-rs/drainpipe/docker-compose.yml b/packages-rs/drainpipe/docker-compose.yml -index 0e1d2ca..d5e214a 100644 ---- a/packages-rs/drainpipe/docker-compose.yml -+++ b/packages-rs/drainpipe/docker-compose.yml -@@ -1,4 +1,3 @@ --version: "3" - services: - drainpipe: - build: -diff --git a/packages-rs/drainpipe/src/main.rs b/packages-rs/drainpipe/src/main.rs -index 21278a5..0a05d06 100644 ---- a/packages-rs/drainpipe/src/main.rs -+++ b/packages-rs/drainpipe/src/main.rs -@@ -76,7 +76,7 @@ async fn process(message: Vec, ctx: &mut Context) -> Result>(); - if !frontpage_ops.is_empty() { - process_frontpage_ops(&frontpage_ops, &commit, &ctx) -diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx -index c0720e5..e619a5f 100644 ---- a/packages/frontpage/app/(app)/_components/post-card.tsx -+++ b/packages/frontpage/app/(app)/_components/post-card.tsx -@@ -83,7 +83,7 @@ export async function PostCard({ - votes={votes} - /> - --
-+
-

- -+
-+ {/*
*/} -
- - {/* eslint-disable-next-line @next/next/no-img-element */} -@@ -52,6 +53,8 @@ export default async function Layout({ - -
{children}
- -+ -+ {/* -
-

- Made by{" "} -@@ -59,10 +62,11 @@ export default async function Layout({ - href={`https://bsky.app/profile/${FRONTPAGE_ATPROTO_HANDLE}`} - className="font-medium text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-300" - > -- @frontpage.fyi -+ @o.syui.ai - -

-
-+ */} -
- ); - } -@@ -141,8 +145,8 @@ async function LoginOrLogout() { - } - - return ( -- - ); - } -diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/[commentAuthor]/[commentRkey]/page.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/[commentAuthor]/[commentRkey]/page.tsx -index c9a2883..c50b02f 100644 ---- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/[commentAuthor]/[commentRkey]/page.tsx -+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/[commentAuthor]/[commentRkey]/page.tsx -@@ -30,7 +30,7 @@ export async function generateMetadata(props: { - description: - comment.status === "live" ? truncateText(comment.body, 47) : null, - alternates: { -- canonical: `https://frontpage.fyi${path}`, -+ canonical: `https://o.syui.ai${path}`, - }, - openGraph: - comment.status === "live" -@@ -40,7 +40,7 @@ export async function generateMetadata(props: { - type: "article", - publishedTime: comment.createdAt.toISOString(), - authors: [`@${handle}`], -- url: `https://frontpage.fyi${path}`, -+ url: `https://o.syui.ai${path}`, - images: [ - { - url: `${path}/og-image`, -diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx -index 71dd664..954f499 100644 ---- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx -+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx -@@ -283,16 +283,12 @@ export function NewComment({ - ref={textAreaRef} - placeholder="Write a comment..." - disabled={isPending} -- className="resize-y flex-1" -+ className="" - /> -
-- --
-+
- {extraButton} -- -
-diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx -index 517c871..ef73ecb 100644 ---- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx -+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx -@@ -29,7 +29,7 @@ export default async function Post(props: { - } - - return ( --
-+
- }) { - - return ( - <> -+ -+ {/* - }) { - /> - ))} -
-+ */} -+ -+ {params.postAuthor === "syui.ai" && (post.title.includes("live") || post.title.includes("video")) && ( -+
-+ -+
-+ -+ -+ {comments.map((comment) => ( -+ -+ ))} -+
-+
-+ )} -+ -+ {post.status === "live" ? ( -+ -+ ) : ( -+ -+ This post has been deleted -+ -+ Deleted posts cannot receive new comments. -+ -+ -+ )} -+
-+ {comments.map((comment) => ( -+ -+ ))} -+ -+
-+ - - ); - } -diff --git a/packages/frontpage/app/(auth)/login/page.tsx b/packages/frontpage/app/(auth)/login/page.tsx -index e3165f9..4d661ce 100644 ---- a/packages/frontpage/app/(auth)/login/page.tsx -+++ b/packages/frontpage/app/(auth)/login/page.tsx -@@ -14,17 +14,15 @@ export default async function LoginPage() { -
-
-

-- Sign in to Frontpage -+ Login with atproto -

-

-- Don't have an account?{" "} - -- Sign up on Bluesky -- -- , then return here to login. -+ Bluesky -+ oauth login -

-
- -diff --git a/packages/frontpage/app/api/receive_hook/route.ts b/packages/frontpage/app/api/receive_hook/route.ts -index 04bda27..9feb136 100644 ---- a/packages/frontpage/app/api/receive_hook/route.ts -+++ b/packages/frontpage/app/api/receive_hook/route.ts -@@ -96,7 +96,7 @@ export async function POST(request: Request) { - }); - } - -- if (collection === "fyi.unravel.frontpage.vote") { -+ if (collection === "ai.syui.o.vote") { - if (op.action === "create") { - const hydratedRecord = await atprotoGetRecord({ - serviceEndpoint: service, -diff --git a/packages/frontpage/app/globals.css b/packages/frontpage/app/globals.css -index 9abc86b..e22dba5 100644 ---- a/packages/frontpage/app/globals.css -+++ b/packages/frontpage/app/globals.css -@@ -13,8 +13,12 @@ - --popover: 0 0% 100%; - --popover-foreground: 222.2 84% 4.9%; - -+ /* - --primary: 222.2 47.4% 11.2%; -- --primary-foreground: 210 40% 98%; -+ --primary-foreground: 210 40% 98%; */ -+ -+ --primary: 210 100% 50%; /* HSLカラーで青色を定義 */ -+ --primary-foreground: 0 0% 100%; /* 白色のテキスト */ - - --secondary: 210 40% 96.1%; - --secondary-foreground: 222.2 47.4% 11.2%; -@@ -67,8 +71,12 @@ - --popover: 222.2 84% 4.9%; - --popover-foreground: 210 40% 98%; - -- --primary: 210 40% 98%; -- --primary-foreground: 222.2 47.4% 11.2%; -+ /*--primary: 210 40% 98%; -+ *--primary-foreground: 222.2 47.4% 11.2%;*/ -+ -+ /* ダークモード用に少し明るい青 */ -+ --primary: 210 100% 60%; -+ --primary-foreground: 0 0% 100%; - - --secondary: 217.2 32.6% 17.5%; - --secondary-foreground: 210 40% 98%; -diff --git a/packages/frontpage/app/layout.tsx b/packages/frontpage/app/layout.tsx -index e8b5a39..a9fa945 100644 ---- a/packages/frontpage/app/layout.tsx -+++ b/packages/frontpage/app/layout.tsx -@@ -22,13 +22,13 @@ const sourceSans = Source_Sans_3({ - }); - - export const metadata: Metadata = { -- title: "Frontpage", -+ title: "o.syui.ai", - description: "A federated link aggregator. Your frontpage to the internet.", - openGraph: { - title: "Frontpage", - description: "Your frontpage to the internet.", - type: "website", -- siteName: "frontpage.fyi", -+ siteName: "o.syui.ai", - }, - }; - -@@ -53,11 +53,7 @@ export default function Layout({ children }: { children: React.ReactNode }) { - - - --