Skip to content

Commit ea85c66

Browse files
authored
Merge branch 'main' into renovate/3d-parties
2 parents bfa5894 + 2e3cb3f commit ea85c66

3 files changed

Lines changed: 24 additions & 1 deletion

File tree

.claude/settings.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"hooks": {
3+
"PostToolUse": [
4+
{
5+
"matcher": "Write|Edit",
6+
"hooks": [
7+
{
8+
"type": "command",
9+
"command": "jq -r '.tool_input.file_path' | { read -r f; case \"$f\" in *.go) gofmt -w \"$f\";; esac; } 2>/dev/null || true",
10+
"statusMessage": "Running gofmt..."
11+
},
12+
{
13+
"type": "command",
14+
"command": "jq -r '.tool_input.file_path' | { read -r f; case \"$f\" in *.go) output=$(golangci-lint run \"$f\" 2>&1); rc=$?; if [ $rc -ne 0 ]; then jq -n --arg ctx \"golangci-lint found issues in $f. Fix them:\\n$output\" '{\"hookSpecificOutput\":{\"hookEventName\":\"PostToolUse\",\"additionalContext\":$ctx}}'; exit $rc; fi;; esac; }",
15+
"statusMessage": "Running golangci-lint..."
16+
}
17+
]
18+
}
19+
]
20+
}
21+
}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ _testmain.go
2424
*.exe
2525
*.test
2626
*.prof
27+
28+
.claude/settings.local.json

tgbotapi/configs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ type FileReader struct {
938938

939939
// AnswerCallbackQueryConfig contains information on making a CallbackQuery response.
940940
type AnswerCallbackQueryConfig struct {
941-
CallbackQueryID string `json:"callback_query_id,"`
941+
CallbackQueryID string `json:"callback_query_id"`
942942
Text string `json:"text,omitempty"`
943943
ShowAlert bool `json:"show_alert,omitempty"`
944944
URL string `json:"url,omitempty"`

0 commit comments

Comments
 (0)