From 85adab715d4898315a31e0e22fc6eed199e653f3 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Nov 17 2017 04:34:15 +0000
Subject: Adjust pagure rules for new message format.


@bex mentioned that the pagure badges were broken.  It seems like the pagure
message format may have changed at some point in the past, and these rules were
never updated to match the new format.

See an example message here:
https://apps.fedoraproject.org/datagrepper/id?id=2017-9c6f4d9f-577e-4347-829f-9952cd4b4ff3&is_raw=true&size=extra-large

---

diff --git a/rules/pagure-long-life-01.yml b/rules/pagure-long-life-01.yml
index 3931743..06b00ce 100644
--- a/rules/pagure-long-life-01.yml
+++ b/rules/pagure-long-life-01.yml
@@ -26,9 +26,9 @@ criteria:
         topics:
         - "%(topic)s"     # The topic of the message that triggered us.
         users:
-        - "%(msg.commit.username)s"
+        - "%(msg.agent)s"
       operation: count
       condition:
         greater than or equal to: 1
 
-recipient: "%(msg.commit.username)s"
+recipient: "%(msg.agent)s"
diff --git a/rules/pagure-long-life-10.yml b/rules/pagure-long-life-10.yml
index 23561fd..0529b76 100644
--- a/rules/pagure-long-life-10.yml
+++ b/rules/pagure-long-life-10.yml
@@ -26,9 +26,9 @@ criteria:
         topics:
         - "%(topic)s"     # The topic of the message that triggered us.
         users:
-        - "%(msg.commit.username)s"
+        - "%(msg.agent)s"
       operation: count
       condition:
         greater than or equal to: 10
 
-recipient: "%(msg.commit.username)s"
+recipient: "%(msg.agent)s"
diff --git a/rules/pagure-long-life-1000.yml b/rules/pagure-long-life-1000.yml
index 74fd796..f523cda 100644
--- a/rules/pagure-long-life-1000.yml
+++ b/rules/pagure-long-life-1000.yml
@@ -26,9 +26,9 @@ criteria:
         topics:
         - "%(topic)s"     # The topic of the message that triggered us.
         users:
-        - "%(msg.commit.username)s"
+        - "%(msg.agent)s"
       operation: count
       condition:
         greater than or equal to: 1000
 
-recipient: "%(msg.commit.username)s"
+recipient: "%(msg.agent)s"
diff --git a/rules/pagure-long-life-150.yml b/rules/pagure-long-life-150.yml
index 0f51caa..e045060 100644
--- a/rules/pagure-long-life-150.yml
+++ b/rules/pagure-long-life-150.yml
@@ -26,9 +26,9 @@ criteria:
         topics:
         - "%(topic)s"     # The topic of the message that triggered us.
         users:
-        - "%(msg.commit.username)s"
+        - "%(msg.agent)s"
       operation: count
       condition:
         greater than or equal to: 150
 
-recipient: "%(msg.commit.username)s"
+recipient: "%(msg.agent)s"
diff --git a/rules/pagure-long-life-50.yml b/rules/pagure-long-life-50.yml
index e709fa7..9d4cf1a 100644
--- a/rules/pagure-long-life-50.yml
+++ b/rules/pagure-long-life-50.yml
@@ -26,9 +26,9 @@ criteria:
         topics:
         - "%(topic)s"     # The topic of the message that triggered us.
         users:
-        - "%(msg.commit.username)s"
+        - "%(msg.agent)s"
       operation: count
       condition:
         greater than or equal to: 50
 
-recipient: "%(msg.commit.username)s"
+recipient: "%(msg.agent)s"
diff --git a/rules/pagure-long-life-500.yml b/rules/pagure-long-life-500.yml
index fe7bfcf..b10f13f 100644
--- a/rules/pagure-long-life-500.yml
+++ b/rules/pagure-long-life-500.yml
@@ -26,9 +26,9 @@ criteria:
         topics:
         - "%(topic)s"     # The topic of the message that triggered us.
         users:
-        - "%(msg.commit.username)s"
+        - "%(msg.agent)s"
       operation: count
       condition:
         greater than or equal to: 500
 
-recipient: "%(msg.commit.username)s"
+recipient: "%(msg.agent)s"