fix: resolve noinlineerr lint issues

This commit is contained in:
user
2026-02-20 03:17:09 -08:00
parent f125a3f591
commit 3d968a1102
3 changed files with 28 additions and 11 deletions

View File

@@ -78,7 +78,9 @@ func (c *Client) CreateSession(nick string) (*SessionResponse, error) {
} }
var resp SessionResponse var resp SessionResponse
if err := json.Unmarshal(data, &resp); err != nil {
err = json.Unmarshal(data, &resp)
if err != nil {
return nil, fmt.Errorf("decode session: %w", err) return nil, fmt.Errorf("decode session: %w", err)
} }
@@ -95,7 +97,9 @@ func (c *Client) GetState() (*StateResponse, error) {
} }
var resp StateResponse var resp StateResponse
if err := json.Unmarshal(data, &resp); err != nil {
err = json.Unmarshal(data, &resp)
if err != nil {
return nil, fmt.Errorf("decode state: %w", err) return nil, fmt.Errorf("decode state: %w", err)
} }
@@ -150,7 +154,9 @@ func (c *Client) PollMessages(afterID string, timeout int) ([]Message, error) {
// The server may return an array directly or wrapped. // The server may return an array directly or wrapped.
var msgs []Message var msgs []Message
if err := json.Unmarshal(data, &msgs); err != nil {
err = json.Unmarshal(data, &msgs)
if err != nil {
// Try wrapped format. // Try wrapped format.
var wrapped MessagesResponse var wrapped MessagesResponse
@@ -183,7 +189,9 @@ func (c *Client) ListChannels() ([]Channel, error) {
} }
var channels []Channel var channels []Channel
if err := json.Unmarshal(data, &channels); err != nil {
err = json.Unmarshal(data, &channels)
if err != nil {
return nil, err return nil, err
} }
@@ -198,7 +206,9 @@ func (c *Client) GetMembers(channel string) ([]string, error) {
} }
var members []string var members []string
if err := json.Unmarshal(data, &members); err != nil {
err = json.Unmarshal(data, &members)
if err != nil {
// Try object format. // Try object format.
var obj map[string]any var obj map[string]any
@@ -221,7 +231,9 @@ func (c *Client) GetServerInfo() (*ServerInfo, error) {
} }
var info ServerInfo var info ServerInfo
if err := json.Unmarshal(data, &info); err != nil {
err = json.Unmarshal(data, &info)
if err != nil {
return nil, err return nil, err
} }

View File

@@ -553,7 +553,8 @@ func (s *Database) connect(ctx context.Context) error {
s.log.Info("database connected") s.log.Info("database connected")
// Item 9: Enable foreign keys on every connection // Item 9: Enable foreign keys on every connection
if _, err := s.db.ExecContext(ctx, "PRAGMA foreign_keys = ON"); err != nil { _, err = s.db.ExecContext(ctx, "PRAGMA foreign_keys = ON")
if err != nil {
return fmt.Errorf("enable foreign keys: %w", err) return fmt.Errorf("enable foreign keys: %w", err)
} }
@@ -709,7 +710,8 @@ func (s *Database) applyMigrations(
) )
} }
if err := tx.Commit(); err != nil { err = tx.Commit()
if err != nil {
return fmt.Errorf( return fmt.Errorf(
"commit migration %d: %w", m.version, err, "commit migration %d: %w", m.version, err,
) )

View File

@@ -62,7 +62,8 @@ func (s *Handlers) HandleCreateSession() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
var req request var req request
if err := json.NewDecoder(r.Body).Decode(&req); err != nil { err := json.NewDecoder(r.Body).Decode(&req)
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)
return return
@@ -359,7 +360,8 @@ func (s *Handlers) handleJoin(w http.ResponseWriter, r *http.Request, uid, to st
return return
} }
if err := s.params.Database.JoinChannel(r.Context(), chID, uid); err != nil { err = s.params.Database.JoinChannel(r.Context(), chID, uid)
if err != nil {
s.log.Error("join channel failed", "error", err) s.log.Error("join channel failed", "error", err)
s.respondJSON(w, r, map[string]string{"error": "internal error"}, http.StatusInternalServerError) s.respondJSON(w, r, map[string]string{"error": "internal error"}, http.StatusInternalServerError)
@@ -391,7 +393,8 @@ func (s *Handlers) handlePart(w http.ResponseWriter, r *http.Request, uid, to st
return return
} }
if err := s.params.Database.PartChannel(r.Context(), chID, uid); err != nil { err = s.params.Database.PartChannel(r.Context(), chID, uid)
if err != nil {
s.log.Error("part channel failed", "error", err) s.log.Error("part channel failed", "error", err)
s.respondJSON(w, r, map[string]string{"error": "internal error"}, http.StatusInternalServerError) s.respondJSON(w, r, map[string]string{"error": "internal error"}, http.StatusInternalServerError)