Merge branch 'master' into socketmode-handler

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,6 +9,10 @@ about: Create a report to help us improve
 
 ### Steps to reproduce
 
+#### reproducible code
+
+#### manifest.yaml
+
 ### Versions
 - Go:
 - slack-go/slack:

.github/workflows/test.yml

@@ -7,32 +7,30 @@ on:
   pull_request:
 
 jobs:
-  ci:
-    runs-on: ubuntu-latest
-    name: lint
-    steps:
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          version: v1.32
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         go:
-          - '1.13'
-          - '1.14'
-          - '1.15'
           - '1.16'
           - '1.17'
+          - '1.18'
     name: test go-${{ matrix.go }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
       - name: run test
         run: go test -v -race ./...
         env:
           GO111MODULE: on
+  lint:
+    runs-on: ubuntu-20.04
+    name: lint
+    steps:
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest

README.md

@@ -1,9 +1,9 @@
 Slack API in Go [![Go Reference](https://pkg.go.dev/badge/github.com/slack-go/slack.svg)](https://pkg.go.dev/github.com/slack-go/slack)
 ===============
 
-This is the original Slack library for Go created by Norberto Lopes, transferred to a Github organization.
+This is the original Slack library for Go created by Norberto Lopes, transferred to a GitHub organization.
 
-[![Join the chat at https://gitter.im/go-slack/Lobby](https://badges.gitter.im/go-slack/Lobby.svg)](https://gitter.im/go-slack/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+You can also chat with us on the #slack-go, #slack-go-ja Slack channel on the Gophers Slack.
 
 ![logo](logo.png "icon")
 
@@ -70,8 +70,15 @@ func main() {
 }
 ```
 
+## Minimal Socket Mode usage:
+
+See https://github.com/slack-go/slack/blob/master/examples/socketmode/socketmode.go
+
+
 ## Minimal RTM usage:
 
+As mentioned in https://api.slack.com/rtm - for most applications, Socket Mode is a better way to communicate with Slack.
+
 See https://github.com/slack-go/slack/blob/master/examples/websocket/websocket.go
 
 

apps.go

@@ -44,14 +44,18 @@ func (api *Client) ListEventAuthorizationsContext(ctx context.Context, eventCont
 }
 
 func (api *Client) UninstallApp(clientID, clientSecret string) error {
+	return api.UninstallAppContext(context.Background(), clientID, clientSecret)
+}
+
+func (api *Client) UninstallAppContext(ctx context.Context, clientID, clientSecret string) error {
 	values := url.Values{
 		"client_id":     {clientID},
 		"client_secret": {clientSecret},
 	}
 
 	response := SlackResponse{}
 
-	err := api.getMethod(context.Background(), "apps.uninstall", api.token, values, &response)
+	err := api.getMethod(ctx, "apps.uninstall", api.token, values, &response)
 	if err != nil {
 		return err
 	}

audit.go

@@ -39,6 +39,16 @@ type AuditEntry struct {
 		UA        string `json:"ua"`
 		IPAddress string `json:"ip_address"`
 	} `json:"context"`
+	Details struct {
+		NewValue      interface{} `json:"new_value"`
+		PreviousValue interface{} `json:"previous_value"`
+		MobileOnly    bool        `json:"mobile_only"`
+		WebOnly       bool        `json:"web_only"`
+		NonSSOOnly    bool        `json:"non_sso_only"`
+		ExportType    string      `json:"export_type"`
+		ExportStart   string      `json:"export_start_ts"`
+		ExportEnd     string      `json:"export_end_ts"`
+	} `json:"details"`
 }
 
 type AuditUser struct {

block.go

@@ -9,14 +9,15 @@ package slack
 type MessageBlockType string
 
 const (
-	MBTSection MessageBlockType = "section"
-	MBTDivider MessageBlockType = "divider"
-	MBTImage   MessageBlockType = "image"
-	MBTAction  MessageBlockType = "actions"
-	MBTContext MessageBlockType = "context"
-	MBTFile    MessageBlockType = "file"
-	MBTInput   MessageBlockType = "input"
-	MBTHeader  MessageBlockType = "header"
+	MBTSection  MessageBlockType = "section"
+	MBTDivider  MessageBlockType = "divider"
+	MBTImage    MessageBlockType = "image"
+	MBTAction   MessageBlockType = "actions"
+	MBTContext  MessageBlockType = "context"
+	MBTFile     MessageBlockType = "file"
+	MBTInput    MessageBlockType = "input"
+	MBTHeader   MessageBlockType = "header"
+	MBTRichText MessageBlockType = "rich_text"
 )
 
 // Block defines an interface all block types should implement

block_conv.go

@@ -2,9 +2,8 @@ package slack
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
-
-	"github.com/pkg/errors"
 )
 
 type sumtype struct {
@@ -65,6 +64,8 @@ func (b *Blocks) UnmarshalJSON(data []byte) error {
 			block = &ImageBlock{}
 		case "input":
 			block = &InputBlock{}
+		case "rich_text":
+			block = &RichTextBlock{}
 		case "section":
 			block = &SectionBlock{}
 		default:

block_element.go

@@ -167,6 +167,12 @@ func (s *ButtonBlockElement) WithStyle(style Style) *ButtonBlockElement {
 	return s
 }
 
+// WithConfirm adds a confirmation dialogue to the button object and returns the modified ButtonBlockElement
+func (s *ButtonBlockElement) WithConfirm(confirm *ConfirmationBlockObject) *ButtonBlockElement {
+	s.Confirm = confirm
+	return s
+}
+
 // NewButtonBlockElement returns an instance of a new button element to be used within a block
 func NewButtonBlockElement(actionID, value string, text *TextBlockObject) *ButtonBlockElement {
 	return &ButtonBlockElement{

block_object.go

@@ -187,8 +187,9 @@ func (s ConfirmationBlockObject) validateType() MessageObjectType {
 }
 
 // WithStyle add styling to confirmation object
-func (s *ConfirmationBlockObject) WithStyle(style Style) {
+func (s *ConfirmationBlockObject) WithStyle(style Style) *ConfirmationBlockObject {
 	s.Style = style
+	return s
 }
 
 // NewConfirmationBlockObject returns an instance of a new Confirmation Block Object