3 changed files with 23 additions and 18 deletions
-4
View File
@@ -1,4 +0,0 @@
# Test Webhook Notification
This file exists only to trigger a test webhook notification.
Delete after testing.
+1 -1
View File
@@ -58,4 +58,4 @@ if [ -n "$MANUAL_USER_MAPPINGS" ]; then
done done
fi fi
exec ./gitea-notification-hub -config /app/config/config.yaml exec ./gitea-notification-hub -config /app/config/config.yaml -debug
+22 -13
View File
@@ -114,15 +114,20 @@ func (p *Processor) HandlePullRequest(e *webhook.PullRequestEvent) {
case "review_requested": case "review_requested":
event.Type = TypePRReviewRequested event.Type = TypePRReviewRequested
// Notify newly requested reviewers (array) if len(event.Reviewers) > 0 {
if len(e.RequestedReviewers) > 0 { for _, u := range event.Reviewers {
for _, reviewer := range e.RequestedReviewers { p.logger.Debug().Str("requested_reviewer", u.GiteaUsername).Msg("review_requested event")
p.logger.Debug().Str("requested_reviewer", reviewer.Login).Msg("review_requested event")
usersToNotify = append(usersToNotify, struct { usersToNotify = append(usersToNotify, struct {
user User user User
reason NotificationReason reason NotificationReason
}{giteaUserToUser(reviewer), ReasonReviewer}) }{u, ReasonReviewer})
} }
} else if e.RequestedReviewer != nil {
p.logger.Debug().Str("requested_reviewer", e.RequestedReviewer.Login).Msg("review_requested event")
usersToNotify = append(usersToNotify, struct {
user User
reason NotificationReason
}{giteaUserToUser(*e.RequestedReviewer), ReasonReviewer})
} else { } else {
p.logger.Debug().Msg("review_requested event but no RequestedReviewers field") p.logger.Debug().Msg("review_requested event but no RequestedReviewers field")
} }
@@ -170,14 +175,18 @@ func (p *Processor) HandlePullRequest(e *webhook.PullRequestEvent) {
} }
} }
// Remove the actor from notifications (don't notify yourself) // Remove the actor from notifications (don't notify yourself) - but SKIP for review_requested because CI automation may request as same user
beforeFilter := len(usersToNotify) if e.Action == "review_requested" {
usersToNotify = p.filterOutActor(usersToNotify, event.Actor) p.logger.Debug().Str("actor", event.Actor.GiteaUsername).Msg("skipping actor filter for review_requested (CI automation)")
p.logger.Debug(). } else {
Int("before_filter", beforeFilter). beforeFilter := len(usersToNotify)
Int("after_filter", len(usersToNotify)). usersToNotify = p.filterOutActor(usersToNotify, event.Actor)
Str("actor_filtered", event.Actor.GiteaUsername). p.logger.Debug().
Msg("filtered out actor from notifications") Int("before_filter", beforeFilter).
Int("after_filter", len(usersToNotify)).
Str("actor_filtered", event.Actor.GiteaUsername).
Msg("filtered out actor from notifications")
}
// Send notifications // Send notifications
p.sendNotifications(ctx, event, usersToNotify) p.sendNotifications(ctx, event, usersToNotify)