Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
15e707c
Enhance label event handling in matchIssuesEvent function and add tes…
Sumit189 Apr 29, 2025
76d0a98
Merge branch 'main' into label_delete_event_fix
Sumit189 Apr 29, 2025
cecac31
Enhance matchIssuesEvent function to support multiple label actions a…
Sumit189 Apr 29, 2025
e0ad6b0
Merge branch 'label_delete_event_fix' of https://github.com/Sumit189/…
Sumit189 Apr 29, 2025
6664116
fix assert order
Sumit189 Apr 29, 2025
56314f6
Update modules/actions/workflows.go
Sumit189 Apr 29, 2025
84b684e
Add support for removed labels in issue and pull request notifications
Sumit189 Apr 29, 2025
8b6f3ba
Merge branch 'main' into label_delete_event_fix
Sumit189 May 11, 2025
6aa8ba3
Merge branch 'main' into label_delete_event_fix
Sumit189 May 21, 2025
67d3335
Merge branch 'label_delete_event_fix' of github.com:Sumit189/gitea in…
lunny Sep 8, 2025
141bb3a
Fix test
lunny Sep 8, 2025
e848d7c
Fix checks
lunny Sep 8, 2025
3871a72
fix
lunny Sep 8, 2025
f6ab879
Merge branch 'main' into label_delete_event_fix
Sumit189 Sep 8, 2025
be0855d
Merge branch 'main' into label_delete_event_fix
lunny Sep 9, 2025
bbbe98c
Merge branch 'main' into label_delete_event_fix
Sumit189 Sep 10, 2025
9575dec
Merge branch 'main' into label_delete_event_fix
lunny Sep 12, 2025
fac7e8c
Merge branch 'main' into label_delete_event_fix
lunny Sep 19, 2025
0ca8f14
Merge branch 'main' into label_delete_event_fix
Sumit189 Sep 23, 2025
de00154
Merge branch 'main' into label_delete_event_fix
lunny Sep 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions modules/actions/workflows.go
Original file line number Diff line number Diff line change
Expand Up @@ -362,15 +362,20 @@ func matchIssuesEvent(issuePayload *api.IssuePayload, evt *jobparser.Event) bool
// Actions with the same name:
// opened, edited, closed, reopened, assigned, unassigned, milestoned, demilestoned
// Actions need to be converted:
// label_updated -> labeled
// label_updated -> labeled (when adding) or unlabeled (when removing)
// label_cleared -> unlabeled
// Unsupported activity types:
// deleted, transferred, pinned, unpinned, locked, unlocked

action := issuePayload.Action
switch action {
case api.HookIssueLabelUpdated:
action = "labeled"
// Check if any labels were removed to determine if this should be "labeled" or "unlabeled"
if len(issuePayload.RemovedLabels) > 0 {
action = "unlabeled"
} else {
action = "labeled"
}
case api.HookIssueLabelCleared:
action = "unlabeled"
}
Expand Down
95 changes: 95 additions & 0 deletions modules/actions/workflows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,98 @@ func TestDetectMatched(t *testing.T) {
})
}
}

func TestMatchIssuesEvent(t *testing.T) {
testCases := []struct {
desc string
payload *api.IssuePayload
yamlOn string
expected bool
eventType string
}{
{
desc: "Label deletion should trigger unlabeled event",
payload: &api.IssuePayload{
Action: api.HookIssueLabelUpdated,
Issue: &api.Issue{
Labels: []*api.Label{},
},
RemovedLabels: []*api.Label{
{ID: 123, Name: "deleted-label"},
},
},
yamlOn: "on:\n issues:\n types: [unlabeled]",
expected: true,
eventType: "unlabeled",
},
{
desc: "Label deletion with existing labels should trigger unlabeled event",
payload: &api.IssuePayload{
Action: api.HookIssueLabelUpdated,
Issue: &api.Issue{
Labels: []*api.Label{
{ID: 456, Name: "existing-label"},
},
},
RemovedLabels: []*api.Label{
{ID: 123, Name: "deleted-label"},
},
},
yamlOn: "on:\n issues:\n types: [unlabeled]",
expected: true,
eventType: "unlabeled",
},
{
desc: "Label addition should trigger labeled event",
payload: &api.IssuePayload{
Action: api.HookIssueLabelUpdated,
Issue: &api.Issue{
Labels: []*api.Label{
{ID: 123, Name: "new-label"},
},
},
RemovedLabels: []*api.Label{}, // Empty array, no labels removed
},
yamlOn: "on:\n issues:\n types: [labeled]",
expected: true,
eventType: "labeled",
},
{
desc: "Label clear should trigger unlabeled event",
payload: &api.IssuePayload{
Action: api.HookIssueLabelCleared,
Issue: &api.Issue{
Labels: []*api.Label{},
},
},
yamlOn: "on:\n issues:\n types: [unlabeled]",
expected: true,
eventType: "unlabeled",
},
}

for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
evts, err := GetEventsFromContent([]byte(tc.yamlOn))
assert.NoError(t, err)
assert.Len(t, evts, 1)

// Test if the event matches as expected
assert.Equal(t, tc.expected, matchIssuesEvent(tc.payload, evts[0]))

// For extra validation, use a direct call to test the actual mapping
action := tc.payload.Action
switch action {
case api.HookIssueLabelUpdated:
if len(tc.payload.RemovedLabels) > 0 {
action = "unlabeled"
} else {
action = "labeled"
}
case api.HookIssueLabelCleared:
action = "unlabeled"
}
assert.Equal(t, tc.eventType, string(action), "Event type should match expected")
})
}
}
15 changes: 8 additions & 7 deletions modules/structs/hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,14 @@ const (

// IssuePayload represents the payload information that is sent along with an issue event.
type IssuePayload struct {
Action HookIssueAction `json:"action"`
Index int64 `json:"number"`
Changes *ChangesPayload `json:"changes,omitempty"`
Issue *Issue `json:"issue"`
Repository *Repository `json:"repository"`
Sender *User `json:"sender"`
CommitID string `json:"commit_id"`
Action HookIssueAction `json:"action"`
Index int64 `json:"number"`
Changes *ChangesPayload `json:"changes,omitempty"`
RemovedLabels []*Label `json:"removed_labels"`
Issue *Issue `json:"issue"`
Repository *Repository `json:"repository"`
Sender *User `json:"sender"`
CommitID string `json:"commit_id"`
}

// JSONPayload encodes the IssuePayload to JSON, with an indentation of two spaces.
Expand Down