check for cloud oauth instance for comment webhooks

mattermost · Jun 2, 2023 · dc58dd5 · dc58dd5
1 parent 2f03e43
commit dc58dd5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/server/instance.go b/server/instance.go
@@ -68,3 +68,7 @@ func (ic InstanceCommon) GetID() types.ID {
 func (ic *InstanceCommon) Common() *InstanceCommon {
 	return ic
 }
+
+func (ic InstanceCommon) IsCloudInstance() bool {
+	return ic.Type == CloudInstanceType || ic.Type == CloudOAuthInstanceType
+}
diff --git a/server/webhook_jira.go b/server/webhook_jira.go
@@ -86,7 +86,7 @@ func (jwh *JiraWebhook) expandIssue(p *Plugin, instanceID types.ID) error {
 
 	// Jira Cloud comment event. We need to fetch issue data because it is not expanded in webhook payload.
 	isCommentEvent := jwh.WebhookEvent == commentCreated || jwh.WebhookEvent == commentUpdated || jwh.WebhookEvent == commentDeleted
-	if isCommentEvent && instance.Common().Type == "cloud" {
+	if isCommentEvent && instance.Common().IsCloudInstance() {
 		issue, err := p.getIssueDataForCloudWebhook(instance, jwh.Issue.ID)
 		if err != nil {
 			return err