added notifications and minor fixes

Signed-off-by: dhruv <[email protected]>

comments.go

@@ -21,6 +21,7 @@ type Comment struct {
 	Likes_count int              `json:"likes,omitempty"`
 	Liked       bool             `json:"liked,omitempty"`
 	Mine        bool             `json:"mine,omitempty"`
+	User        *User            `json:"user,omitempty"`
 	Body        string           `json:"body"`
 }
 
@@ -107,12 +108,18 @@ func (cfg *apiconfig) postComment(w http.ResponseWriter, r *http.Request) {
 	}
 	tx = nil
 
-	respondWithJson(w, http.StatusAccepted, Comment{
-		Id:         comment.ID,
-		Body:       comment.Body,
-		Proseid:    comment.ProseID,
-		Created_at: comment.CreatedAt,
-	})
+	var c Comment
+
+	c.Body = comment.Body
+	c.Created_at = comment.CreatedAt
+	c.Proseid = comment.ProseID
+	c.Id = comment.ID
+	c.Userid = comment.UserID
+	c.Mine = true
+
+	go cfg.BroadcastComment(c)
+
+	respondWithJson(w, http.StatusAccepted, c)
 }
 
 func (cfg *apiconfig) Getcomments(w http.ResponseWriter, r *http.Request) {

create_prose.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 	"strings"
 	"time"
@@ -117,14 +118,6 @@ func (cfg *apiconfig) postProse(w http.ResponseWriter, r *http.Request) {
 		Mine:       true,
 	})
 
-	/*timelineuuid := uuid.New().String()
-	var timelineId pgtype.UUID
-
-	err = timelineId.Scan(timelineuuid)
-	if err != nil {
-		fmt.Println("Error setting timline id:", err)
-	}*/
-
 	err = qtx.InserinTimeline(r.Context(), database.InserinTimelineParams{
 		ProseID: post_pgUUID,
 		UserID:  pgUUID,
@@ -147,48 +140,44 @@ func (cfg *apiconfig) postProse(w http.ResponseWriter, r *http.Request) {
 		respondWithError(w, http.StatusInternalServerError, "couldn't commit the transaction")
 	}
 
-	go func(p Prose) {
-
-		u, err := cfg.DB.GetUserbyId(r.Context(), p.Userid)
+	go cfg.prosecreated(tl.Post)
 
-		if err != nil {
-			respondWithError(w, http.StatusInternalServerError, "couldn't fetch the user")
-			return
-		}
-
-		p.User.Email = u.Email
-		p.User.ID = u.ID
-		p.User.Name = u.Name
-		p.User.Username = u.Username
-		p.Mine = false
+}
 
-		tl, err := cfg.fanoutprose(r.Context(), p)
-		if err != nil {
-			respondWithError(w, http.StatusInternalServerError, "couldn't fanout the post")
-			return
-		}
+func (cfg *apiconfig) prosecreated(p Prose) {
+	u, err := cfg.DB.GetUserbyId(context.Background(), p.Userid)
 
-		for _, i := range tl {
-			fmt.Println(i)
-			//TODO: Broadcast
-		}
+	if err != nil {
+		log.Println(err)
+		return
+	}
 
-	}(tl.Post)
+	p.User.Email = u.Email
+	p.User.ID = u.ID
+	p.User.Name = u.Name
+	p.User.Username = u.Username
+	p.Mine = false
 
+	go cfg.fanoutprose(p)
+	go cfg.notifypostmentions(p)
 }
 
-func (cfg *apiconfig) fanoutprose(ctx context.Context, p Prose) ([]database.FetchTimelineItemsRow, error) {
+func (cfg *apiconfig) fanoutprose(p Prose) {
 
-	items, err := cfg.DB.FetchTimelineItems(ctx, database.FetchTimelineItemsParams{
+	items, err := cfg.DB.FetchTimelineItems(context.Background(), database.FetchTimelineItemsParams{
 		ProseID:    p.ID,
 		FolloweeID: p.Userid,
 	})
 
 	if err != nil {
-		return []database.FetchTimelineItemsRow{}, err
+		log.Println(err)
+		return
 	}
 
-	return items, nil
+	for _, i := range items {
+		fmt.Println(i)
+		//TODO: Broadcast
+	}
 
 }
 

internal/auth/authentication.go

@@ -21,7 +21,7 @@ func Tokenize(id uuid.UUID, secret_key string) (string, error) {
 	claims := &jwt.RegisteredClaims{
 		Issuer:    "verses-access",
 		IssuedAt:  jwt.NewNumericDate(time.Now().UTC()),
-		ExpiresAt: jwt.NewNumericDate(time.Now().UTC().Add(time.Duration(60*60) * time.Second)), // 1 hour
+		ExpiresAt: jwt.NewNumericDate(time.Now().UTC().AddDate(0, 0, 1)), // 1 day
 		Subject:   id.String(),
 	}
 

main.go

@@ -87,6 +87,8 @@ func main() {
 	})
 
 	s.Get("/healthz", apireadiness)
+	s.Post("/users", apicfg.createUser)
+	s.Post("/login", apicfg.userLogin)
 	s.Post("/prose", apicfg.postProse)
 	s.Get("/{username}/prose", apicfg.getProse)
 	s.Get("/prose/{proseId}", apicfg.ProsebyId)
@@ -95,8 +97,6 @@ func main() {
 	s.Post("/{proseid}/comments", apicfg.postComment)
 	s.Get("/{proseid}/comments", apicfg.Getcomments)
 	s.Post("/comments/{commentid}/togglelike", apicfg.toggCommentLike)
-	s.Post("/users", apicfg.createUser)
-	s.Post("/login", apicfg.userLogin)
 	s.Post("/refresh", apicfg.verifyRefresh)
 	s.Post("/revoke", apicfg.revokeToken)
 	s.Put("/users", apicfg.updateUser)

notifications.go

@@ -12,7 +12,8 @@ import (
 
 type Notification struct {
 	ID           pgtype.UUID      `json:"id"`
-	User_id      pgtype.UUID      `json:"user_id"`
+	Userid       pgtype.UUID      `json:"userid"`
+	Proseid      pgtype.UUID      `json:"proseid"`
 	Actors       []string         `json:"actors"`
 	Generated_at pgtype.Timestamp `json:"generated_at"`
 	Read         bool             `json:"read"`
@@ -80,7 +81,7 @@ func (cfg *apiconfig) Notifications(w http.ResponseWriter, r *http.Request) {
 	for _, k := range notifications {
 		Notifications = append(Notifications, Notification{
 			ID:           k.ID,
-			User_id:      k.UserID,
+			Userid:       k.UserID,
 			Actors:       k.Actors,
 			Generated_at: k.GeneratedAt,
 			Type:         k.Type,