Compare commits
No commits in common. "c1296d9822b3129f7f2fe38bda037b5e811b9a9d" and "76316016b57668bafc66d77ee1eff8324abb549f" have entirely different histories.
c1296d9822
...
76316016b5
4 changed files with 65 additions and 243 deletions
|
@ -1,135 +0,0 @@
|
|||
package commands
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/Cynosphere/comcord/lib"
|
||||
"github.com/Cynosphere/comcord/state"
|
||||
"github.com/bwmarrin/discordgo"
|
||||
)
|
||||
|
||||
func GetHistory(session *discordgo.Session, limit int, channel string) {
|
||||
messages, err := session.ChannelMessages(channel, 100, "", "", "")
|
||||
if err != nil {
|
||||
fmt.Print("<failed to get messages: ", err.Error(), ">\n\r")
|
||||
return
|
||||
}
|
||||
|
||||
for i, j := 0, len(messages) - 1; i < j; i, j = i + 1, j - 1 {
|
||||
messages[i], messages[j] = messages[j], messages[i]
|
||||
}
|
||||
|
||||
fmt.Print("--Beginning-Review", strings.Repeat("-", 62), "\n\r")
|
||||
|
||||
lines := make([]string, 0)
|
||||
for _, msg := range messages {
|
||||
msgLines := lib.ProcessMessage(session, msg, lib.MessageOptions{NoColor: true, InHistory: true})
|
||||
for _, line := range msgLines {
|
||||
lines = append(lines, line)
|
||||
}
|
||||
}
|
||||
|
||||
length := len(lines)
|
||||
startIndex := int(math.Max(float64(0), float64(length - limit)))
|
||||
for _, line := range lines[startIndex:] {
|
||||
fmt.Print(line)
|
||||
}
|
||||
|
||||
fmt.Print("--Review-Complete", strings.Repeat("-", 63), "\n\r")
|
||||
}
|
||||
|
||||
func HistoryCommand(session *discordgo.Session) {
|
||||
currentChannel := state.GetCurrentChannel()
|
||||
if currentChannel == "" {
|
||||
fmt.Print("<not in a channel>\n\r")
|
||||
return
|
||||
}
|
||||
|
||||
GetHistory(session, 20, currentChannel)
|
||||
}
|
||||
|
||||
func ExtendedHistoryCommand(session *discordgo.Session) {
|
||||
currentChannel := state.GetCurrentChannel()
|
||||
if currentChannel == "" {
|
||||
fmt.Print("<not in a channel>\n\r")
|
||||
return
|
||||
}
|
||||
|
||||
lib.MakePrompt(session, ":lines> ", false, func(session *discordgo.Session, input string, interrupt bool) {
|
||||
fmt.Print("\r")
|
||||
limit, err := strconv.Atoi(input)
|
||||
|
||||
if err != nil {
|
||||
fmt.Print("<not a number>\n\r")
|
||||
} else {
|
||||
GetHistory(session, limit, currentChannel)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func PeekHistory(session *discordgo.Session, guild, channel string) {
|
||||
target := ""
|
||||
|
||||
channels := GetSortedChannels(session, guild, false, false)
|
||||
|
||||
for _, c := range channels {
|
||||
if strings.Index(strings.ToLower(c.Name), strings.ToLower(channel)) > -1 {
|
||||
target = c.ID
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if target == "" {
|
||||
fmt.Print("<channel not found>\n\r")
|
||||
} else {
|
||||
GetHistory(session, 20, target)
|
||||
}
|
||||
}
|
||||
|
||||
func PeekCommand(session *discordgo.Session) {
|
||||
currentGuild := state.GetCurrentGuild()
|
||||
if currentGuild == "" {
|
||||
fmt.Print("<not in a guild>\n\r")
|
||||
return
|
||||
}
|
||||
|
||||
lib.MakePrompt(session, ":peek> ", false, func(session *discordgo.Session, input string, interrupt bool) {
|
||||
fmt.Print("\r")
|
||||
|
||||
if input != "" {
|
||||
PeekHistory(session, currentGuild, input)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func CrossPeekCommand(session *discordgo.Session) {
|
||||
lib.MakePrompt(session, ":guild> ", false, func(session *discordgo.Session, input string, interrupt bool) {
|
||||
fmt.Print("\r")
|
||||
|
||||
if input != "" {
|
||||
targetGuild := ""
|
||||
|
||||
for _, guild := range session.State.Guilds {
|
||||
if strings.Index(strings.ToLower(guild.Name), strings.ToLower(input)) > -1 {
|
||||
targetGuild = guild.ID
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if targetGuild == "" {
|
||||
fmt.Print("<guild not found>\n\r")
|
||||
} else {
|
||||
lib.MakePrompt(session, ":peek> ", false, func(session *discordgo.Session, input string, interrupt bool) {
|
||||
fmt.Print("\r")
|
||||
|
||||
if input != "" {
|
||||
PeekHistory(session, targetGuild, input)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
|
@ -56,26 +56,6 @@ func Setup() {
|
|||
Run: ListUsersCommand,
|
||||
Description: "who is in channel",
|
||||
}
|
||||
|
||||
commandMap["r"] = Command{
|
||||
Run: HistoryCommand,
|
||||
Description: "channel history",
|
||||
}
|
||||
|
||||
commandMap["R"] = Command{
|
||||
Run: ExtendedHistoryCommand,
|
||||
Description: "extended history",
|
||||
}
|
||||
|
||||
commandMap["p"] = Command{
|
||||
Run: PeekCommand,
|
||||
Description: "peek at channel",
|
||||
}
|
||||
|
||||
commandMap["P"] = Command{
|
||||
Run: CrossPeekCommand,
|
||||
Description: "cross-guild peek",
|
||||
}
|
||||
}
|
||||
|
||||
func GetCommand(key string) (Command, bool) {
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
package events
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/Cynosphere/comcord/lib"
|
||||
"github.com/Cynosphere/comcord/state"
|
||||
"github.com/bwmarrin/discordgo"
|
||||
|
@ -23,10 +21,7 @@ func MessageCreate(session *discordgo.Session, msg *discordgo.MessageCreate) {
|
|||
if state.IsInPrompt() {
|
||||
state.AddMessageToQueue(msg.Message)
|
||||
} else {
|
||||
lines := lib.ProcessMessage(session, msg.Message, lib.MessageOptions{NoColor: state.HasNoColor()})
|
||||
for _, line := range lines {
|
||||
fmt.Print(line)
|
||||
}
|
||||
lib.ProcessMessage(session, msg.Message, lib.MessageOptions{NoColor: state.HasNoColor()})
|
||||
}
|
||||
|
||||
if isDM {
|
||||
|
@ -43,7 +38,7 @@ func MessageUpdate(session *discordgo.Session, msg *discordgo.MessageUpdate) {
|
|||
return
|
||||
}
|
||||
|
||||
if msg.BeforeUpdate != nil && msg.Content == msg.BeforeUpdate.Content {
|
||||
if msg.Content == msg.BeforeUpdate.Content {
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -57,10 +52,7 @@ func MessageUpdate(session *discordgo.Session, msg *discordgo.MessageUpdate) {
|
|||
if state.IsInPrompt() {
|
||||
state.AddMessageToQueue(msg.Message)
|
||||
} else {
|
||||
lines := lib.ProcessMessage(session, msg.Message, lib.MessageOptions{NoColor: state.HasNoColor()})
|
||||
for _, line := range lines {
|
||||
fmt.Print(line)
|
||||
}
|
||||
lib.ProcessMessage(session, msg.Message, lib.MessageOptions{NoColor: state.HasNoColor()})
|
||||
}
|
||||
|
||||
if isDM {
|
||||
|
|
|
@ -35,11 +35,11 @@ type MessageOptions struct {
|
|||
InHistory bool
|
||||
}
|
||||
|
||||
func FormatMessage(session *discordgo.Session, options MessageOptions) []string {
|
||||
lines := make([]string, 0)
|
||||
|
||||
func FormatMessage(session *discordgo.Session, options MessageOptions) {
|
||||
timestamp := options.Timestamp.Format("[15:04:05]")
|
||||
|
||||
// TODO: history lines
|
||||
|
||||
nameLength := utf8.RuneCountInString(options.Name) + 2
|
||||
stateNameLength := state.GetNameLength()
|
||||
if nameLength > stateNameLength {
|
||||
|
@ -102,21 +102,12 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) []string
|
|||
replyContent = replyContent[:79 - headerLength] + moreContent
|
||||
}
|
||||
|
||||
lines = append(lines, replySymbol, name, replyContent, "\n\r")
|
||||
fmt.Print(replySymbol, name, replyContent, "\n\r")
|
||||
}
|
||||
|
||||
if options.IsDump {
|
||||
if options.InHistory {
|
||||
headerLength := 80 - (utf8.RuneCountInString(options.Name) + 5)
|
||||
dumpHeader := fmt.Sprintf("--- %s %s\n\r", options.Name, strings.Repeat("-", headerLength))
|
||||
|
||||
contentLines := strings.Split(options.Content, "\n")
|
||||
|
||||
lines = append(lines, dumpHeader)
|
||||
for _, line := range contentLines {
|
||||
lines = append(lines, line + "\n\r")
|
||||
}
|
||||
lines = append(lines, dumpHeader)
|
||||
// TODO
|
||||
} else {
|
||||
wordCount := len(strings.Split(options.Content, " "))
|
||||
lineCount := len(strings.Split(options.Content, "\n"))
|
||||
|
@ -136,7 +127,7 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) []string
|
|||
str = ansi.Color(str, "yellow+b")
|
||||
}
|
||||
|
||||
lines = append(lines, str + "\n\r")
|
||||
fmt.Print(str + "\n\r")
|
||||
}
|
||||
} else {
|
||||
// TODO: markdown
|
||||
|
@ -149,7 +140,7 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) []string
|
|||
name = ansi.Color(name, "red+b")
|
||||
}
|
||||
|
||||
lines = append(lines, fmt.Sprintf("%s %s\x07\n\r", name, content))
|
||||
fmt.Printf("%s %s\x07\n\r", name, content)
|
||||
} else if utf8.RuneCountInString(content) > 1 &&
|
||||
(strings.HasPrefix(content, "*") && strings.HasSuffix(content, "*") && !strings.HasPrefix(content, "**") && !strings.HasSuffix(content, "**")) ||
|
||||
(strings.HasPrefix(content, "_") && strings.HasSuffix(content, "_") && !strings.HasPrefix(content, "__") && !strings.HasSuffix(content, "__")) {
|
||||
|
@ -159,15 +150,15 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) []string
|
|||
str = ansi.Color(str, "green+b")
|
||||
}
|
||||
|
||||
lines = append(lines, str + "\n\r")
|
||||
fmt.Print(str + "\n\r")
|
||||
} else if options.IsJoin {
|
||||
channel, err := session.State.Channel(options.Channel)
|
||||
if err != nil {
|
||||
return lines
|
||||
return
|
||||
}
|
||||
guild, err := session.State.Guild(channel.GuildID)
|
||||
if err != nil {
|
||||
return lines
|
||||
return
|
||||
}
|
||||
|
||||
str := fmt.Sprintf("%s %s has joined %s", timestamp, options.Name, guild.Name)
|
||||
|
@ -175,14 +166,14 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) []string
|
|||
str = ansi.Color(str, "yellow+b")
|
||||
}
|
||||
|
||||
lines = append(lines, str + "\n\r")
|
||||
fmt.Print(str + "\n\r")
|
||||
} else if options.IsPin {
|
||||
str := fmt.Sprintf("%s %s pinned a message to this channel", timestamp, options.Name)
|
||||
if !options.NoColor {
|
||||
str = ansi.Color(str, "yellow+b")
|
||||
}
|
||||
|
||||
lines = append(lines, str + "\n\r")
|
||||
fmt.Print(str + "\n\r")
|
||||
} else {
|
||||
nameColor := "cyan+b"
|
||||
if options.IsMention {
|
||||
|
@ -203,7 +194,7 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) []string
|
|||
if options.IsMention {
|
||||
str = str + "\x07"
|
||||
}
|
||||
lines = append(lines, str + "\n\r")
|
||||
fmt.Print(str + "\n\r")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -214,7 +205,7 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) []string
|
|||
str = ansi.Color(str, "yellow+b")
|
||||
}
|
||||
|
||||
lines = append(lines, str + "\n\r")
|
||||
fmt.Print(str + "\n\r")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -225,7 +216,7 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) []string
|
|||
str = ansi.Color(str, "yellow+b")
|
||||
}
|
||||
|
||||
lines = append(lines, str + "\n\r")
|
||||
fmt.Print(str + "\n\r")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -234,25 +225,22 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) []string
|
|||
// TODO: embeds
|
||||
|
||||
// TODO: lines output for history
|
||||
return lines
|
||||
}
|
||||
|
||||
func ProcessMessage(session *discordgo.Session, msg *discordgo.Message, options MessageOptions) []string {
|
||||
lines := make([]string, 0)
|
||||
|
||||
func ProcessMessage(session *discordgo.Session, msg *discordgo.Message, options MessageOptions) {
|
||||
channel, err := session.State.Channel(msg.ChannelID)
|
||||
if err != nil {
|
||||
return lines
|
||||
return
|
||||
}
|
||||
|
||||
guild, err := session.State.Guild(channel.GuildID)
|
||||
if err != nil {
|
||||
return lines
|
||||
return
|
||||
}
|
||||
|
||||
selfMember, err := session.State.Member(guild.ID, session.State.User.ID)
|
||||
if err != nil {
|
||||
return lines
|
||||
return
|
||||
}
|
||||
|
||||
hasMentionedRole := false
|
||||
|
@ -280,18 +268,21 @@ func ProcessMessage(session *discordgo.Session, msg *discordgo.Message, options
|
|||
currentChannel := state.GetCurrentChannel()
|
||||
isCurrentChannel := currentChannel == msg.ChannelID
|
||||
|
||||
if !isCurrentChannel && !isDM && !isPing && !options.InHistory {
|
||||
return lines
|
||||
if !isCurrentChannel && !isDM && !isPing {
|
||||
return
|
||||
}
|
||||
|
||||
if isPing && !isCurrentChannel && !isDM && !options.InHistory {
|
||||
if isPing && !isCurrentChannel && !isDM {
|
||||
str := fmt.Sprintf("**mentioned by %s in #%s in %s**", msg.Author.Username, channel.Name, guild.Name)
|
||||
if !options.NoColor {
|
||||
str = ansi.Color(str, "red+b")
|
||||
}
|
||||
str = str + "\x07\n\r"
|
||||
lines = append(lines, str)
|
||||
if options.NoColor {
|
||||
fmt.Print(ansi.Color(str, "red+b"))
|
||||
} else {
|
||||
fmt.Print(str)
|
||||
}
|
||||
fmt.Print("\x07\n\r")
|
||||
return
|
||||
}
|
||||
|
||||
content, _ := msg.ContentWithMoreMentionsReplaced(session)
|
||||
if isEdit {
|
||||
content = content + " (edited)"
|
||||
|
@ -317,7 +308,7 @@ func ProcessMessage(session *discordgo.Session, msg *discordgo.Message, options
|
|||
options.IsPin = msg.Type == discordgo.MessageTypeChannelPinnedMessage
|
||||
options.IsDump = false
|
||||
|
||||
lines = FormatMessage(session, options)
|
||||
FormatMessage(session, options)
|
||||
}
|
||||
} else {
|
||||
options.Content = content
|
||||
|
@ -334,21 +325,15 @@ func ProcessMessage(session *discordgo.Session, msg *discordgo.Message, options
|
|||
options.IsPin = msg.Type == discordgo.MessageTypeChannelPinnedMessage
|
||||
options.IsDump = isDump
|
||||
|
||||
lines = FormatMessage(session, options)
|
||||
FormatMessage(session, options)
|
||||
}
|
||||
}
|
||||
|
||||
return lines
|
||||
}
|
||||
|
||||
func ProcessQueue(session *discordgo.Session) {
|
||||
queue := state.GetMessageQueue()
|
||||
|
||||
for _, msg := range queue {
|
||||
lines := ProcessMessage(session, msg, MessageOptions{NoColor: state.HasNoColor()})
|
||||
for _, line := range lines {
|
||||
fmt.Print(line)
|
||||
}
|
||||
ProcessMessage(session, msg, MessageOptions{NoColor: state.HasNoColor()})
|
||||
}
|
||||
|
||||
state.EmptyMessageQueue()
|
||||
|
|
Loading…
Reference in a new issue