From 03d6ad420f573b4eff138c561ef79d564f3eeef1 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Thu, 5 Mar 2026 22:01:32 +0900
Subject: [PATCH] fix: resolve merge conflicts in wecom error handling

Combine both shadow variable fix (readErr) and proper error
classification (ClassifySendError) in wecom app and bot channels.
---
 pkg/channels/wecom/app.go | 22 +++++++---------------
 pkg/channels/wecom/bot.go | 11 ++++-------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/pkg/channels/wecom/app.go b/pkg/channels/wecom/app.go
index b86f7ae2b..2098fcd4e 100644
--- a/pkg/channels/wecom/app.go
+++ b/pkg/channels/wecom/app.go
@@ -321,17 +321,12 @@ func (c *WeComAppChannel) uploadMedia(ctx context.Context, accessToken, mediaTyp
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-<<<<<<< HEAD
-		respBody, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return "", channels.ClassifySendError(resp.StatusCode, fmt.Errorf("reading wecom upload error response: %w", err))
-=======
 		respBody, readErr := io.ReadAll(resp.Body)
 		if readErr != nil {
-			return "", fmt.Errorf(
-				"reading wecom upload error response: %w", readErr,
+			return "", channels.ClassifySendError(
+				resp.StatusCode,
+				fmt.Errorf("reading wecom upload error response: %w", readErr),
 			)
->>>>>>> 908fa8d (fix: resolve govet shadow and golines lint errors in wecom channels)
 		}
 		return "", channels.ClassifySendError(
 			resp.StatusCode,
@@ -385,15 +380,12 @@ func (c *WeComAppChannel) sendWeComMessage(ctx context.Context, accessToken stri
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-<<<<<<< HEAD
-		respBody, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return channels.ClassifySendError(resp.StatusCode, fmt.Errorf("reading wecom_app error response: %w", err))
-=======
 		respBody, readErr := io.ReadAll(resp.Body)
 		if readErr != nil {
-			return fmt.Errorf("reading wecom_app error response: %w", readErr)
->>>>>>> 908fa8d (fix: resolve govet shadow and golines lint errors in wecom channels)
+			return channels.ClassifySendError(
+				resp.StatusCode,
+				fmt.Errorf("reading wecom_app error response: %w", readErr),
+			)
 		}
 		return channels.ClassifySendError(
 			resp.StatusCode,
diff --git a/pkg/channels/wecom/bot.go b/pkg/channels/wecom/bot.go
index 8d64a91c6..96d5a961f 100644
--- a/pkg/channels/wecom/bot.go
+++ b/pkg/channels/wecom/bot.go
@@ -453,15 +453,12 @@ func (c *WeComBotChannel) sendWebhookReply(ctx context.Context, userID, content
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-<<<<<<< HEAD
-		body, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return channels.ClassifySendError(resp.StatusCode, fmt.Errorf("reading webhook error response: %w", err))
-=======
 		body, readErr := io.ReadAll(resp.Body)
 		if readErr != nil {
-			return fmt.Errorf("reading webhook error response: %w", readErr)
->>>>>>> 908fa8d (fix: resolve govet shadow and golines lint errors in wecom channels)
+			return channels.ClassifySendError(
+				resp.StatusCode,
+				fmt.Errorf("reading webhook error response: %w", readErr),
+			)
 		}
 		return channels.ClassifySendError(
 			resp.StatusCode,