Merge pull request #2541 from traPtitech/fix-lint

Lintが落ちるので変数/引数名を修正
traPtitech · Nov 20, 2024 · 0eb3907 · 0eb3907
2 parents 7b11184 + 1234c61
commit 0eb3907
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/service/bot/ws/handler.go b/service/bot/ws/handler.go
@@ -77,9 +77,9 @@ Command:
 	}
 }
 
-func (s *session) sendErrorMessage(error string) {
+func (s *session) sendErrorMessage(messeage string) {
 	_ = s.WriteMessage(&rawMessage{
 		t:    websocket.TextMessage,
-		data: makeErrorMessage(error).toJSON(),
+		data: makeErrorMessage(messeage).toJSON(),
 	})
 }
diff --git a/service/channel/tree_impl.go b/service/channel/tree_impl.go
@@ -65,14 +65,14 @@ func (n *channelNode) getChildrenIDs() []uuid.UUID {
 }
 
 func (n *channelNode) getChannelDepth() int {
-	max := 0
+	maxDepth := 0
 	for _, c := range n.children {
 		d := c.getChannelDepth()
-		if max < d {
-			max = d
+		if maxDepth < d {
+			maxDepth = d
 		}
 	}
-	return max + 1
+	return maxDepth + 1
 }
 
 func (n *channelNode) getDescendantIDs() []uuid.UUID {

diff --git a/service/ws/handler.go b/service/ws/handler.go
@@ -132,9 +132,9 @@ Command:
 	}
 }
 
-func (s *session) sendErrorMessage(error string) {
+func (s *session) sendErrorMessage(messeage string) {
 	_ = s.WriteMessage(&rawMessage{
 		t:    websocket.TextMessage,
-		data: makeMessage("ERROR", error).toJSON(),
+		data: makeMessage("ERROR", messeage).toJSON(),
 	})
 }
diff --git a/utils/storage/s3_object_test.go b/utils/storage/s3_object_test.go
@@ -113,7 +113,7 @@ func tests3ObjectSeek(t *testing.T) {
 		name       string
 		setupFunc  func(t *testing.T) *s3Object
 		args       args
-		wantNewPos func(len, pos, offset int64) int64
+		wantNewPos func(length, pos, offset int64) int64
 		wantErr    bool
 	}{
 		{
@@ -173,8 +173,8 @@ func tests3ObjectSeek(t *testing.T) {
 				offset: -1024,
 				whence: 2,
 			},
-			wantNewPos: func(len, _, offset int64) int64 {
-				return len + offset
+			wantNewPos: func(length, _, offset int64) int64 {
+				return length + offset
 			},
 		},
 	}