Skip to content

Commit 6c123bc

Browse files
committed
[golangci-lint]: Add more missing error checking.
1 parent 006ec37 commit 6c123bc

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

xmpp_avatar.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -104,22 +104,22 @@ func atoiw(str string) int {
104104
return i
105105
}
106106

107-
func (c *Client) AvatarSubscribeMetadata(jid string) {
108-
c.PubsubSubscribeNode(XMPPNS_AVATAR_PEP_METADATA, jid)
107+
func (c *Client) AvatarSubscribeMetadata(jid string) error {
108+
return c.PubsubSubscribeNode(XMPPNS_AVATAR_PEP_METADATA, jid)
109109
}
110110

111-
func (c *Client) AvatarUnsubscribeMetadata(jid string) {
112-
c.PubsubUnsubscribeNode(XMPPNS_AVATAR_PEP_METADATA, jid)
111+
func (c *Client) AvatarUnsubscribeMetadata(jid string) error {
112+
return c.PubsubUnsubscribeNode(XMPPNS_AVATAR_PEP_METADATA, jid)
113113
}
114114

115-
func (c *Client) AvatarRequestData(jid string) {
116-
c.PubsubRequestLastItems(XMPPNS_AVATAR_PEP_DATA, jid)
115+
func (c *Client) AvatarRequestData(jid string) error {
116+
return c.PubsubRequestLastItems(XMPPNS_AVATAR_PEP_DATA, jid)
117117
}
118118

119-
func (c *Client) AvatarRequestDataByID(jid, id string) {
120-
c.PubsubRequestItem(XMPPNS_AVATAR_PEP_DATA, jid, id)
119+
func (c *Client) AvatarRequestDataByID(jid, id string) error {
120+
return c.PubsubRequestItem(XMPPNS_AVATAR_PEP_DATA, jid, id)
121121
}
122122

123-
func (c *Client) AvatarRequestMetadata(jid string) {
124-
c.PubsubRequestLastItems(XMPPNS_AVATAR_PEP_METADATA, jid)
123+
func (c *Client) AvatarRequestMetadata(jid string) error {
124+
return c.PubsubRequestLastItems(XMPPNS_AVATAR_PEP_METADATA, jid)
125125
}

xmpp_pubsub.go

+12-8
Original file line numberDiff line numberDiff line change
@@ -101,28 +101,32 @@ func pubsubUnsubscriptionStanza(node, jid string) string {
101101
return pubsubStanza(body)
102102
}
103103

104-
func (c *Client) PubsubSubscribeNode(node, jid string) {
105-
c.RawInformation(c.jid,
104+
func (c *Client) PubsubSubscribeNode(node, jid string) error {
105+
_, err := c.RawInformation(c.jid,
106106
jid,
107107
"sub1",
108108
"set",
109109
pubsubSubscriptionStanza(node, c.jid))
110+
return err
110111
}
111112

112-
func (c *Client) PubsubUnsubscribeNode(node, jid string) {
113-
c.RawInformation(c.jid,
113+
func (c *Client) PubsubUnsubscribeNode(node, jid string) error {
114+
_, err := c.RawInformation(c.jid,
114115
jid,
115116
"unsub1",
116117
"set",
117118
pubsubUnsubscriptionStanza(node, c.jid))
119+
return err
118120
}
119121

120-
func (c *Client) PubsubRequestLastItems(node, jid string) {
122+
func (c *Client) PubsubRequestLastItems(node, jid string) error {
121123
body := fmt.Sprintf("<items node='%s'/>", node)
122-
c.RawInformation(c.jid, jid, "items1", "get", pubsubStanza(body))
124+
_, err := c.RawInformation(c.jid, jid, "items1", "get", pubsubStanza(body))
125+
return err
123126
}
124127

125-
func (c *Client) PubsubRequestItem(node, jid, id string) {
128+
func (c *Client) PubsubRequestItem(node, jid, id string) error {
126129
body := fmt.Sprintf("<items node='%s'><item id='%s'/></items>", node, id)
127-
c.RawInformation(c.jid, jid, "items3", "get", pubsubStanza(body))
130+
_, err := c.RawInformation(c.jid, jid, "items3", "get", pubsubStanza(body))
131+
return err
128132
}

0 commit comments

Comments
 (0)