fixing comments

Signed-off-by: Dhruv Jain <92215138+jaydee029@users.noreply.github.com>

Author: jaydee029

api/handler/comments.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"mime"
 	"net/http"
-	"strconv"
 	"strings"
 	"time"
 
@@ -181,32 +180,35 @@ func (cfg *Handler) Getcomments(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var before int
-	beforestr := r.URL.Query().Get("before")
+	//var before int
+	// before := sql.NullInt32{}
 
-	if beforestr != "" {
-		before, err = strconv.Atoi(beforestr)
-		if err != nil {
-			respondWithError(w, http.StatusInternalServerError, err.Error())
-			return
-		}
-	}
+	// beforestr := r.URL.Query().Get("before")
 
-	limitstr := r.URL.Query().Get("limit")
-	if limitstr == "" {
-		limitstr = "10"
-	}
-	limit, err := strconv.Atoi(limitstr)
-	if err != nil {
-		respondWithError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
+	// if beforestr != "" {
+	// 	beforeint, err := strconv.Atoi(beforestr)
+	// 	if err != nil {
+	// 		respondWithError(w, http.StatusInternalServerError, err.Error())
+	// 		return
+	// 	}
+	// 	before = sql.NullInt32{Int32: int32(beforeint)}
+	// }
+
+	// limitstr := r.URL.Query().Get("limit")
+	// if limitstr == "" {
+	// 	limitstr = "10"
+	// }
+	// limit, err := strconv.Atoi(limitstr)
+	// if err != nil {
+	// 	respondWithError(w, http.StatusInternalServerError, err.Error())
+	// 	return
+	// }
 
 	comments, err := cfg.DB.GetComments(r.Context(), database.GetCommentsParams{
 		UserID:  pgUUID,
 		ProseID: proseid,
-		Column3: int32(before),
-		Limit:   int32(limit),
+		// ID:      before.Int32,
+		// Limit:   int32(limit),
 	})
 
 	if err != nil {

api/handler/notifycomment.go

@@ -26,9 +26,14 @@ func (cfg *Handler) CommentNotification(c Comment) {
 		log.Println("error while converting timestamp to pgtype:", zap.Error(err))
 		return
 	}
+	user_id, err := cfg.DB.GetUserfromProse(context.Background(), c.Proseid)
+	if err != nil {
+		cfg.logger.Info("error while fetching user id from prose during comment notifications:", zap.Error(err))
+		return
+	}
 
 	notification, err := cfg.DB.InsertCommentNotification(context.Background(), database.InsertCommentNotificationParams{
-		UserID:      c.Userid,
+		UserID:      user_id,
 		ProseID:     c.Proseid,
 		GeneratedAt: generated_at_pgtype,
 		ID:          nid_pgtype,
@@ -43,7 +48,7 @@ func (cfg *Handler) CommentNotification(c Comment) {
 
 	n.ID = nid_pgtype
 	n.Actors = notification.Actors
-	n.Userid = c.Userid
+	n.Userid = user_id
 	n.Proseid = c.Proseid
 	n.Generated_at = notification.GeneratedAt
 	n.Type = "comment"

api/handler/realtime.go

@@ -2,9 +2,7 @@ package handler
 
 import (
 	"context"
-	"fmt"
 	"net/http"
-	"time"
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgtype"
@@ -24,8 +22,8 @@ func (cfg *Handler) subscribeTotimeline(w http.ResponseWriter, ctx context.Conte
 	if !ok {
 		respondWithError(w, http.StatusBadRequest, "streaming unsupported")
 	}
-	heartbeat := 10 * time.Second
-	ticker := time.NewTicker(heartbeat)
+	//heartbeat := 10 * time.Second
+	//ticker := time.NewTicker(heartbeat)
 	subch, err := pubsub.Consume[timeline_item](cfg.pubsub, "timeline_direct", "timeline_queue", "timeline_item."+uuid.UUID(userid.Bytes).String())
 	if err != nil {
 		cfg.logger.Info("error consuming items:", zap.Error(err))
@@ -41,14 +39,14 @@ func (cfg *Handler) subscribeTotimeline(w http.ResponseWriter, ctx context.Conte
 			cfg.logger.Info("Received timeline item", zap.String("body", item.Post.Body))
 			writesse(w, "timeline", item)
 			f.Flush()
-		case <-ticker.C:
-			cfg.logger.Info("Sending SSE heartbeat", zap.String("routingKey", "timeline_item."+uuid.UUID(userid.Bytes).String()))
-			_, err := fmt.Fprintf(w, ": heartbeat\n\n")
-			if err != nil {
-				cfg.logger.Error("Error writing SSE heartbeat", zap.Error(err), zap.String("routingKey", "timeline_item."+uuid.UUID(userid.Bytes).String()))
-				return
-			}
-			f.Flush()
+		// case <-ticker.C:
+		// 	cfg.logger.Info("Sending SSE heartbeat", zap.String("routingKey", "timeline_item."+uuid.UUID(userid.Bytes).String()))
+		// 	_, err := fmt.Fprintf(w, ": heartbeat\n\n")
+		// 	if err != nil {
+		// 		cfg.logger.Error("Error writing SSE heartbeat", zap.Error(err), zap.String("routingKey", "timeline_item."+uuid.UUID(userid.Bytes).String()))
+		// 		return
+		// 	}
+		// 	f.Flush()
 		case <-ctx.Done():
 			return
 

internal/database/comments.sql.go

@@ -3,17 +3,16 @@ INSERT INTO comments(prose_id,user_id,body,created_at) VALUES($1,$2,$3,$4)
 RETURNING *;
 
 -- name: GetComments :many
+-- $3:nullable
 SELECT c.id, c.body, c.created_at, c.likes_count, u.username,
 CASE WHEN c.user_id=$1 THEN true ELSE false END AS Mine,
 CASE WHEN Likes.user_id IS NOT NULL THEN true ELSE false END AS Liked
 From comments AS c INNER JOIN users as u ON 
 c.user_id=u.id
 LEFT JOIN comment_likes as Likes
 ON Likes.user_id=$1 AND Likes.comment_id=c.id
-WHERE c.prose_id=$2 AND
-$3::INT IS NULL OR c.id<$3
-ORDER BY c.id DESC 
-LIMIT $4;
+WHERE c.prose_id=$2 
+ORDER BY c.id DESC;
 
 -- name: UpdateCommentCount :exec
 UPDATE prose

internal/database/users.sql.go

@@ -41,4 +41,7 @@ FROM users LEFT JOIN follows as followers
 ON followers.followee_id=$1 AND followers.follower_id=id
 LEFT JOIN follows as followees
 ON followees.follower_id=$1 AND followees.followee_id=id
-WHERE username =$2;
+WHERE username =$2;
+
+-- name: GetUserfromProse :one
+SELECT author_id FROM prose WHERE id=$1;