siwtch to fork

anastanira · Feb 11, 2024 · 3cffb4d · 3cffb4d
1 parent 2fb4239
commit 3cffb4d
Show file tree

Hide file tree

Showing 101 changed files with 101 additions and 101 deletions.
diff --git a/auth/auth.go b/auth/auth.go
@@ -11,7 +11,7 @@ import (
 	"runtime/trace"
 
 	"github.com/rusq/chttp"
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 )
 
 const SlackURL = "https://slack.com"

diff --git a/auth/auth_error.go b/auth/auth_error.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 )
 
 // Error is the error returned by New, the underlying Err contains

diff --git a/auth/auth_error_test.go b/auth/auth_error_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 )
 
 var errSample = errors.New("test error")

diff --git a/channels.go b/channels.go
@@ -7,7 +7,7 @@ import (
 	"runtime/trace"
 	"time"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 
 	"github.com/rusq/slackdump/v3/internal/network"
 	"github.com/rusq/slackdump/v3/types"

diff --git a/channels_test.go b/channels_test.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 

diff --git a/clienter_mock_test.go b/clienter_mock_test.go
diff --git a/cmd/slackdump/internal/authcmd/list.go b/cmd/slackdump/internal/authcmd/list.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 
 	"github.com/rusq/slackdump/v3"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/cfg"

diff --git a/cmd/slackdump/internal/cfg/cfg.go b/cmd/slackdump/internal/cfg/cfg.go
@@ -102,7 +102,6 @@ func SetBaseFlags(fs *flag.FlagSet, mask FlagMask) {
 	if mask&OmitOutputFlag == 0 {
 		base := fmt.Sprintf("slackdump_%s.zip", time.Now().Format(filenameLayout))
 		fs.StringVar(&Output, "o", osenv.Value("BASE_LOC", base), "a `location` (a directory or a ZIP file) on the local disk to save\ndownloaded files to.")
-		fs.StringVar(&Output, "output", osenv.Value("BASE_LOC", base), "synonym for -o")
 	}
 	if mask&OmitCacheDir == 0 {
 		fs.StringVar(&LocalCacheDir, "cache-dir", osenv.Value("CACHE_DIR", CacheDir()), "cache `directory` location\n")

diff --git a/cmd/slackdump/internal/diag/thread.go b/cmd/slackdump/internal/diag/thread.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/joho/godotenv"
 	"github.com/rusq/osenv/v2"
+	"github.com/rusq/slack"
 	"github.com/schollz/progressbar/v3"
-	"github.com/slack-go/slack"
 
 	"github.com/rusq/slackdump/v3"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/cfg"

diff --git a/cmd/slackdump/internal/export/v3.go b/cmd/slackdump/internal/export/v3.go
@@ -5,8 +5,8 @@ import (
 	"os"
 
 	"github.com/rusq/fsadapter"
+	"github.com/rusq/slack"
 	"github.com/schollz/progressbar/v3"
-	"github.com/slack-go/slack"
 
 	"github.com/rusq/slackdump/v3"
 

diff --git a/cmd/slackdump/internal/export/v3_test.go b/cmd/slackdump/internal/export/v3_test.go
@@ -13,12 +13,12 @@ import (
 
 	"github.com/rusq/dlog"
 	"github.com/rusq/fsadapter"
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3"
 	"github.com/rusq/slackdump/v3/internal/chunk"
 	"github.com/rusq/slackdump/v3/internal/chunk/chunktest"
 	"github.com/rusq/slackdump/v3/internal/structures"
 	"github.com/rusq/slackdump/v3/logger"
-	"github.com/slack-go/slack"
 )
 
 const (

diff --git a/cmd/slackdump/internal/format/format.go b/cmd/slackdump/internal/format/format.go
@@ -13,7 +13,7 @@ import (
 	"runtime/trace"
 
 	"github.com/rusq/dlog"
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 
 	"github.com/rusq/slackdump/v3"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/authcmd"

diff --git a/cmd/slackdump/internal/list/list.go b/cmd/slackdump/internal/list/list.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/charmbracelet/huh"
 	"github.com/rusq/fsadapter"
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3"
 	"github.com/rusq/slackdump/v3/auth"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/cfg"
@@ -21,7 +22,6 @@ import (
 	"github.com/rusq/slackdump/v3/internal/format"
 	"github.com/rusq/slackdump/v3/logger"
 	"github.com/rusq/slackdump/v3/types"
-	"github.com/slack-go/slack"
 )
 
 const (

diff --git a/downloader/deprecated.go b/downloader/deprecated.go
@@ -10,7 +10,7 @@ import (
 
 	"errors"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 	"golang.org/x/time/rate"
 
 	"github.com/rusq/fsadapter"

diff --git a/downloader/deprecated_test.go b/downloader/deprecated_test.go
@@ -11,7 +11,7 @@ import (
 
 	"errors"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	gomock "go.uber.org/mock/gomock"

diff --git a/downloader/downloader_example_test.go b/downloader/downloader_example_test.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/rusq/fsadapter"
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/downloader"
-	"github.com/slack-go/slack"
 	"golang.org/x/time/rate"
 )
 

diff --git a/export/expfmt.go b/export/expfmt.go
@@ -1,7 +1,7 @@
 package export
 
 import (
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 
 	"github.com/rusq/fsadapter"
 	"github.com/rusq/slackdump/v3/internal/structures/files/dl"

diff --git a/export/expfmt_test.go b/export/expfmt_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/rusq/fsadapter"
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/logger"
-	"github.com/slack-go/slack"
 )
 
 func Test_newFileExporter(t *testing.T) {

diff --git a/export/export.go b/export/export.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"runtime/trace"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 
 	"github.com/rusq/fsadapter"
 	"github.com/rusq/slackdump/v3"

diff --git a/export/export_test.go b/export/export_test.go
@@ -14,14 +14,14 @@ import (
 	"time"
 
 	"github.com/rusq/fsadapter"
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3"
 	"github.com/rusq/slackdump/v3/internal/fixtures"
 	"github.com/rusq/slackdump/v3/internal/mocks/mock_dl"
 	"github.com/rusq/slackdump/v3/internal/mocks/mock_fsadapter"
 	"github.com/rusq/slackdump/v3/internal/mocks/mock_io"
 	"github.com/rusq/slackdump/v3/internal/structures"
 	"github.com/rusq/slackdump/v3/types"
-	"github.com/slack-go/slack"
 	"github.com/stretchr/testify/assert"
 	gomock "go.uber.org/mock/gomock"
 )

diff --git a/export/future.go b/export/future.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3"
 	"github.com/rusq/slackdump/v3/types"
-	"github.com/slack-go/slack"
 )
 
 // this file is named future.go to avoid conflicts when merging with the v3.0.0

diff --git a/export/message.go b/export/message.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 
 	"github.com/rusq/slackdump/v3/internal/structures"
 	"github.com/rusq/slackdump/v3/types"

diff --git a/export/message_test.go b/export/message_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/rusq/slackdump/v3/internal/fixtures"

diff --git a/export/mock_dumper_test.go b/export/mock_dumper_test.go
diff --git a/go.mod b/go.mod
@@ -2,8 +2,6 @@ module github.com/rusq/slackdump/v3
 
 go 1.21.4
 
-// replace github.com/slack-go/slack => ../slack
-
 require (
 	github.com/MercuryEngineering/CookieMonster v0.0.0-20180304172713-1584578b3403
 	github.com/charmbracelet/huh v0.3.0
@@ -64,6 +62,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.6 // indirect
 	github.com/rusq/secure v0.0.4 // indirect
+	github.com/rusq/slack v0.9.6-0.20240211120639-93c163940e55 // indirect
 	github.com/ysmood/fetchup v0.2.4 // indirect
 	github.com/ysmood/goob v0.4.0 // indirect
 	github.com/ysmood/got v0.39.4 // indirect

diff --git a/go.sum b/go.sum
@@ -112,6 +112,8 @@ github.com/rusq/osenv/v2 v2.0.1 h1:1LtNt8VNV/W86wb38Hyu5W3Rwqt/F1JNRGE+8GRu09o=
 github.com/rusq/osenv/v2 v2.0.1/go.mod h1:+wJBSisjNZpfoD961JzqjaM+PtaqSusO3b4oVJi7TFY=
 github.com/rusq/secure v0.0.4 h1:svpiZHfHnx89eEDCCFI9OXG1Y8hL9kUWUG6fJbrWUOI=
 github.com/rusq/secure v0.0.4/go.mod h1:F1QilMKreuFRjov0UY7DZSIXn77/8RqMVGu2zV0RtqY=
+github.com/rusq/slack v0.9.6-0.20240211120639-93c163940e55 h1:JdOHVL0ES/T5bvEFmEyngFuWG2cJpAr+xTCEYApzlNA=
+github.com/rusq/slack v0.9.6-0.20240211120639-93c163940e55/go.mod h1:9O0zQAFN6W47z4KpTQbe6vOHOzBO76vMg1+gthPwaTI=
 github.com/rusq/slackauth v0.0.8 h1:qJVnEsfXeqQ32WsQUqigBA1yWJEOf1029/2at98qVog=
 github.com/rusq/slackauth v0.0.8/go.mod h1:4fDQ7VFncP2F1k/oHPXCOjIVw//IkoJcu1Ho3tgxVi8=
 github.com/rusq/tracer v1.0.1 h1:5u4PCV8NGO97VuAINQA4gOVRkPoqHimLE2jpezRVNMU=

diff --git a/internal/cache/channelcache.go b/internal/cache/channelcache.go
@@ -3,8 +3,8 @@ package cache
 import (
 	"time"
 
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/types"
-	"github.com/slack-go/slack"
 )
 
 // loadUsers tries to load the users from the file. If the file does not exist

diff --git a/internal/cache/channelcache_test.go b/internal/cache/channelcache_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/rusq/encio"
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/internal/fixtures"
 	"github.com/rusq/slackdump/v3/types"
-	"github.com/slack-go/slack"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/internal/cache/manager.go b/internal/cache/manager.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/rusq/encio"
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 
 	"github.com/rusq/slackdump/v3/auth"
 )

diff --git a/internal/cache/usercache.go b/internal/cache/usercache.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 
 	"github.com/rusq/slackdump/v3/types"
 )

diff --git a/internal/cache/usercache_test.go b/internal/cache/usercache_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/rusq/encio"
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 

diff --git a/internal/chunk/chunk.go b/internal/chunk/chunk.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/internal/structures"
-	"github.com/slack-go/slack"
 )
 
 // ChunkType is the type of chunk that was recorded..

diff --git a/internal/chunk/chunk_test.go b/internal/chunk/chunk_test.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 )
 
 func TestChunk_ID(t *testing.T) {

diff --git a/internal/chunk/chunktest/handlers.go b/internal/chunk/chunktest/handlers.go
@@ -9,8 +9,8 @@ import (
 	"runtime/trace"
 	"strconv"
 
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/internal/chunk"
-	"github.com/slack-go/slack"
 )
 
 func router(p *chunk.Player, userID string) *http.ServeMux {

diff --git a/internal/chunk/control/control.go b/internal/chunk/control/control.go
@@ -12,7 +12,7 @@ import (
 	"runtime/trace"
 	"sync"
 
-	"github.com/slack-go/slack"
+	"github.com/rusq/slack"
 
 	"github.com/rusq/slackdump/v3"
 	"github.com/rusq/slackdump/v3/internal/chunk"

diff --git a/internal/chunk/control/interfaces.go b/internal/chunk/control/interfaces.go
@@ -3,9 +3,9 @@ package control
 import (
 	"context"
 
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/internal/chunk/dirproc"
 	"github.com/rusq/slackdump/v3/processor"
-	"github.com/slack-go/slack"
 )
 
 // Streamer is the interface for the API scraper.

diff --git a/internal/chunk/control/noop.go b/internal/chunk/control/noop.go
@@ -6,8 +6,8 @@ package control
 import (
 	"context"
 
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/internal/chunk"
-	"github.com/slack-go/slack"
 )
 
 type noopFiler struct{}

diff --git a/internal/chunk/control/workers.go b/internal/chunk/control/workers.go
@@ -5,12 +5,12 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/internal/chunk"
 	"github.com/rusq/slackdump/v3/internal/chunk/dirproc"
 	"github.com/rusq/slackdump/v3/internal/chunk/transform"
 	"github.com/rusq/slackdump/v3/logger"
 	"github.com/rusq/slackdump/v3/processor"
-	"github.com/slack-go/slack"
 )
 
 func userWorker(ctx context.Context, s Streamer, chunkdir *chunk.Directory, tf TransformStarter) error {

diff --git a/internal/chunk/directory.go b/internal/chunk/directory.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"sync/atomic"
 
+	"github.com/rusq/slack"
 	"github.com/rusq/slackdump/v3/internal/osext"
-	"github.com/slack-go/slack"
 )
 
 const chunkExt = ".json.gz"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"io"
     	"time"
-    	"github.com/slack-go/slack"
+    	"github.com/rusq/slack"
     	"github.com/rusq/slackdump/v3/types"
     )
@@ Expand Down @@