Merge pull request #16 from tigerteufel85/boggy-15/change-slack-depen…

…dency Change dependency for Slack
tigerteufel85 · Mar 1, 2022 · fae2248 · fae2248
2 parents 343a33c + 6205164
commit fae2248
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 21 deletions.
diff --git a/bot/bot.go b/bot/bot.go
@@ -3,7 +3,7 @@ package bot
 import (
 	"context"
 	"fmt"
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/client"
 	"github.com/tigerteufel85/boggy/config"
 	"strings"

diff --git a/bot/command.go b/bot/command.go
@@ -2,7 +2,7 @@ package bot
 
 import (
 	"context"
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 )
 
 // Commands is a wrapper of a list of commands. Only the first matched command will be executed

diff --git a/bot/reload.go b/bot/reload.go
@@ -1,7 +1,7 @@
 package bot
 
 import (
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/client"
 	"time"
 )

diff --git a/bot/scheduler.go b/bot/scheduler.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"gopkg.in/robfig/cron.v2"
 )
 

diff --git a/bot/user.go b/bot/user.go
@@ -3,7 +3,7 @@ package bot
 import (
 	"bufio"
 	"fmt"
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/client"
 	"github.com/tigerteufel85/boggy/config"
 	"log"
@@ -84,8 +84,15 @@ func (b *Bot) loadChannelsUsersAndProjects(config *config.Config) error {
 	var cursor string
 	var channels []slack.Channel
 	client.Channels = make(map[string]string)
+
 	for {
-		params := slack.GetConversationsParameters{Cursor: cursor, Types: []string{"private_channel", "public_channel"}}
+		params := slack.GetConversationsParameters{
+			Limit: 1000,
+			Cursor: cursor,
+			ExcludeArchived: true,
+			Types: []string{"private_channel", "public_channel"},
+		}
+
 		channels, cursor, err = b.slackClient.GetConversations(&params)
 		if err != nil {
 			return err

diff --git a/client/slack.go b/client/slack.go
@@ -2,7 +2,7 @@ package client
 
 import (
 	"fmt"
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/config"
 	"strings"
 )

diff --git a/command/admin_add_user.go b/command/admin_add_user.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 )
 

diff --git a/command/admin_remove_user.go b/command/admin_remove_user.go
@@ -10,7 +10,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 )
 

diff --git a/command/help.go b/command/help.go
@@ -6,7 +6,7 @@ import (
 	"github.com/tigerteufel85/boggy/client"
 	"strings"
 
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 	"regexp"
 	"sort"

diff --git a/command/jira_issue.go b/command/jira_issue.go
@@ -2,7 +2,7 @@ package command
 
 import (
 	"context"
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 	"github.com/tigerteufel85/boggy/client"
 	"github.com/tigerteufel85/boggy/config"

diff --git a/command/jira_issues.go b/command/jira_issues.go
@@ -2,7 +2,7 @@ package command
 
 import (
 	"context"
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 	"github.com/tigerteufel85/boggy/client"
 	"github.com/tigerteufel85/boggy/config"

diff --git a/command/jira_issues_single.go b/command/jira_issues_single.go
@@ -2,7 +2,7 @@ package command
 
 import (
 	"context"
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 	"github.com/tigerteufel85/boggy/client"
 	"github.com/tigerteufel85/boggy/config"

diff --git a/command/jira_overview.go b/command/jira_overview.go
@@ -6,7 +6,7 @@ import (
 	"github.com/tigerteufel85/boggy/config"
 	"strings"
 
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 	"github.com/tigerteufel85/boggy/utils"
 	"gopkg.in/andygrunwald/go-jira.v1"

diff --git a/command/schedule_add.go b/command/schedule_add.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tigerteufel85/boggy/config"
 	"strings"
 
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 	"github.com/tigerteufel85/boggy/utils"
 	"gopkg.in/andygrunwald/go-jira.v1"

diff --git a/command/schedule_delete.go b/command/schedule_delete.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"github.com/tigerteufel85/boggy/client"
 
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 	"strings"
 )

diff --git a/command/schedule_list.go b/command/schedule_list.go
@@ -5,7 +5,7 @@ import (
 	"github.com/tigerteufel85/boggy/client"
 
 	"fmt"
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/bot"
 	"strings"
 )

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/imdario/mergo v0.3.7
-	github.com/nlopes/slack v0.5.0
+	github.com/slack-go/slack v0.10.2
 	gopkg.in/andygrunwald/go-jira.v1 v1.6.0
 	gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5
 	gopkg.in/yaml.v2 v2.2.2
@@ -13,8 +13,7 @@ require (
 require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/gorilla/websocket v1.4.0 // indirect
-	github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/pkg/errors v0.8.1 // indirect
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/trivago/tgo v1.0.5 // indirect

diff --git a/utils/response_layout.go b/utils/response_layout.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"fmt"
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 	"github.com/tigerteufel85/boggy/config"
 	"gopkg.in/andygrunwald/go-jira.v1"
 	"strings"