Changeset 8180

Timestamp:

02/02/2019 12:48:33 PM (6 years ago)

Author:

ocean90

Message:

Slack: The fallback field should not contain any markup and is therefore an invalid value for mrkdwn_in.

Location:

sites/trunk/common/includes/slack/trac

Files:

• commit-handler.php (modified) (2 diffs)
• commit.php (modified) (2 diffs)

sites/trunk/common/includes/slack/trac/commit-handler.php

@@ -47 +47 @@
 
         $text     = "*$username <$url|$revision> by $author*\n$log";
-        $fallback = "$revision by $author: $log";
+        $fallback = "$username $revision by $author";
 
         $this->send->set_username( $username );
@@ -55 +55 @@
             'text'      => $text,
             'fallback'  => $fallback,
-            'mrkdwn_in' => array( 'text', 'fallback' ),
+            'mrkdwn_in' => array( 'text' ),
         ) );
     }

sites/trunk/common/includes/slack/trac/commit.php

@@ -28 +28 @@
 
         $username = $this->trac->get_commit_username();
-        $url      = $this->get_url();
         $revision = 'r' . $this->id;
         $author   = $this->author;
@@ -35 +34 @@
         $attachment = [];
 
-        $attachment['text']      = "*$username <$url|$revision> by $author*\n$message";
-        $attachment['fallback']  = "$revision by $author: $message";
-        $attachment['mrkdwn_in'] = [ 'text', 'fallback' ];
+        $attachment['title']      = "$username $revision";
+        $attachment['title_link'] = $this->get_url();
+
+        $attachment['author_name'] = $author;
+        $attachment['author_icon'] = sprintf( 'https://wordpress.org/grav-redirect.php?user=%s&s=32', $author );
+
+        $attachment['text']      = $message;
+        $attachment['fallback']  = "$username $revision by $author";
+        $attachment['mrkdwn_in'] = [ 'text' ];
 
         $attachment['ts']          = $this->created;