Merge branch 'issue-updates' into pubsub

Author: anbraten

assets/go-licenses.json

@@ -235,10 +235,7 @@ require (
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect

go.mod

@@ -476,8 +476,6 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
-github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
 github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=

go.sum

@@ -5,44 +5,22 @@ package websocket
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 
 	issues_model "code.gitea.io/gitea/models/issues"
-	"code.gitea.io/gitea/models/perm"
-	"code.gitea.io/gitea/models/perm/access"
-	repo_model "code.gitea.io/gitea/models/repo"
-	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/log"
-	"github.com/olahol/melody"
+	"code.gitea.io/gitea/services/pubsub"
 )
 
-func (n *websocketNotifier) filterIssueSessions(ctx context.Context, repo *repo_model.Repository, issue *issues_model.Issue) []*melody.Session {
-	return n.filterSessions(func(s *melody.Session, data *sessionData) bool {
-		// if the user is watching the issue, they will get notifications
-		if !data.isOnURL(fmt.Sprintf("/%s/%s/issues/%d", repo.Owner.Name, repo.Name, issue.Index)) {
-			return false
-		}
-
-		// the user will get notifications if they have access to the repos issues
-		hasAccess, err := access.HasAccessUnit(ctx, data.user, repo, unit.TypeIssues, perm.AccessModeRead)
-		if err != nil {
-			log.Error("Failed to check access: %v", err)
-			return false
-		}
-
-		return hasAccess
-	})
-}
-
 func (n *websocketNotifier) DeleteComment(ctx context.Context, doer *user_model.User, c *issues_model.Comment) {
-	sessions := n.filterIssueSessions(ctx, c.Issue.Repo, c.Issue)
-
-	for _, s := range sessions {
-		msg := fmt.Sprintf(htmxRemoveElement, fmt.Sprintf("#%s", c.HashTag()))
-		err := s.Write([]byte(msg))
-		if err != nil {
-			log.Error("Failed to write to session: %v", err)
-		}
+	d, err := json.Marshal(c)
+	if err != nil {
+		return
 	}
+
+	topic := fmt.Sprintf("repo:%s/%s", c.RefRepo.OwnerName, c.RefRepo.Name)
+	n.pubsub.Publish(ctx, topic, pubsub.Message{
+		Data: d,
+	})
 }

services/websocket/comment_notifier.go

@@ -7,6 +7,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/templates"
 	notify_service "code.gitea.io/gitea/services/notify"
+
 	"github.com/olahol/melody"
 )
 

services/websocket/notifier.go

@@ -31,9 +31,12 @@ type subscribeMessageData struct {
 
 func Init() *melody.Melody {
 	m = melody.New()
-	m.HandleConnect(handleConnect)
-	m.HandleMessage(handleMessage)
-	m.HandleDisconnect(handleDisconnect)
+	hub := &hub{
+		pubsub: pubsub.NewMemory(),
+	}
+	m.HandleConnect(hub.handleConnect)
+	m.HandleMessage(hub.handleMessage)
+	m.HandleDisconnect(hub.handleDisconnect)
 
 	broker := pubsub.NewMemory() // TODO: allow for other pubsub implementations
 	notifier := newNotifier(m)
@@ -74,7 +77,11 @@ func Init() *melody.Melody {
 	return m
 }
 
-func handleConnect(s *melody.Session) {
+type hub struct {
+	pubsub pubsub.Broker
+}
+
+func (h *hub) handleConnect(s *melody.Session) {
 	ctx := gitea_context.GetWebContext(s.Request)
 
 	data := &sessionData{}
@@ -87,7 +94,7 @@ func handleConnect(s *melody.Session) {
 	// TODO: handle logouts
 }
 
-func handleMessage(s *melody.Session, _msg []byte) {
+func (h *hub) handleMessage(s *melody.Session, _msg []byte) {
 	data, err := getSessionData(s)
 	if err != nil {
 		return
@@ -101,14 +108,14 @@ func handleMessage(s *melody.Session, _msg []byte) {
 
 	switch msg.Action {
 	case "subscribe":
-		err := handleSubscribeMessage(data, msg.Data)
+		err := h.handleSubscribeMessage(data, msg.Data)
 		if err != nil {
 			return
 		}
 	}
 }
 
-func handleSubscribeMessage(data *sessionData, _data any) error {
+func (h *hub) handleSubscribeMessage(data *sessionData, _data any) error {
 	msgData := &subscribeMessageData{}
 	err := mapstructure.Decode(_data, &msgData)
 	if err != nil {
@@ -119,5 +126,5 @@ func handleSubscribeMessage(data *sessionData, _data any) error {
 	return nil
 }
 
-func handleDisconnect(s *melody.Session) {
+func (h *hub) handleDisconnect(s *melody.Session) {
 }