Skip to content

リソースCloseのエラーハンドリング追加 #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
massongit wants to merge 6 commits into from
Closed

リソースCloseのエラーハンドリング追加 #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19f3201
lib/ameshのリファクタリング: 循環的複雑度とコード重複の削減
massongit Dec 30, 2025
13cb729
公開メソッドを公開メソッドエリアに移動
massongit Dec 30, 2025
7612f6e
関数の並び順を依存関係に基づいて整理
massongit Dec 30, 2025
52290ec
リソースCloseのエラーハンドリング追加
massongit Dec 26, 2025
be1aeb7
readCloser -> body
massongit Dec 30, 2025
e337d6a
Merge branch 'main' into add_close_2
massongit Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/amesh/amesh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,13 +311,19 @@ func parseCoordinates(place string) (*Location, error) {
}

// executeAndReadResponse HTTPリクエストを実行してレスポンスボディを読み込む
func executeAndReadResponse(client *http.Client, req *http.Request) ([]byte, error) {
func executeAndReadResponse(client *http.Client, req *http.Request) (body []byte, err error) {
resp, err := httpclient.ExecuteHTTPRequest(client, req)
if err != nil {
return nil, errors.Wrap(err, "Failed to httpclient.ExecuteHTTPRequest")
}

body, err := handleHTTPResponse(resp)
defer func(body io.ReadCloser) {
if closeErr := body.Close(); closeErr != nil {
err = errors.Wrap(closeErr, "Failed to Close")
}
}(resp.Body)

body, err = handleHTTPResponse(resp)
if err != nil {
return nil, errors.Wrap(err, "Failed to handleHTTPResponse")
}
Expand Down
5 changes: 5 additions & 0 deletions lib/misskey/bot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ func (bot *Bot) CreateNote(ctx context.Context, params *CreateNoteParams) (err e
func (bot *Bot) UploadFile(ctx context.Context, reader io.Reader, fileName string) (file *File, err error) {
var buf bytes.Buffer
writer := multipart.NewWriter(&buf)
defer func(writer *multipart.Writer) {
if closeErr := writer.Close(); closeErr != nil {
err = errors.Wrap(closeErr, "Failed to Close")
}
}(writer)

// トークンフィールドを追加
if writeErr := writer.WriteField("i", bot.BotSetting.Token); writeErr != nil {
Expand Down
Loading