From ae917cc13664f528207eb60f476e6f8bc1b067e4 Mon Sep 17 00:00:00 2001
From: Dave Hart <dphart@rochester.rr.com>
Date: Wed, 13 Jul 2022 16:44:56 -0400
Subject: [PATCH] Update to use new mattermost webhook

---
 .github/workflows/mattermost-ziti-webhook.yml | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/mattermost-ziti-webhook.yml b/.github/workflows/mattermost-ziti-webhook.yml
index fb6d0802c..dee7cfd61 100644
--- a/.github/workflows/mattermost-ziti-webhook.yml
+++ b/.github/workflows/mattermost-ziti-webhook.yml
@@ -1,15 +1,16 @@
 name: mattermost-ziti-webhook
-on: 
-  create:
-  delete:
+on:
   issues:
   issue_comment:
   pull_request_review:
+    types: [submitted]
   pull_request_review_comment:
   pull_request:
+    types: [opened, reopened]
   push:
   fork:
   release:
+    types: [released]
   workflow_dispatch:
 
 jobs:
@@ -17,9 +18,15 @@ jobs:
     runs-on: ubuntu-latest
     name: POST Webhook
     steps:
-    - uses: openziti/ziti-webhook-action@v2
-      if: github.repository_owner == 'openziti'
+    - uses: openziti/ziti-mattermost-action-py@main
+      if: |
+        github.repository_owner == 'openziti'
+        && ((github.event_name != 'pull_request_review')
+        || (github.event_name == 'pull_request_review' && github.event.review.state == 'approved'))
       with:
-        ziti-id: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
-        webhook-url: ${{ secrets.ZITI_MATTERMOST_WEBHOOK_URL }}
-        webhook-secret: ${{ secrets.ZITI_MATTERMOSTI_WEBHOOK_SECRET }}
+        zitiId: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
+        webhookUrl: ${{ secrets.ZHOOK_URL }}
+        eventJson: ${{ toJson(github.event) }}
+        senderUsername: "GitHubZ"
+        destChannel: "dev-notifications"
+