commands/guild.go

@@ -11,8 +11,6 @@ import (
 	"github.com/Cynosphere/comcord/lib"
 	"github.com/Cynosphere/comcord/state"
 	"github.com/bwmarrin/discordgo"
-	"github.com/mgutz/ansi"
-  tsize "github.com/kopoli/go-terminal-size"
 )
 
 var REGEX_EMOTE = regexp.MustCompile(`<(?:\x{200b}|&)?a?:(\w+):(\d+)>`)
@@ -60,7 +58,7 @@ func ListGuildsCommand(session *discordgo.Session) {
   fmt.Print("\n\r")
 }
 
-func GetSortedChannels(session *discordgo.Session, guildId string, withCategories bool, withPrivate bool) []*discordgo.Channel {
+func GetSortedChannels(session *discordgo.Session, guildId string, withCategories bool) []*discordgo.Channel {
   channels := make([]*discordgo.Channel, 0)
   guild, err := session.State.Guild(guildId)
   if err != nil {
@@ -71,20 +69,6 @@ func GetSortedChannels(session *discordgo.Session, guildId string, withCategorie
     categories := make(map[string][]*discordgo.Channel)
 
     for _, channel := range guild.Channels {
-      if channel.Type != discordgo.ChannelTypeGuildText && channel.Type != discordgo.ChannelTypeGuildNews {
-        continue
-      }
-
-      perms, err := session.State.UserChannelPermissions(session.State.User.ID, channel.ID)
-      if err != nil {
-        continue
-      }
-
-      private := perms & discordgo.PermissionViewChannel == 0
-      if private && !withPrivate {
-        continue
-      }
-
       categoryID := "0"
       if channel.ParentID != "" {
         categoryID = channel.ParentID
@@ -95,6 +79,9 @@ func GetSortedChannels(session *discordgo.Session, guildId string, withCategorie
         categories[categoryID] = make([]*discordgo.Channel, 0)
       }
 
+      if channel.Type != discordgo.ChannelTypeGuildText && channel.Type != discordgo.ChannelTypeGuildNews {
+        continue
+      }
       categories[categoryID] = append(categories[categoryID], channel)
     }
 
@@ -147,17 +134,6 @@ func GetSortedChannels(session *discordgo.Session, guildId string, withCategorie
       if channel.Type != discordgo.ChannelTypeGuildText && channel.Type != discordgo.ChannelTypeGuildNews {
         continue
       }
-
-      perms, err := session.State.UserChannelPermissions(session.State.User.ID, channel.ID)
-      if err != nil {
-        continue
-      }
-
-      private := perms & discordgo.PermissionViewChannel == 0
-      if private && !withPrivate {
-        continue
-      }
-
       channels = append(channels, channel)
     }
 
@@ -177,7 +153,7 @@ func ListChannelsCommand(session *discordgo.Session) {
   }
 
   longest := 0
-  channels := GetSortedChannels(session, currentGuild, true, false)
+  channels := GetSortedChannels(session, currentGuild, true)
 
   for _, channel := range channels {
     perms, err := session.State.UserChannelPermissions(session.State.User.ID, channel.ID)
@@ -248,166 +224,8 @@ func ListChannelsCommand(session *discordgo.Session) {
   fmt.Print("\n\r")
 }
 
-type ListedMember struct {
-  Name string
-  Bot bool
-  Status discordgo.Status
-  Position int
-}
-
 func ListUsersCommand(session *discordgo.Session) {
-  currentGuild := state.GetCurrentGuild()
-  currentChannel := state.GetCurrentChannel()
 
-  if currentGuild == "" {
-    fmt.Print("<not in a guild>\n\r")
-    return
-  }
-  if currentChannel == "" {
-    fmt.Print("<not in a channel>\n\r")
-    return
-  }
-
-  guild, err := session.State.Guild(state.GetCurrentGuild())
-  if err != nil {
-    return
-  }
-  channel, err := session.State.Channel(currentChannel)
-  if err != nil {
-    return
-  }
-
-  fmt.Print("\n\r")
-  fmt.Printf("[you are in '%s' in '#%s' among %d]\n\r", guild.Name, channel.Name, guild.MemberCount)
-  fmt.Print("\n\r")
-
-  longest := 0
-
-  sortedMembers := make([]ListedMember, 0)
-
-  for _, presence := range guild.Presences {
-    if presence.Status == discordgo.StatusOffline {
-      continue
-    }
-    perms, err := session.State.UserChannelPermissions(presence.User.ID, currentChannel)
-    if err != nil {
-      continue
-    }
-    if perms & discordgo.PermissionViewChannel == 0 {
-      continue
-    }
-
-    member, err := session.State.Member(currentGuild, presence.User.ID)
-    if err != nil {
-      continue
-    }
-
-    length := utf8.RuneCountInString(member.User.Username) + 3
-    if length > longest {
-      longest = length
-    }
-
-    position := 0
-    for _, id := range member.Roles {
-      role, err := session.State.Role(currentGuild, id)
-      if err != nil {
-        continue
-      }
-
-      if role.Hoist && role.Position > position {
-        position = role.Position
-      }
-    }
-
-    sortedMembers = append(sortedMembers, ListedMember{
-      Name: member.User.Username,
-      Bot: member.User.Bot,
-      Status: presence.Status,
-      Position: position,
-    })
-  }
-
-  membersByPosition := make(map[int][]ListedMember)
-  for _, member := range sortedMembers {
-    _, has := membersByPosition[member.Position]
-    if !has {
-      membersByPosition[member.Position] = make([]ListedMember, 0)
-    }
-
-    membersByPosition[member.Position] = append(membersByPosition[member.Position], member)
-  }
-  for _, members := range membersByPosition {
-    sort.Slice(members, func(i, j int) bool {
-      return members[i].Name < members[j].Name
-    })
-  }
-
-  positions := make([]int, 0, len(membersByPosition))
-  for k := range membersByPosition {
-    positions = append(positions, k)
-  }
-  sort.Slice(positions, func(i, j int) bool {
-    return positions[i] > positions[j]
-  })
-
-  size, err := tsize.GetSize()
-  if err != nil {
-    return
-  }
-  columns := int(math.Floor(float64(size.Width) / float64(longest)))
-
-  index := 0
-  for _, position := range positions {
-    members := membersByPosition[position]
-    for _, member := range members {
-
-      statusColor := "reset"
-      if member.Status == discordgo.StatusOnline {
-        statusColor = "green+b"
-      } else if member.Status == discordgo.StatusIdle {
-        statusColor = "yellow+b"
-      } else if member.Status == discordgo.StatusDoNotDisturb {
-        statusColor = "red+b"
-      }
-
-      nameColor := "reset"
-      if member.Bot {
-        nameColor = "yellow"
-      }
-
-      nameAndStatus := ansi.Color(" \u2022 ", statusColor) + ansi.Color(member.Name, nameColor)
-      nameLength := utf8.RuneCountInString(member.Name) + 3
-
-      index++
-
-      pad := 0
-      if index % columns != 0 {
-        pad = longest - nameLength
-      }
-      if pad < 0 {
-        pad = 0
-      }
-
-      fmt.Printf(nameAndStatus + strings.Repeat(" ", pad))
-
-      if index % columns == 0 {
-        fmt.Print("\n\r")
-      }
-    }
-  }
-  if index % columns != 0 {
-    fmt.Print("\n\r")
-  }
-  fmt.Print("\n\r")
-
-  if channel.Topic != "" {
-    fmt.Print("--Topic" + strings.Repeat("-", 73) + "\n\r")
-    for _, line := range strings.Split(channel.Topic, "\n") {
-      fmt.Print(line + "\n\r")
-    }
-    fmt.Print(strings.Repeat("-", 80) + "\n\r")
-    fmt.Print("\n\r")
-  }
 }
 
 func SwitchGuild(session *discordgo.Session, input string) {
@@ -430,7 +248,7 @@ func SwitchGuild(session *discordgo.Session, input string) {
       state.SetCurrentGuild(target)
       last := state.GetLastChannel(target)
       if last == "" {
-        channels := GetSortedChannels(session, target, false, false)
+        channels := GetSortedChannels(session, target, false)
         topChannel := channels[0]
 
         state.SetCurrentChannel(topChannel.ID)
@@ -453,41 +271,3 @@ func SwitchGuildsCommand(session *discordgo.Session) {
     SwitchGuild(session, input)
   })
 }
-
-func SwitchChannelsCommand(session *discordgo.Session) {
-  currentGuild := state.GetCurrentGuild()
-
-  if currentGuild == "" {
-    fmt.Print("<not in a guild>\n\r")
-    return
-  }
-
-  lib.MakePrompt(session, ":channel> ", false, func(session *discordgo.Session, input string, interrupt bool) {
-    fmt.Print("\r")
-    if input == "" {
-      ListUsersCommand(session)
-    } else {
-      target := ""
-
-      channels := GetSortedChannels(session, currentGuild, false, false)
-
-      for _, channel := range channels {
-        if strings.Index(strings.ToLower(channel.Name), strings.ToLower(input)) > -1 {
-          target = channel.ID
-          break
-        }
-      }
-
-      if target == "" {
-        fmt.Print("<channel not found>\n\r")
-      } else {
-        state.SetCurrentChannel(target)
-        state.SetLastChannel(currentGuild, target)
-
-        ListUsersCommand(session)
-
-        // TODO: update presence
-      }
-    }
-  })
-}

commands/main.go

@@ -46,16 +46,6 @@ func Setup() {
     Run: SwitchGuildsCommand,
     Description: "goto guild",
   }
-
-  commandMap["g"] = Command{
-    Run: SwitchChannelsCommand,
-    Description: "goto channel",
-  }
-
-  commandMap["w"] = Command{
-    Run: ListUsersCommand,
-    Description: "who is in channel",
-  }
 }
 
 func GetCommand(key string) (Command, bool) {

commands/send.go

@@ -18,23 +18,6 @@ func SendMode(session *discordgo.Session) {
     return
   }
 
-  channel, err := session.State.Channel(channelId)
-  if err != nil {
-    fmt.Print("<error getting channel: ", err.Error(), ">\n\r")
-    return
-  }
-
-  perms, err := session.State.UserChannelPermissions(session.State.User.ID, channel.ID)
-  if err != nil {
-    fmt.Print("<failed to check permissions: ", err.Error(), ">\n\r")
-    return
-  }
-
-  if perms & discordgo.PermissionSendMessages == 0 {
-    fmt.Print("<you do not have permission to send messages here>\n\r")
-    return
-  }
-
   length := utf8.RuneCountInString(session.State.User.Username) + 2
   curLength := state.GetNameLength()
 

events/messages.go

@@ -38,10 +38,6 @@ func MessageUpdate(session *discordgo.Session, msg *discordgo.MessageUpdate) {
     return
   }
 
-  if msg.Content == msg.BeforeUpdate.Content {
-    return
-  }
-
   channel, err := session.State.Channel(msg.ChannelID)
   if err != nil {
     return

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/ergochat/readline v0.0.5 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
-	github.com/kopoli/go-terminal-size v0.0.0-20170219200355-5c97524c8b54 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect

go.sum

@@ -29,8 +29,6 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.10/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
 github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
-github.com/kopoli/go-terminal-size v0.0.0-20170219200355-5c97524c8b54 h1:0SMHxjkLKNawqUjjnMlCtEdj6uWZjv0+qDZ3F6GOADI=
-github.com/kopoli/go-terminal-size v0.0.0-20170219200355-5c97524c8b54/go.mod h1:bm7MVZZvHQBfqHG5X59jrRE/3ak6HvK+/Zb6aZhLR2s=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=