Largely finished image recall. Now onto the next ones

Author: Strum355

commands.go

@@ -12,41 +12,45 @@ type command struct {
 
 var (
 	commMap    = make(map[string]command)
-	gitCommand = command{
+
+)
+
+func prepareCommands() {
+	command{
 		Name: "git",
-		Help: "Args: none\n\nLinks 2Bots github page.\n\nExample:\n`!owo git`",
+		Help: "Args: none\n\nLinks 2Bots github page.\n\nExample:\n`"+ conf.Prefix + "git`",
 		Exec: msgGit,
 	}.add()
-	emojiCommand = command{
-		Name: "",
-		Help: "Args: [emoji]\n\nSends a large image of the given emoji.\n\nExample:\n`!owo :smile:`",
+	command{
+		Name: "emoji",
+		Help: "Args: [emoji]\n\nSends a large image of the given emoji.\n\nExample:\n`"+ conf.Prefix + ":smile:`",
 		Exec: msgEmoji,
 	}.add()
-	gameCommand = command{
+	command{
 		Name: "setGame",
 		Help: "Args: [game]\n\nSets your current game to 'game'",
 		Exec: msgGame,
 	}.add()
-	findEmojiCommand = command{
+	command{
 		Name: "findEmoji",
 		Help: "Args: [emoji | name]\n\nReturns all the emojis that match the given emoji or emoji name in all the servers you are in",
 		Exec: msgFindEmoji,
 	}.add()
-	imageCommand = command{
+	command{
 		Name: "image",
 		Help: "Args: [save,recall,delete,list,status] [name]\n\nSave images and recall them at anytime! Everyone gets 8MB of image storage. Any name counts so long theres no `/` in it." +
 		"Only you can 'recall' your saved images. There's a review process to make sure nothing illegal is being uploaded but we're fairly relaxed for the most part\n\n" +
 		"Example:\n`!owo image save 2B Happy`\n2Bot downloads the image and sends it off for reviewing\n\n" +
-		"`!owo image recall 2B Happy`\nIf your image was confirmed, 2Bot will send the image named `2B Happy`\n\n" +
-		"`!owo image delete 2B Happy`\nThis will delete the image you saved called `2B Happy`\n\n" +
-		"`!owo image list`\nThis will list your saved images along with a preview!\n\n" +
-		"`!owo image status`\nShows some details on your saved images and quota",
+		"`"+ conf.Prefix + "image recall 2B Happy`\nIf your image was confirmed, 2Bot will send the image named `2B Happy`\n\n" +
+		"`"+ conf.Prefix + "image delete 2B Happy`\nThis will delete the image you saved called `2B Happy`\n\n" +
+		"`"+ conf.Prefix + "image list`\nThis will list your saved images along with a preview!\n\n" +
+		"`"+ conf.Prefix + "image status`\nShows some details on your saved images and quota",
 		Exec: msgImageRecall,
 	}.add()
-	helpComm = command{"help",
+	command{"help",
 		"", msgHelp,
 		}.add()
-)
+}
 
 //Small wrapper function to reduce clutter
 func l(s string) (r string) {
@@ -69,7 +73,7 @@ func parseCommand(s *discordgo.Session, m *discordgo.MessageCreate, message stri
 
 	//if data passed as command isnt a valid command,
 	//check if its an emoji
-	emojiCommand.Exec(s, m, msglist)
+	commMap["emoji"].Exec(s, m, msglist)
 }
 
 func listCommands(s *discordgo.Session, m *discordgo.MessageCreate) {
@@ -83,36 +87,34 @@ func listCommands(s *discordgo.Session, m *discordgo.MessageCreate) {
 
 	userColor := s.State.UserColor(s.State.User.ID, m.ChannelID)
 
-	s.ChannelMessageDelete(m.ChannelID, m.Message.ID)
-	s.ChannelMessageSendEmbed(m.ChannelID, &discordgo.MessageEmbed{
-		Title: "Help",
-
-		Color: userColor,
-
-		Fields: []*discordgo.MessageEmbedField{
-			{Name: "List", Value: strings.Join(commands, ", ")},
-			{Name: "Info", Value: "\n\nUse `" + conf.Prefix + "help [command]` for detailed info about a command."},
-		},
+	edit := newEdit(s, m, userColor)
+	edit.setFields([]*discordgo.MessageEmbedField{
+		{Name: "List", Value: strings.Join(commands, ", ")},
+		{Name: "Info", Value: "\n\nUse `" + conf.Prefix + "help [command]` for detailed info about a command."},
 	})
+	edit.send()
 }
 
-func (c command) msgHelp(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string) {
+func msgHelp(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string) {
 	if len(msglist) == 0 {
 		listCommands(s, m)
 		return
 	}
-	userColor := s.State.UserColor(s.State.User.ID, m.ChannelID)
 
-	s.ChannelMessageDelete(m.ChannelID, m.Message.ID)
-	s.ChannelMessageSendEmbed(m.ChannelID, &discordgo.MessageEmbed{
-		Title: "Help: " + c.Name,
+	command := msglist[0]
+	val, ok := commMap[command]
+	if !ok {
+		return
+	}
 
-		Color: userColor,
+	userColor := s.State.UserColor(s.State.User.ID, m.ChannelID)
 
-		Fields: []*discordgo.MessageEmbedField{
-			{Name: "Details", Value: c.Help},
-		},
+	edit := newEdit(s, m, userColor)
+	edit.setFields([]*discordgo.MessageEmbedField{
+		{Name: "Details", Value: val.Help},
 	})
+	edit.setTitle("Help "+val.Name)
+	edit.send()
 	return
 }
 

main.go

@@ -28,6 +28,8 @@ var (
 	errorLog   *log.Logger
 	infoLog    *log.Logger
 	logF       *os.File
+	// Zero width whitespace to replace message content
+	content    = "​"
 )
 
 func createConfig() error {
@@ -173,16 +175,16 @@ func main() {
 		fmt.Println(err)
 		errorLog.Fatalln(err)
 	}
+	defer dg.Close()
+
+	prepareCommands()
 
 	dg.AddHandlerOnce(ready)
 	dg.AddHandler(message)
 
 	sc := make(chan os.Signal, 1)
 	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
 	<-sc
-
-	// Cleanly close down the Discord session.
-	dg.Close()
 }
 
 func ready(s *discordgo.Session, m *discordgo.Ready) {

message.go

@@ -0,0 +1,70 @@
+package main
+
+import (
+	"github.com/bwmarrin/discordgo"
+)
+
+type editComplex struct {
+	Content *string      
+	Embed   *discordgo.MessageEmbed 
+
+	MessageCreate *discordgo.MessageCreate
+	Session *discordgo.Session
+}
+
+func newEdit(s *discordgo.Session, m *discordgo.MessageCreate, color int) *editComplex {
+	return &editComplex {
+		Content: &content,
+
+		MessageCreate: m,
+		Session: s,
+
+		Embed: &discordgo.MessageEmbed { 
+			Color: color,
+		},
+	}
+}
+
+func (e *editComplex) setTitle(title string) {
+	e.Embed.Title = title
+}
+
+func (e *editComplex) setImage(url string) {
+	e.Embed.Image = &discordgo.MessageEmbedImage {
+		URL: url,
+	}
+}
+
+func (e *editComplex) setFields(fields []*discordgo.MessageEmbedField) {
+	e.Embed.Fields = fields
+}
+
+func (e *editComplex) setDescription(text string) {
+	e.Embed.Description = text
+}
+
+func (e *editComplex) send() *discordgo.Message{
+	msg, err := e.Session.ChannelMessageEditComplex(&discordgo.MessageEdit{
+		Channel: e.MessageCreate.ChannelID,
+		ID: e.MessageCreate.Message.ID,
+
+		Content: &content,
+
+		Embed: &discordgo.MessageEmbed {
+			Color: e.Embed.Color,
+			Title: e.Embed.Title,
+			Description: e.Embed.Description,
+
+			Fields: e.Embed.Fields,
+
+			Image: e.Embed.Image,
+		},
+	})
+
+	if err != nil {
+		errorLog.Println(err)
+		return nil
+	}
+
+	return msg
+}

msgEmoji.go

@@ -43,7 +43,6 @@ func msgEmoji(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string
 		defer resp.Body.Close()
 
 		s.ChannelFileSend(m.ChannelID, "emoji.png", resp.Body)
-
 		s.ChannelMessageDelete(m.ChannelID, m.ID)
 	} else {
 		emoji := emojiFile(msglist[0])
@@ -65,6 +64,7 @@ func msgEmoji(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string
 
 func msgFindEmoji(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string) {
 	var emojiName string
+	content := "​"
 	submatch := emojiRegex.FindStringSubmatch(strings.Join(msglist, " "))
 
 	if len(submatch) < 2 {
@@ -104,26 +104,29 @@ func msgFindEmoji(s *discordgo.Session, m *discordgo.MessageCreate, msglist []st
 	}
 
 	userColor := s.State.UserColor(s.State.User.ID, m.ChannelID)
-
+	
 	if len(emojis) == 0 {
-		s.ChannelMessageSendEmbed(m.ChannelID, &discordgo.MessageEmbed{
-			Title: "No emojis found!",
+		edit := newEdit(s, m, userColor)
+		edit.setTitle("No emojis found!")
+		edit.send()
 
-			Color: userColor,
-		})
 		return
 	}
 
-	_, err := s.ChannelMessageSendEmbed(m.ChannelID, &discordgo.MessageEmbed{
-		Title: "Emojis with the substring `" + emojiName + "`",
+	_, err := s.ChannelMessageEditComplex(&discordgo.MessageEdit{
+		ID: m.Message.ID,
+		Channel: m.ChannelID,
+		Content: &content,		
+		Embed: &discordgo.MessageEmbed{
+			Title: "Emojis with the substring `" + emojiName + "`",
 
-		Color: userColor,
+			Color: userColor,
 
-		Fields: emojisEmbed,
+			Fields: emojisEmbed,
+		},
 	})
 	if err != nil {
 		errorLog.Println(err)
 	}
 
-	s.ChannelMessageDelete(m.ChannelID, m.Message.ID)
 }

msgImageRecall.go

@@ -1,10 +1,13 @@
 package main
 
 import (
-	"io/ioutil"
+	"fmt"
 	"github.com/bwmarrin/discordgo"
 	"net/http"
-	"fmt"
+	"golang.org/x/crypto/blake2b"
+	"strings"
+	"bytes"
+	"encoding/hex"
 )
 
 func msgImageRecall(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string) {
@@ -16,23 +19,47 @@ func msgImageRecall(s *discordgo.Session, m *discordgo.MessageCreate, msglist []
 
 	switch msglist[0] {
 	case "recall":
-		fimageRecall(s, m, msglist)
+		fimageRecall(s, m, msglist[1:])
 	case "save":
-		fimageSave(s, m, msglist)
+		fimageSave(s, m, msglist[1:])
 	case "list":
-		fimageList(s, m, msglist)
+		fimageList(s, m, msglist[1:])
 	case "delete":
-		fimageDelete(s, m, msglist)
+		fimageDelete(s, m, msglist[1:])
 	case "info":
-		fimageInfo(s, m, msglist)
+		fimageInfo(s, m, msglist[1:])
 	}
 }
 
 func fimageRecall(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string) {
+	prefixedImgName := m.Author.ID + "_" + strings.Join(msglist, " ")
+	hash := blake2b.Sum256([]byte(prefixedImgName))
+	imgFileName := hex.EncodeToString(hash[:])
+	
+	URL := fmt.Sprintf("https://api.2bot.ml/image/%s/recall/%s", m.Author.ID, imgFileName)
+	resp, err := http.Get(URL)
+	if err != nil {
+		errorLog.Println(err)
+		return
+	}
+	defer resp.Body.Close()
+	
+	if resp.StatusCode != http.StatusOK {
+		return
+	}
+	
+	buf := new(bytes.Buffer)
+	buf.ReadFrom(resp.Body)
+	imgURL := buf.String()
+
+	edit := newEdit(s, m, s.State.UserColor(s.State.User.ID, m.ChannelID))
+	edit.setDescription(strings.Join(msglist, " "))
+	edit.setImage(imgURL)
+	edit.send()
 }
 
 func fimageSave(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string) {
-	resp, err := http.Get("http://strum355.netsoc.co:8042/inServer?id="+m.Author.ID)
+	resp, err := http.Get("https://api.2bot.ml/inServer?id="+m.Author.ID)
 	if err != nil {
 		errorLog.Println(err)
 		return

utilities.go

@@ -14,4 +14,5 @@ func guildDetails(channelID string, s *discordgo.Session) (*discordgo.Guild, err
 		return nil, err
 	}
 	return guildDetails, nil
-}
+}
+