remove debugging limit from channel listing and fix user resolve pani…

…c for external contacts

channels.go

@@ -20,7 +20,6 @@ type Channels struct {
 // the type of messages to fetch.  See github.com/rusq/slack docs for possible
 // values
 func (sd *SlackDumper) getChannels(chanTypes []string) (*Channels, error) {
-
 	throttle := getThrottler(slackTier2)
 
 	if chanTypes == nil {
@@ -29,7 +28,7 @@ func (sd *SlackDumper) getChannels(chanTypes []string) (*Channels, error) {
 
 	params := &slack.GetConversationsParameters{Types: chanTypes}
 	allChannels := make([]slack.Channel, 0, 50)
-	for i := 0; i <= 2; i++ {
+	for {
 		chans, nextcur, err := sd.api.GetConversations(params)
 		if err != nil {
 			return nil, err
@@ -81,7 +80,7 @@ func (cs Channels) ToText(w io.Writer) (err error) {
 func (sd *SlackDumper) whoThisChannelFor(channel *slack.Channel) (who string) {
 	switch {
 	case channel.IsIM:
-		who = "@" + sd.UserForID[channel.User].Name
+		who = "@" + sd.username(channel.User)
 	case channel.IsMpIM:
 		who = strings.Replace(channel.Purpose.Value, " messaging with", "", -1)
 	case channel.IsPrivate:
@@ -104,3 +103,11 @@ func (sd *SlackDumper) IsChannel(c string) (ok bool) {
 	}
 	return
 }
+
+func (sd *SlackDumper) username(id string) string {
+	user, ok := sd.UserForID[id]
+	if !ok {
+		return "<external>:" + id
+	}
+	return user.Name
+}

messages.go

@@ -60,7 +60,7 @@ func (m *Messages) GetUserForMessage(msg *slack.Message) string {
 	}
 
 	if userid != "" {
-		return m.SD.UserForID[userid].Name
+		return m.SD.username(userid)
 	}
 
 	return ""

slackdump.go

@@ -37,15 +37,17 @@ func New(token string, cookie string) (*SlackDumper, error) {
 	var chans *Channels
 
 	go func() {
+		defer close(errC)
 		var err error
 		chanTypes := allChanTypes
+		log.Println("> caching channels, might take a while...")
 		chans, err = sd.getChannels(chanTypes)
 		if err != nil {
 			errC <- err
 		}
-		close(errC)
 	}()
 
+	log.Println("> caching users...")
 	if _, err := sd.GetUsers(); err != nil {
 		return nil, fmt.Errorf("error fetching users: %s", err)
 	}