Refactor with slices.Contains and simplify loops

Author: bootjp

adapter/redis_compat_commands.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -697,11 +698,9 @@ func (r *RedisServer) sismember(conn redcon.Conn, cmd redcon.Command) {
 		conn.WriteError(err.Error())
 		return
 	}
-	for _, member := range value.Members {
-		if member == string(cmd.Args[2]) {
-			conn.WriteInt(1)
-			return
-		}
+	if slices.Contains(value.Members, string(cmd.Args[2])) {
+		conn.WriteInt(1)
+		return
 	}
 	conn.WriteInt(0)
 }
@@ -2032,7 +2031,7 @@ func splitXReadStreams(args [][]byte, streamsIndex int) ([][]byte, []string, err
 	streamCount := remaining / redisPairWidth
 	keys := make([][]byte, streamCount)
 	afterIDs := make([]string, streamCount)
-	for i := 0; i < streamCount; i++ {
+	for i := range streamCount {
 		keys[i] = args[streamsIndex+i]
 		afterIDs[i] = string(args[streamsIndex+streamCount+i])
 	}

adapter/redis_compat_types.go

@@ -226,10 +226,7 @@ func unmarshalStreamValue(raw []byte) (redisStreamValue, error) {
 }
 
 func encodeRedisTTL(expireAt time.Time) []byte {
-	ms := expireAt.UnixMilli()
-	if ms < 0 {
-		ms = 0
-	}
+	ms := max(expireAt.UnixMilli(), 0)
 	buf := make([]byte, redisUint64Bytes)
 	binary.BigEndian.PutUint64(buf, uint64(ms)) // #nosec G115 -- ms is clamped to non-negative int64 range.
 	return buf
@@ -239,10 +236,7 @@ func decodeRedisTTL(raw []byte) (time.Time, error) {
 	if len(raw) != redisUint64Bytes {
 		return time.Time{}, errors.WithStack(errors.Newf("invalid ttl length %d", len(raw)))
 	}
-	ms := binary.BigEndian.Uint64(raw)
-	if ms > math.MaxInt64 {
-		ms = math.MaxInt64
-	}
+	ms := min(binary.BigEndian.Uint64(raw), math.MaxInt64)
 	return time.UnixMilli(int64(ms)), nil // #nosec G115 -- ms <= MaxInt64 is guaranteed by the check above.
 }
 

adapter/redis_misskey_compat_test.go

@@ -138,7 +138,7 @@ func TestRedis_MisskeyAdminCompatibility(t *testing.T) {
 
 	ps := sub.Subscribe(ctx, "misskey.pubsub.one", "misskey.pubsub.two")
 	defer func() { _ = ps.Close() }()
-	for i := 0; i < 2; i++ {
+	for range 2 {
 		_, err = ps.ReceiveTimeout(ctx, 2*time.Second)
 		require.NoError(t, err)
 	}
@@ -268,7 +268,7 @@ func TestRedis_MisskeyDirectDataStructures(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, xrev, 1)
 	require.Equal(t, "1002-0", xrev[0].ID)
-	require.Equal(t, map[string]interface{}{"data": `{"id":"n3"}`}, xrev[0].Values)
+	require.Equal(t, map[string]any{"data": `{"id":"n3"}`}, xrev[0].Values)
 
 	xrange, err := rdb.XRange(ctx, "notificationTimeline:u1", "1001-0", "+").Result()
 	require.NoError(t, err)

adapter/redis_retry_test.go

@@ -134,8 +134,8 @@ func (c *recordingConn) WriteAny(v any) {
 		c.WriteNull()
 	}
 }
-func (c *recordingConn) Context() interface{} { return c.ctx }
-func (c *recordingConn) SetContext(v interface{}) {
+func (c *recordingConn) Context() any { return c.ctx }
+func (c *recordingConn) SetContext(v any) {
 	c.ctx = v
 }
 func (c *recordingConn) SetReadBuffer(bytes int) {}