From c119efcaedf369114fd7057f4fd612b56c0d4553 Mon Sep 17 00:00:00 2001 From: syui Date: Wed, 19 Mar 2025 08:23:32 +0900 Subject: [PATCH] fix scpt --- scpt/at.zsh | 18 ++- scpt/src/ai/syui/game/character.zsh | 187 +++++++++++++++++----------- scpt/src/func.zsh | 1 + 3 files changed, 131 insertions(+), 75 deletions(-) diff --git a/scpt/at.zsh b/scpt/at.zsh index af1448e..8255934 100755 --- a/scpt/at.zsh +++ b/scpt/at.zsh @@ -38,16 +38,24 @@ case $1 in at-profile ;; download-character-icon) - source $d/ai/syui/game/character.zsh + source $d/src/ai/syui/game/character.zsh download_character_icon ;; create-game-character) - source $d/ai/syui/game/character.zsh + source $d/src/ai/syui/game/character.zsh create_game_character ;; - ai-create-user) - source $d/ai/syui/game/character.zsh - ai_create_user + create-game-user) + source $d/src/ai/syui/game/character.zsh + ai_create_user $2 + ;; + get-game-user) + source $d/src/ai/syui/game/character.zsh + get_game_user $2 + ;; + delete-game-user) + source $d/src/ai/syui/game/character.zsh + delete_game_user $2 $3 ;; *) echo "${help[@]}" diff --git a/scpt/src/ai/syui/game/character.zsh b/scpt/src/ai/syui/game/character.zsh index 2a59ff1..acceff6 100755 --- a/scpt/src/ai/syui/game/character.zsh +++ b/scpt/src/ai/syui/game/character.zsh @@ -190,59 +190,60 @@ json="{ } function ai_create_user() { - - col=ai.syui.game.user - rkey=ai + col=ai.syui.game + rkey=$1 did=$did_yui handle=$handle_yui + pds=bsky.social #rkey=syui #img=https://cdn.bsky.app/img/feed_thumbnail/plain/did:plc:4hqjfn7m6n5hno3doamuhgef/bafkreie34pjuc6coenzcdwrgrh4fbacq7bkhsz263g5vpbsqxwaz37kkwy@jpeg req=com.atproto.repo.putRecord - url=https://$host/xrpc/$req + url=https://$pds/xrpc/$req - for ((i=1; i<=${#character}; i++)); do + cname=dragon + cid=bafkreia3huw2gdenqatoobx3hcft74chced46bw4znfgepo5aenegobkri - cname=${character[$i]} - cid=${img[$i]} - imguri=https://cdn.bsky.app/img/feed_thumbnail/plain/$did_yui/${cid}@jpeg - echo $imguri - echo $i $character $cname - season=1 - group=test - lv=1 - hp=100 - exp=0 - rank=0 - mode=0 - attack=0 - attack_post=0 - critical=0 - critical_d=0 + if [ "$rkey" = "ai" ];then + cname=$rkey + cid=bafkreie34pjuc6coenzcdwrgrh4fbacq7bkhsz263g5vpbsqxwaz37kkwy + gender=none + fi + if [ "$rkey" = "syui" ];then + cname=chinese + did=$did_syui + handle=syui.ai + cid=bafkreidlealfybajqzwv5eoz4jshnsijc2vnktlhpw4ph47krwj6aigqby + gender=male + fi + imguri=https://cdn.bsky.app/img/feed_thumbnail/plain/$did_yui/${cid}@jpeg + season=1 + group=test + lv=1 + hp=1 + exp=0 + rank=0 + mode=0 + attack=0 + attack_post=0 + critical=0 + critical_d=0 - case $cname in - ai) - group=origin - season=0 - mode=2 - ;; - manny|quinn) - group=test - ;; - *) - group=fantasy - ;; - esac + case $cname in + ai) + group=origin + season=0 + mode=2 + ;; + manny|quinn) + group=test + ;; + *) + group=fantasy + ;; + esac + json="\"$cname\": { \"group\": \"$group\", \"season\": $season, \"img\": \"$imguri\", \"lv\": $lv, \"exp\": $exp, \"hp\": $hp, \"rank\": $rank, \"mode\": $mode, \"attack\": $attack, \"attack_post\": $attack_post, \"critical\": $critical, \"critical_d\": $critical_d }" - jc="\"$cname\": { \"group\": \"$group\", \"season\": $season, \"img\": \"$imguri\", \"lv\": $lv, \"exp\": $exp, \"hp\": $hp, \"rank\": $rank, \"mode\": $mode, \"attack\": $attack, \"attack_post\": $attack_post, \"critical\": $critical, \"critical_d\": $critical_d }" - - if [ $#character -ne $i ];then - jc=${jc}, - fi - - json=${json}${jc} - - done - json=" + v1_json=" { \"repo\": \"$handle_yui\", \"did\": \"$did_yui\", @@ -254,7 +255,7 @@ function ai_create_user() { \"login\": false, \"handle\": \"$handle\", \"aiten\": 10, - \"gender\": \"famale\", + \"gender\": \"$gender\", \"character\": { $json }, @@ -263,30 +264,27 @@ function ai_create_user() { } }" - -if echo $json|jq . ;then - echo $token_yui - echo y - read y - if [ "y" = "$y" ];then - curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $token_yui" -d $json $url - fi -fi - -col=ai.syui.game -rkey=self -at_uri=at://$did_yui/ai.syui.game.user/ai - -json=" -{ - \"repo\": \"$handle_yui\", - \"did\": \"$did_yui\", - \"collection\": \"$col\", - \"rkey\": \"$rkey\", - \"record\": { - \"account\": \"$at_uri\", - \"username\": \"ai\", - \"createdAt\": \"$created\" + json=" + { + \"repo\": \"$handle_yui\", + \"did\": \"$did_yui\", + \"collection\": \"$col\", + \"rkey\": \"$rkey\", + \"record\": { + \"version\": 2, + \"did\": \"$did\", + \"handle\": \"$handle\", + \"player\": { + \"limit\": false, + \"login\": false, + \"aiten\": 0, + \"gender\": \"$gender\" + }, + \"character\": { + $json + }, + \"createdAt\": \"${created}\", + \"updatedAt\": \"${created}\" } }" @@ -294,9 +292,58 @@ if echo $json|jq . ;then echo y read y if [ "y" = "$y" ];then - curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $token_yui" -d $json $url + curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $token" -d $json $url fi fi + +#col=ai.syui.game +#rkey=self +#at_uri=at://$did_yui/ai.syui.game.user/ai +# +#json=" +#{ +# \"repo\": \"$handle_yui\", +# \"did\": \"$did_yui\", +# \"collection\": \"$col\", +# \"rkey\": \"$rkey\", +# \"record\": { +# \"account\": \"$at_uri\", +# \"username\": \"ai\", +# \"createdAt\": \"$created\" +#} +#}" +# +#if echo $json|jq . ;then +# echo y +# read y +# if [ "y" = "$y" ];then +# curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $token" -d $json $url +# fi +#fi } +get_game_user() { + rkey=$did.$pds + pds=bsky.social + if [ "$1" = "syui" ] || [ "$1" = "ai" ];then + rkey=$1 + fi + req=com.atproto.repo.getRecord + url="https://$pds/xrpc/$req?rkey=$rkey&repo=$did_yui&collection=ai.syui.game" + curl -sL $url|jq . +} +delete_game_user() { + rkey=$2 + if [ -z "$1" ];then + col=ai.syui.game + else + col=$1 + fi + req=com.atproto.repo.DeleteRecord + url=https://$pds/xrpc/$req + repo=$did_yui + json="{\"collection\":\"$col\", \"rkey\":\"$rkey\", \"repo\":\"$repo\"}" + echo $json + curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $token" -d $json $url +} diff --git a/scpt/src/func.zsh b/scpt/src/func.zsh index df9ea6a..004cf4d 100644 --- a/scpt/src/func.zsh +++ b/scpt/src/func.zsh @@ -1,4 +1,5 @@ function at-env() { + pds=bsky.social host=https://bsky.social handle_syui=syui.ai handle_yui=yui.syui.ai