feat: optimized-error-handling&remove unused constant

officialaccount/basic/short_url.go

@@ -44,9 +44,6 @@ func (basic *Basic) Long2ShortURL(longURL string) (shortURL string, err error) {
 	if err != nil {
 		return
 	}
-	if err = util.DecodeWithError(responseBytes, resp, long2shortAction); err != nil {
-		return
-	}
-	shortURL = resp.ShortURL
-	return
+	err = util.DecodeWithError(responseBytes, resp, long2shortAction)
+	return resp.ShortURL, err
 }

officialaccount/customerservice/manager.go

@@ -21,13 +21,6 @@ const (
 	customerServiceTypingURL     = "https://api.weixin.qq.com/cgi-bin/message/custom/typing"
 )
 
-const (
-	// Typing 表示正在输入状态
-	Typing TypingStatus = "Typing"
-	// CancelTyping 表示取消正在输入状态
-	CancelTyping TypingStatus = "CancelTyping"
-)
-
 // Manager 客服管理者，可以管理客服
 type Manager struct {
 	*context.Context
@@ -72,11 +65,7 @@ func (csm *Manager) List() (customerServiceList []*KeFuInfo, err error) {
 	}
 	var res resKeFuList
 	err = util.DecodeWithError(response, &res, "ListCustomerService")
-	if err != nil {
-		return
-	}
-	customerServiceList = res.KfList
-	return
+	return res.KfList, err
 }
 
 // KeFuOnlineInfo 客服在线信息
@@ -107,11 +96,7 @@ func (csm *Manager) OnlineList() (customerServiceOnlineList []*KeFuOnlineInfo, e
 	}
 	var res resKeFuOnlineList
 	err = util.DecodeWithError(response, &res, "ListOnlineCustomerService")
-	if err != nil {
-		return
-	}
-	customerServiceOnlineList = res.KfOnlineList
-	return
+	return res.KfOnlineList, err
 }
 
 // Add 添加客服账号

officialaccount/datacube/publisher.go

@@ -11,31 +11,6 @@ import (
 // AdSlot 广告位类型
 type AdSlot string
 
-const (
-	// SlotIDBizBottom 公众号底部广告
-	SlotIDBizBottom AdSlot = "SLOT_ID_BIZ_BOTTOM"
-	// SlotIDBizMidContext 公众号文中广告
-	SlotIDBizMidContext AdSlot = "SLOT_ID_BIZ_MID_CONTEXT"
-	// SlotIDBizVideoEnd 公众号视频后贴
-	SlotIDBizVideoEnd AdSlot = "SLOT_ID_BIZ_VIDEO_END"
-	// SlotIDBizSponsor 公众号互选广告
-	SlotIDBizSponsor AdSlot = "SLOT_ID_BIZ_SPONSOR"
-	// SlotIDBizCps 公众号返佣商品
-	SlotIDBizCps AdSlot = "SLOT_ID_BIZ_CPS"
-	// SlotIDWeappBanner 小程序banner
-	SlotIDWeappBanner AdSlot = "SLOT_ID_WEAPP_BANNER"
-	// SlotIDWeappRewardVideo 小程序激励视频
-	SlotIDWeappRewardVideo AdSlot = "SLOT_ID_WEAPP_REWARD_VIDEO"
-	// SlotIDWeappInterstitial 小程序插屏广告
-	SlotIDWeappInterstitial AdSlot = "SLOT_ID_WEAPP_INTERSTITIAL"
-	// SlotIDWeappVideoFeeds 小程序视频广告
-	SlotIDWeappVideoFeeds AdSlot = "SLOT_ID_WEAPP_VIDEO_FEEDS"
-	// SlotIDWeappVideoBegin 小程序视频前贴
-	SlotIDWeappVideoBegin AdSlot = "SLOT_ID_WEAPP_VIDEO_BEGIN"
-	// SlotIDWeappBox 小程序格子广告
-	SlotIDWeappBox AdSlot = "SLOT_ID_WEAPP_BOX"
-)
-
 const (
 	publisherURL = "https://api.weixin.qq.com/publisher/stat"
 )
@@ -183,9 +158,6 @@ func (cube *DataCube) fetchData(params ParamsPublisher) (response []byte, err er
 	uri := fmt.Sprintf("%s?%s", publisherURL, v.Encode())
 
 	response, err = util.HTTPGet(uri)
-	if err != nil {
-		return
-	}
 	return
 }
 

officialaccount/draft/draft.go

@@ -64,11 +64,7 @@ func (draft *Draft) AddDraft(articles []*Article) (mediaID string, err error) {
 		MediaID string `json:"media_id"`
 	}
 	err = util.DecodeWithError(response, &res, "AddDraft")
-	if err != nil {
-		return
-	}
-	mediaID = res.MediaID
-	return
+	return res.MediaID, err
 }
 
 // GetDraft 获取草稿
@@ -94,12 +90,7 @@ func (draft *Draft) GetDraft(mediaID string) (articles []*Article, err error) {
 		NewsItem []*Article `json:"news_item"`
 	}
 	err = util.DecodeWithError(response, &res, "GetDraft")
-	if err != nil {
-		return
-	}
-
-	articles = res.NewsItem
-	return
+	return res.NewsItem, err
 }
 
 // DeleteDraft 删除草稿
@@ -172,12 +163,7 @@ func (draft *Draft) CountDraft() (total uint, err error) {
 		Total uint `json:"total_count"`
 	}
 	err = util.DecodeWithError(response, &res, "CountDraft")
-	if nil != err {
-		return
-	}
-
-	total = res.Total
-	return
+	return res.Total, err
 }
 
 // ArticleList 草稿列表

officialaccount/freepublish/freepublish.go

@@ -18,23 +18,6 @@ const (
 // PublishStatus 发布状态
 type PublishStatus uint
 
-const (
-	// PublishStatusSuccess 0:成功
-	PublishStatusSuccess PublishStatus = iota
-	// PublishStatusPublishing 1:发布中
-	PublishStatusPublishing
-	// PublishStatusOriginalFail 2:原创失败
-	PublishStatusOriginalFail
-	// PublishStatusFail 3:常规失败
-	PublishStatusFail
-	// PublishStatusAuditRefused 4:平台审核不通过
-	PublishStatusAuditRefused
-	// PublishStatusUserDeleted 5:成功后用户删除所有文章
-	PublishStatusUserDeleted
-	// PublishStatusSystemBanned 6:成功后系统封禁所有文章
-	PublishStatusSystemBanned
-)
-
 // FreePublish 发布能力
 type FreePublish struct {
 	*context.Context
@@ -73,12 +56,7 @@ func (freePublish *FreePublish) Publish(mediaID string) (publishID int64, err er
 		PublishID int64 `json:"publish_id"`
 	}
 	err = util.DecodeWithError(response, &res, "SubmitFreePublish")
-	if err != nil {
-		return
-	}
-
-	publishID = res.PublishID
-	return
+	return res.PublishID, err
 }
 
 // PublishStatusList 发布任务状态列表
@@ -191,12 +169,7 @@ func (freePublish *FreePublish) First(articleID string) (list []Article, err err
 		NewsItem []Article `json:"news_item"`
 	}
 	err = util.DecodeWithError(response, &res, "FirstFreePublish")
-	if err != nil {
-		return
-	}
-
-	list = res.NewsItem
-	return
+	return res.NewsItem, err
 }
 
 // ArticleList 发布列表

officialaccount/message/subscribe.go

@@ -90,11 +90,7 @@ func (tpl *Subscribe) List() (templateList []*PrivateSubscribeItem, err error) {
 	}
 	var res resPrivateSubscribeList
 	err = util.DecodeWithError(response, &res, "ListSubscribe")
-	if err != nil {
-		return
-	}
-	templateList = res.SubscriptionList
-	return
+	return res.SubscriptionList, err
 }
 
 type resSubscribeAdd struct {
@@ -123,11 +119,7 @@ func (tpl *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (temp
 	}
 	var result resSubscribeAdd
 	err = util.DecodeWithError(response, &result, "AddSubscribe")
-	if err != nil {
-		return
-	}
-	templateID = result.TemplateID
-	return
+	return result.TemplateID, err
 }
 
 // Delete 删除私有模板
@@ -175,11 +167,7 @@ func (tpl *Subscribe) GetCategory() (categoryList []*PublicTemplateCategory, err
 	}
 	var result resSubscribeCategoryList
 	err = util.DecodeWithError(response, &result, "GetCategory")
-	if err != nil {
-		return
-	}
-	categoryList = result.CategoryList
-	return
+	return result.CategoryList, err
 }
 
 // PublicTemplateKeyWords 模板中的关键词
@@ -210,11 +198,7 @@ func (tpl *Subscribe) GetPubTplKeyWordsByID(titleID string) (keyWordsList []*Pub
 	}
 	var result resPublicTemplateKeyWordsList
 	err = util.DecodeWithError(response, &result, "GetPublicTemplateKeyWords")
-	if err != nil {
-		return
-	}
-	keyWordsList = result.KeyWordsList
-	return
+	return result.KeyWordsList, err
 }
 
 // PublicTemplateTitle 类目下的公共模板
@@ -246,10 +230,5 @@ func (tpl *Subscribe) GetPublicTemplateTitleList(ids string, start int, limit in
 	}
 	var result resPublicTemplateTitleList
 	err = util.DecodeWithError(response, &result, "GetPublicTemplateTitle")
-	if err != nil {
-		return
-	}
-	count = result.Count
-	templateTitleList = result.TemplateTitleList
-	return
+	return result.Count, result.TemplateTitleList, err
 }

officialaccount/message/template.go

@@ -111,11 +111,7 @@ func (tpl *Template) List() (templateList []*TemplateItem, err error) {
 	}
 	var res resTemplateList
 	err = util.DecodeWithError(response, &res, "ListTemplate")
-	if err != nil {
-		return
-	}
-	templateList = res.TemplateList
-	return
+	return res.TemplateList, err
 }
 
 type resTemplateAdd struct {
@@ -143,11 +139,7 @@ func (tpl *Template) Add(shortID string) (templateID string, err error) {
 
 	var result resTemplateAdd
 	err = util.DecodeWithError(response, &result, "AddTemplate")
-	if err != nil {
-		return
-	}
-	templateID = result.TemplateID
-	return
+	return result.TemplateID, err
 }
 
 // Delete 删除私有模板.

officialaccount/user/migrate.go

@@ -62,10 +62,6 @@ func (user *User) ListChangeOpenIDs(fromAppID string, openIDs ...string) (list *
 	}
 
 	err = util.DecodeWithError(resp, list, "ListChangeOpenIDs")
-	if err != nil {
-		return
-	}
-
 	return
 }
 

officialaccount/user/tag.go

@@ -126,10 +126,7 @@ func (user *User) GetTag() (tags []*TagInfo, err error) {
 		Tags []*TagInfo `json:"tags"`
 	}
 	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	return result.Tags, nil
+	return result.Tags, err
 }
 
 // OpenIDListByTag 获取标签下粉丝列表
@@ -154,9 +151,6 @@ func (user *User) OpenIDListByTag(tagID int32, nextOpenID ...string) (userList *
 	}
 	userList = new(TagOpenIDList)
 	err = json.Unmarshal(response, &userList)
-	if err != nil {
-		return
-	}
 	return
 }