Remove unsafe

handlers/scraper/data.go

@@ -150,7 +150,7 @@ func (i *InstaData) parseTimeSliceImpl(embedBody []byte) error {
 		if tt == js.StringToken && bytes.Contains(text, []byte("shortcode_media")) {
 			// Strip quotes from start and end
 			text = text[1 : len(text)-1]
-			unescapeData := utils.UnescapeJSONString(utils.B2S(text))
+			unescapeData := utils.UnescapeJSONString(string(text))
 			if !gjson.Valid(unescapeData) {
 				return errors.New("failed to parse data from TimeSliceImpl")
 			}
@@ -387,14 +387,14 @@ func GetData(postID string) (*InstaData, error) {
 			if dataBucket == nil {
 				return nil
 			}
-			dataBucket.Put(utils.S2B(item.PostID), bb)
+			dataBucket.Put([]byte(item.PostID), bb)
 
 			ttlBucket := tx.Bucket([]byte("ttl"))
 			if ttlBucket == nil {
 				return nil
 			}
 			expTime := strconv.FormatInt(time.Now().Add(24*time.Hour).UnixNano(), 10)
-			ttlBucket.Put(utils.S2B(expTime), utils.S2B(item.PostID))
+			ttlBucket.Put([]byte(expTime), []byte(item.PostID))
 			return nil
 		})
 		if err != nil {

main.go

@@ -4,7 +4,6 @@ import (
 	"flag"
 	"instafix/handlers"
 	scraper "instafix/handlers/scraper"
-	"instafix/utils"
 	"instafix/views"
 	"log/slog"
 	"net/http"
@@ -120,7 +119,7 @@ func evictCache() {
 		}
 		c := ttlBucket.Cursor()
 		for k, v := c.First(); k != nil; k, v = c.Next() {
-			if n, err := strconv.ParseInt(utils.B2S(k), 10, 64); err == nil {
+			if n, err := strconv.ParseInt(string(k), 10, 64); err == nil {
 				if n < curTime {
 					ttlBucket.Delete(k)
 					dataBucket.Delete(v)

utils/jsonesc.go

@@ -120,7 +120,7 @@ func UnescapeJSONString(s string) string {
 	}
 
 	// Slow path - unescape string.
-	b := S2B(s) // It is safe to do, since s points to a byte slice in Parser.b.
+	b := []byte(s) // It is safe to do, since s points to a byte slice in Parser.b.
 	b = b[:n]
 	s = s[n+1:]
 	for len(s) > 0 {
@@ -190,7 +190,7 @@ func UnescapeJSONString(s string) string {
 		b = append(b, s[:n]...)
 		s = s[n+1:]
 	}
-	return B2S(b)
+	return string(b)
 }
 
 func EscapeJSONString(src string) string {