[lint] minor fixes

Author: capcom6

.github/workflows/release.yml

@@ -64,7 +64,7 @@ jobs:
         run: echo APP_VERSION=${GITHUB_REF#refs/tags/} >> ${GITHUB_ENV}
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Install Terraform
         uses: hashicorp/setup-terraform@v3

internal/sms-gateway/handlers/base/handler.go

@@ -19,23 +19,23 @@ type Handler struct {
 
 func (h *Handler) BodyParserValidator(c *fiber.Ctx, out any) error {
 	if err := c.BodyParser(out); err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Can't parse body: %s", err.Error()))
+		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("failed to parse body: %s", err.Error()))
 	}
 
 	return h.ValidateStruct(out)
 }
 
 func (h *Handler) QueryParserValidator(c *fiber.Ctx, out any) error {
 	if err := c.QueryParser(out); err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Can't parse query: %s", err.Error()))
+		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("failed to parse query: %s", err.Error()))
 	}
 
 	return h.ValidateStruct(out)
 }
 
 func (h *Handler) ParamsParserValidator(c *fiber.Ctx, out any) error {
 	if err := c.ParamsParser(out); err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Can't parse params: %s", err.Error()))
+		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("failed to parse params: %s", err.Error()))
 	}
 
 	return h.ValidateStruct(out)

internal/sms-gateway/handlers/messages/mobile.go

@@ -106,7 +106,7 @@ func (h *MobileController) patch(device models.Device, c *fiber.Ctx) error {
 
 		err := h.messagesSvc.UpdateState(&device, messageState)
 		if err != nil && !errors.Is(err, messages.ErrMessageNotFound) {
-			h.Logger.Error("Can't update message status",
+			h.Logger.Error("failed to update message status",
 				zap.String("message_id", v.ID),
 				zap.Error(err),
 			)

internal/sms-gateway/handlers/settings/mobile.go

@@ -1,8 +1,6 @@
 package settings
 
 import (
-	"fmt"
-
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/middlewares/deviceauth"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/models"
@@ -50,7 +48,13 @@ func NewMobileController(
 func (h *MobileController) get(device models.Device, c *fiber.Ctx) error {
 	settings, err := h.settingsSvc.GetSettings(device.UserID, false)
 	if err != nil {
-		return fmt.Errorf("failed to get settings for device %s (user ID: %s): %w", device.ID, device.UserID, err)
+		h.Logger.Error(
+			"failed to get settings",
+			zap.Error(err),
+			zap.String("device_id", device.ID),
+			zap.String("user_id", device.UserID),
+		)
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to get settings")
 	}
 
 	return c.JSON(settings)

internal/sms-gateway/handlers/upstream.go

@@ -74,7 +74,7 @@ func (h *upstreamHandler) postPush(c *fiber.Ctx) error {
 		}
 
 		if err := h.pushSvc.Enqueue(v.Token, event); err != nil {
-			h.Logger.Error("Can't push message", zap.Error(err))
+			h.Logger.Error("failed to push message", zap.Error(err))
 		}
 	}
 

internal/sms-gateway/modules/messages/errors.go

@@ -4,6 +4,7 @@ import "errors"
 
 var (
 	ErrLockFailed = errors.New("failed to acquire lock")
+	ErrNoContent  = errors.New("no text or data content")
 )
 
 type ValidationError string

internal/sms-gateway/modules/messages/service.go

@@ -19,10 +19,6 @@ import (
 	"go.uber.org/zap"
 )
 
-const (
-	ErrorTTLExpired = "TTL expired"
-)
-
 type EnqueueOptions struct {
 	SkipPhoneValidation bool
 }
@@ -233,7 +229,7 @@ func (s *Service) Enqueue(device models.Device, message MessageIn, opts EnqueueO
 			return state, fmt.Errorf("failed to set data content: %w", err)
 		}
 	} else {
-		return state, errors.New("no text or data content")
+		return state, ErrNoContent
 	}
 
 	if msg.ExtID == "" {

internal/sms-gateway/modules/messages/workers.go

@@ -67,6 +67,6 @@ func (t *hashingWorker) process(ctx context.Context) {
 
 	t.logger.Debug("Hashing messages...")
 	if _, err := t.messages.HashProcessed(ctx, ids); err != nil {
-		t.logger.Error("Can't hash messages", zap.Error(err))
+		t.logger.Error("failed to hash messages", zap.Error(err))
 	}
 }

internal/sms-gateway/modules/push/fcm/client.go

@@ -80,6 +80,9 @@ func (c *Client) Send(ctx context.Context, messages []client.Message) ([]error,
 }
 
 func (c *Client) Close(_ context.Context) error {
+	c.mux.Lock()
+	defer c.mux.Unlock()
+
 	c.client = nil
 
 	return nil

internal/sms-gateway/online/service.go

@@ -47,7 +47,7 @@ func (s *service) Run(ctx context.Context) {
 		case <-ticker.C:
 			s.logger.Debug("Persisting online status")
 			if err := s.persist(ctx); err != nil {
-				s.logger.Error("Can't persist online status", zap.Error(err))
+				s.logger.Error("failed to persist online status", zap.Error(err))
 			}
 		}
 	}
@@ -62,7 +62,7 @@ func (s *service) SetOnline(ctx context.Context, deviceID string) {
 	s.metrics.ObserveCacheLatency(func() {
 		if err = s.cache.Set(ctx, deviceID, []byte(dt)); err != nil {
 			s.metrics.IncrementCacheOperation(operationSet, statusError)
-			s.logger.Error("Can't set online status", zap.String("device_id", deviceID), zap.Error(err))
+			s.logger.Error("failed to set online status", zap.String("device_id", deviceID), zap.Error(err))
 			s.metrics.IncrementStatusSet(false)
 		}
 	})
@@ -98,7 +98,7 @@ func (s *service) persist(ctx context.Context) error {
 		timestamps := maps.MapValues(items, func(v []byte) time.Time {
 			t, err := time.Parse(time.RFC3339, string(v))
 			if err != nil {
-				s.logger.Warn("Can't parse last seen", zap.String("last_seen", string(v)), zap.Error(err))
+				s.logger.Warn("failed to parse last seen", zap.String("last_seen", string(v)), zap.Error(err))
 				return time.Now().UTC()
 			}