fix: lint

pet-sitter · Aug 19, 2024 · 1c50485 · 1c50485
1 parent 5692a93
commit 1c50485
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/internal/domain/media/view.go b/internal/domain/media/view.go
@@ -33,7 +33,7 @@ func ToDetailViewFromCreated(media databasegen.CreateMediaRow) *DetailView {
  }
 }
 
-func ToDetailViewFromFindByIDs(media *databasegen.FindMediasByIDsRow) *DetailView {
+func ToDetailViewFromFindByIDs(media databasegen.FindMediasByIDsRow) *DetailView {
  return &DetailView{
  ID: int64(media.ID),
  MediaType: Type(media.MediaType),

diff --git a/internal/service/media_service.go b/internal/service/media_service.go
@@ -100,7 +100,7 @@ func (s *MediaService) FindMediasByIDs(ctx context.Context, ids []int64) ([]medi
  }
  views := make([]media.DetailView, 0)
  for _, mediaData := range mediaDataList {
- views = append(views, *media.ToDetailViewFromFindByIDs(&mediaData))
+ views = append(views, *media.ToDetailViewFromFindByIDs(mediaData))
  }
 
  // Sort by given IDs

diff --git a/internal/wschat/server.go b/internal/wschat/server.go
@@ -115,7 +115,6 @@ func (s *WSServer) LoopOverClientMessages() {
  switch msgReq.MessageType {
  case "plain":
  msg = NewPlainMessageResponse(msgReq.MessageID, msgReq.Sender, msgReq.Room, msgReq.Message, time.Now())
- break
  case "media":
  if len(msgReq.Medias) == 0 {
  log.Error().Msg("No media found")
@@ -129,10 +128,10 @@ func (s *WSServer) LoopOverClientMessages() {
  if err != nil {
  log.Error().Err(err.Err).Msg("Failed to find media")
  msg = NewErrorMessageResponse(msgReq.MessageID, msgReq.Sender, msgReq.Room, "Failed to find media", time.Now())
+ } else {
+ msg = NewMediaMessageResponse(msgReq.MessageID, msgReq.Sender, msgReq.Room, medias, time.Now())
  }
- msg = NewMediaMessageResponse(msgReq.MessageID, msgReq.Sender, msgReq.Room, medias, time.Now())
  }
- break
  default:
  log.Error().Msg("Unknown message type")
  return
@@ -188,7 +187,12 @@ type MessageRequest struct {
 }
 
 func (m MessageRequest) String() string {
- return "Sender: " + strconv.Itoa(int(m.Sender.ID)) + " Room: " + strconv.Itoa(int(m.Room.ID)) + " MessageID: " + m.MessageID + " MessageType: " + m.MessageType + " Message: " + m.Message + " Medias: " + strconv.Itoa(len(m.Medias))
+ return "Sender: " + strconv.Itoa(int(m.Sender.ID)) +
+ " Room: " + strconv.Itoa(int(m.Room.ID)) +
+ " MessageID: " + m.MessageID +
+ " MessageType: " + m.MessageType +
+ " Message: " + m.Message +
+ " Medias: " + strconv.Itoa(len(m.Medias))
 }
 
 type MessageResponse struct {