fix: resolve wsl_v5 lint issues
This commit is contained in:
@@ -152,6 +152,7 @@ func (c *Client) PollMessages(afterID string, timeout int) ([]Message, error) {
|
|||||||
if err := json.Unmarshal(data, &msgs); err != nil {
|
if err := json.Unmarshal(data, &msgs); err != nil {
|
||||||
// Try wrapped format.
|
// Try wrapped format.
|
||||||
var wrapped MessagesResponse
|
var wrapped MessagesResponse
|
||||||
|
|
||||||
err2 := json.Unmarshal(data, &wrapped)
|
err2 := json.Unmarshal(data, &wrapped)
|
||||||
if err2 != nil {
|
if err2 != nil {
|
||||||
return nil, fmt.Errorf("decode messages: %w (raw: %s)", err, string(data))
|
return nil, fmt.Errorf("decode messages: %w (raw: %s)", err, string(data))
|
||||||
@@ -199,6 +200,7 @@ func (c *Client) GetMembers(channel string) ([]string, error) {
|
|||||||
if err := json.Unmarshal(data, &members); err != nil {
|
if err := json.Unmarshal(data, &members); err != nil {
|
||||||
// Try object format.
|
// Try object format.
|
||||||
var obj map[string]any
|
var obj map[string]any
|
||||||
|
|
||||||
err2 := json.Unmarshal(data, &obj)
|
err2 := json.Unmarshal(data, &obj)
|
||||||
if err2 != nil {
|
if err2 != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ func (s *Database) ListChannels(ctx context.Context, userID string) ([]ChannelIn
|
|||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var ch ChannelInfo
|
var ch ChannelInfo
|
||||||
|
|
||||||
err := rows.Scan(&ch.ID, &ch.Name, &ch.Topic)
|
err := rows.Scan(&ch.ID, &ch.Name, &ch.Topic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -96,6 +97,7 @@ func (s *Database) ChannelMembers(ctx context.Context, channelID string) ([]Memb
|
|||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var m MemberInfo
|
var m MemberInfo
|
||||||
|
|
||||||
err := rows.Scan(&m.ID, &m.Nick, &m.LastSeen)
|
err := rows.Scan(&m.ID, &m.Nick, &m.LastSeen)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -184,6 +186,7 @@ func (s *Database) PollMessages(ctx context.Context, userID string, afterTS stri
|
|||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var m MessageInfo
|
var m MessageInfo
|
||||||
|
|
||||||
err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &m.CreatedAt)
|
err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &m.CreatedAt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -236,6 +239,7 @@ func (s *Database) GetMessagesBefore(ctx context.Context, target string, beforeT
|
|||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var m MessageInfo
|
var m MessageInfo
|
||||||
|
|
||||||
err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &m.CreatedAt)
|
err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &m.CreatedAt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -294,6 +298,7 @@ func (s *Database) GetDMsBefore(ctx context.Context, userA, userB string, before
|
|||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var m MessageInfo
|
var m MessageInfo
|
||||||
|
|
||||||
err := rows.Scan(&m.ID, &m.Nick, &m.Content, &m.DMTarget, &m.CreatedAt)
|
err := rows.Scan(&m.ID, &m.Nick, &m.Content, &m.DMTarget, &m.CreatedAt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -346,6 +351,7 @@ func (s *Database) ListAllChannels(ctx context.Context) ([]ChannelInfo, error) {
|
|||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var ch ChannelInfo
|
var ch ChannelInfo
|
||||||
|
|
||||||
err := rows.Scan(&ch.ID, &ch.Name, &ch.Topic)
|
err := rows.Scan(&ch.ID, &ch.Name, &ch.Topic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -224,6 +224,7 @@ func (s *Handlers) HandleSendCommand() http.HandlerFunc {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var req request
|
var req request
|
||||||
|
|
||||||
err := json.NewDecoder(r.Body).Decode(&req)
|
err := json.NewDecoder(r.Body).Decode(&req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.respondJSON(w, r, map[string]string{"error": "invalid request"}, http.StatusBadRequest)
|
s.respondJSON(w, r, map[string]string{"error": "invalid request"}, http.StatusBadRequest)
|
||||||
|
|||||||
Reference in New Issue
Block a user