Fix missing PR notifications when using both pulls_created and pulls_merged (#829)

Signed-off-by: Vadim Aleksandrov <[email protected]>
Co-authored-by: Mattermost Build <[email protected]>

Author: verdel

server/plugin/webhook.go

@@ -408,14 +408,20 @@ func (p *Plugin) postPullRequestEvent(event *github.PullRequestEvent) {
 			continue
 		}
 
-		if sub.PullsMerged() && action != actionClosed {
+		if sub.PullsMerged() && action != actionClosed && !sub.PullsCreated() {
 			continue
 		}
 
-		if sub.PullsCreated() && action != actionOpened {
+		if sub.PullsCreated() && action != actionOpened && !sub.PullsMerged() {
 			continue
 		}
 
+		if sub.PullsMerged() && sub.PullsCreated() {
+			if action != actionClosed && action != actionOpened {
+				continue
+			}
+		}
+
 		if p.excludeConfigOrgMember(event.GetSender(), sub) {
 			continue
 		}