v0.2.0

Added:
- Mentions in html

Fixed:
- Not escaped html tags
- Filenames in html are now working
- Less panics now

Changed:
- go fmt-ed the who project
- more margin between usename and text in html
- Adding more logging info

Author: ShadiestGoat

components/main.go

@@ -2,6 +2,7 @@ package components
 
 import (
 	"fmt"
+	"html/template"
 	"io/ioutil"
 	"math"
 	"os"
@@ -18,10 +19,10 @@ func preParseHTML(html string) string {
 }
 
 func (theme Theme) parseComponent(component string) string {
-	comp, err := ioutil.ReadFile(filepath.Join(theme.ThemeDir, "components", component + ".html"))
+	comp, err := ioutil.ReadFile(filepath.Join(theme.ThemeDir, "components", component+".html"))
 
 	if os.IsNotExist(err) {
-		baseComp, err := ioutil.ReadFile(filepath.Join(theme.BaseCss, "components", component + ".html"))
+		baseComp, err := ioutil.ReadFile(filepath.Join(theme.BaseCss, "components", component+".html"))
 		tools.PanicIfErr(err)
 		comp = baseComp
 	} else {
@@ -37,18 +38,17 @@ func (theme *Theme) LoadTheme(themeName string, DW_MEDIA bool) {
 	} else {
 		tools.PanicIfErr(err)
 	}
-	
+
 	themeDir := filepath.Join("themes", themeName)
-	
-	
+
 	themeLoc, err := os.Stat(themeDir)
-	
+
 	if os.IsNotExist(err) || !themeLoc.IsDir() {
 		panic("Cannot find theme!")
 	} else {
 		tools.PanicIfErr(err)
 	}
-	
+
 	theme.ThemeDir = themeDir
 	theme.BaseCss = filepath.Join("themes", "base")
 
@@ -67,6 +67,7 @@ func (theme *Theme) LoadTheme(themeName string, DW_MEDIA bool) {
 	theme.REPLY = theme.parseComponent("reply")
 	theme.GIF = theme.parseComponent("gifs")
 	theme.OTHER_MIME = theme.parseComponent("otherMime")
+	theme.MENTION = theme.parseComponent("mention")
 
 	theme.DownloadMedia = DW_MEDIA
 }
@@ -77,10 +78,13 @@ var tabReg = regexp.MustCompile(`\t`)
 
 func (theme Theme) MessageComponent(msg discord.Message, previousMsg discord.Message, firstMsg bool) string {
 	content := msg.Content
-	content = newLineReg.ReplaceAllString(content, "<br />")
 
 	attachContent := ""
 
+	content = template.HTMLEscapeString(content)
+
+	content = newLineReg.ReplaceAllString(content, "<br />")
+
 	for _, attach := range msg.Attachments {
 		if attach.ContentType[:5] == "image" {
 			mediaUrl := attach.Url
@@ -89,24 +93,24 @@ func (theme Theme) MessageComponent(msg discord.Message, previousMsg discord.Mes
 			}
 			attachContent += tools.ParseTemplate(theme.IMG, map[string]string{
 				"IMG_URL": mediaUrl,
-				"WIDTH": fmt.Sprint(math.Floor(0.8*float64(attach.Width))),
-				"HEIGHT": fmt.Sprint(math.Floor(0.8*float64(attach.Height))),
+				"WIDTH":   fmt.Sprint(math.Floor(0.8 * float64(attach.Width))),
+				"HEIGHT":  fmt.Sprint(math.Floor(0.8 * float64(attach.Height))),
 			})
 		} else {
 			attachContent += tools.ParseTemplate(theme.OTHER_MIME, map[string]string{
-				"FILENAME": attach.MediaName(),
+				"FILENAME": attach.Name,
 			})
 		}
 	}
-	
+
 	gifContents := ""
 
 	for _, embed := range msg.Embeds {
 		if embed.Type == discord.EMBED_GIF {
 			gifContents += tools.ParseTemplate(theme.GIF, map[string]string{
 				"VIDEO_URL": embed.Url,
-				"WIDTH": fmt.Sprint(float64(embed.Thumbnail.Width)*0.7),
-				"HEIGHT": fmt.Sprint(float64(embed.Thumbnail.Height)*0.7),
+				"WIDTH":     fmt.Sprint(float64(embed.Thumbnail.Width) * 0.7),
+				"HEIGHT":    fmt.Sprint(float64(embed.Thumbnail.Height) * 0.7),
 			})
 			if msg.Content == embed.GifContentUrl {
 				content = ""
@@ -125,35 +129,44 @@ func (theme Theme) MessageComponent(msg discord.Message, previousMsg discord.Mes
 	if msg.IsSystemType {
 		return "TODO:"
 	} else {
+		for _, mention := range msg.Mentions {
+			idReg := regexp.MustCompile(fmt.Sprintf(`&lt;@!?%v&gt;`, mention.ID))
+			content = idReg.ReplaceAllString(content, tools.ParseTemplate(theme.MENTION, map[string]string{
+				"MENTION_NAME":   mention.Name,
+				"MENTION_PREFIX": "@",
+			}))
+		}
+
 		if firstMsg {
 			replyContent := ""
+
 			if msg.IsReply {
 				replyContent = tools.ParseTemplate(theme.REPLY, map[string]string{
-					"PFP": msg.ReplyTo.Author.URL(16),
-					"NAME": msg.ReplyTo.Author.Name,
+					"PFP":     msg.ReplyTo.Author.URL(16),
+					"NAME":    msg.ReplyTo.Author.Name,
 					"CONTENT": msg.ReplyTo.Content,
 				})
 			}
-	
+
 			return tools.ParseTemplate(theme.MSG_WITH_PFP, map[string]string{
-				"PFP": msg.Author.URL(256),
-				"USERNAME": msg.Author.Name,
-				"DATE": discord.TimestampToTime(msg.Timestamp).Format("Mon 02/01/2006 03:04:05 PM"),
-				"CONTENT": content,
-				"ATTACH_CONTENT": attachContent,
-				"ID": msg.ID,
-				"REPLY_CONTENT": replyContent,
+				"PFP":             msg.Author.URL(256),
+				"USERNAME":        msg.Author.Name,
+				"DATE":            discord.TimestampToTime(msg.Timestamp).Format("Mon 02/01/2006 03:04:05 PM"),
+				"CONTENT":         content,
+				"ATTACH_CONTENT":  attachContent,
+				"ID":              msg.ID,
+				"REPLY_CONTENT":   replyContent,
 				"STICKER_CONTENT": stickerContent,
-				"GIFS": gifContents,
+				"GIFS":            gifContents,
 			})
 		} else {
 			return tools.ParseTemplate(theme.MSG, map[string]string{
-				"DATE": discord.TimestampToTime(msg.Timestamp).Format("15:04"),
-				"CONTENT": content,
-				"ATTACH_CONTENT": attachContent,
-				"ID": msg.ID,
+				"DATE":            discord.TimestampToTime(msg.Timestamp).Format("15:04"),
+				"CONTENT":         content,
+				"ATTACH_CONTENT":  attachContent,
+				"ID":              msg.ID,
 				"STICKER_CONTENT": stickerContent,
-				"GIFS": gifContents,
+				"GIFS":            gifContents,
 			})
 		}
 	}
@@ -175,37 +188,37 @@ func (theme Theme) TopBar(title string, channelType discord.ChannelType) string
 	icon := ""
 
 	switch channelType {
-		case discord.CHANNEL_TYPE_DM:
-			icon = theme.SVG_DM
-		case discord.CHANNEL_TYPE_GROUP_DM:
-			icon = theme.SVG_GROUP_DM
-		default:
-			icon = theme.SVG_CHANNEL
+	case discord.CHANNEL_TYPE_DM:
+		icon = theme.SVG_DM
+	case discord.CHANNEL_TYPE_GROUP_DM:
+		icon = theme.SVG_GROUP_DM
+	default:
+		icon = theme.SVG_CHANNEL
 	}
-	
+
 	return tools.ParseTemplate(theme.TOP_BAR, map[string]string{
-		"ICON": icon,
+		"ICON":  icon,
 		"TITLE": title,
 	})
 }
 
 func (theme Theme) StartDM(author discord.Author) string {
 	return tools.ParseTemplate(theme.START_CHAN, map[string]string{
 		"TITLE": author.Name,
-		"ICON": author.URL(512),
+		"ICON":  author.URL(512),
 	})
 }
 
 func (theme Theme) StartChannel(channel discord.Channel) string {
 	return tools.ParseTemplate(theme.START_CHAN, map[string]string{
 		"TITLE": "Welcome to #" + channel.Name,
-		"ICON": "assets/channelStart.png",
+		"ICON":  "assets/channelStart.png",
 	})
 }
 
 func (theme Theme) StartGroupDM(groupDM discord.Channel) string {
 	return tools.ParseTemplate(theme.START_CHAN, map[string]string{
 		"TITLE": groupDM.Name,
-		"ICON": groupDM.Icon,
+		"ICON":  groupDM.Icon,
 	})
 }

components/types.go

@@ -18,6 +18,7 @@ type Theme struct {
 	STICKER,
 	GIF,
 	OTHER_MIME,
+	MENTION,
 	IMG string
 	DownloadMedia bool
 }
@@ -30,4 +31,4 @@ type SystemMsgs struct {
 	ICON_CH,
 	PIN,
 	MEM_JOIN string
-}
+}

config/autoDarwin.go

@@ -24,13 +24,13 @@ func (mask *HeadersMask) Auto() {
 	tools.PanicIfErr(err)
 	mask.PullDiscordVers(homeDir + "/Library/Application Support")
 	mask.UserAgent = fmt.Sprintf("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) discord/%v Chrome/91.0.4472.164 Electron/13.4.0 Safari/537.36", mask.DiscordVersion)
-	
+
 	releaseChan := "stable"
 
 	if mask.UseCanary {
 		releaseChan = "canary"
 	}
-	
+
 	cmd := exec.Command("uname", "-r")
 	osVersion, err := cmd.Output()
 	tools.PanicIfErr(err)
@@ -44,4 +44,4 @@ func (mask *HeadersMask) Auto() {
 		mask.PullBuildId(),
 	)
 	mask.EncodeSuperProps()
-}
+}

config/autoLinux.go

@@ -28,13 +28,13 @@ func (mask *HeadersMask) Auto() {
 
 	mask.PullDiscordVers(homeDir + "/.config")
 	mask.UserAgent = fmt.Sprintf("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) discord/%v Chrome/91.0.4472.164 Electron/13.6.6 Safari/537.36", mask.DiscordVersion)
-	
+
 	releaseChan := "stable"
 
 	if mask.UseCanary {
 		releaseChan = "canary"
 	}
-	
+
 	cmd := exec.Command("uname", "-r")
 	osVersion, err := cmd.Output()
 	tools.PanicIfErr(err)
@@ -49,7 +49,7 @@ func (mask *HeadersMask) Auto() {
 	} else {
 		winMgr += ","
 	}
-	
+
 	osInfo, err := ioutil.ReadFile("/etc/os-release")
 	tools.PanicIfErr(err)
 	distro := ""
@@ -66,7 +66,7 @@ func (mask *HeadersMask) Auto() {
 	}
 
 	mask.SuperProperties = fmt.Sprintf(
-		`{"os":"Linux","browser":"Discord Client","release_channel":"%v","client_version":"%v","os_version":"%v","os_arch":"x64","system_locale":"%v","window_manager":"%vunknown","distro":"%v","client_build_number":%v,"client_event_source":null}`, 
+		`{"os":"Linux","browser":"Discord Client","release_channel":"%v","client_version":"%v","os_version":"%v","os_arch":"x64","system_locale":"%v","window_manager":"%vunknown","distro":"%v","client_build_number":%v,"client_event_source":null}`,
 		releaseChan,
 		mask.DiscordVersion,
 		osVer,
@@ -76,4 +76,4 @@ func (mask *HeadersMask) Auto() {
 		mask.PullBuildId(),
 	)
 	mask.EncodeSuperProps()
-}
+}

config/autoTools.go

@@ -15,7 +15,7 @@ import (
 func (mask *HeadersMask) PullDiscordVers(discordPath string) {
 	dExist := true
 	normalD, err := ioutil.ReadDir(filepath.Join(discordPath, "discord"))
-	
+
 	if os.IsNotExist(err) {
 		dExist = false
 	} else {
@@ -24,7 +24,7 @@ func (mask *HeadersMask) PullDiscordVers(discordPath string) {
 
 	dCExist := true
 	normalCD, err := ioutil.ReadDir(filepath.Join(discordPath, "discordcanary"))
-	
+
 	if os.IsNotExist(err) {
 		dCExist = false
 	} else {
@@ -42,7 +42,7 @@ func (mask *HeadersMask) PullDiscordVers(discordPath string) {
 		fmt.Println("Warning! Canary discord found but stable not found, and the preferance is for stable! We will be using true for USE_CANARY for this download")
 		mask.UseCanary = true
 	}
-	
+
 	if mask.UseCanary {
 		mask.DomainPrefix = "canary."
 	}
@@ -52,7 +52,7 @@ func (mask *HeadersMask) PullDiscordVers(discordPath string) {
 	if mask.UseCanary {
 		discordFiles = normalCD
 	}
-	
+
 	for _, fileInfo := range discordFiles {
 		if !fileInfo.IsDir() {
 			continue
@@ -78,20 +78,20 @@ func (mask HeadersMask) PullBuildId() string {
 	resp, err := ioutil.ReadAll(respRaw.Body)
 	tools.PanicIfErr(err)
 	assets := discordAssetReg.FindAll(resp, 50)
-	buildFileRaw, err := http.Get(fmt.Sprintf("https://%vdiscord.com/%v", mask.DomainPrefix, string(assets[len(assets) - 2])))
+	buildFileRaw, err := http.Get(fmt.Sprintf("https://%vdiscord.com/%v", mask.DomainPrefix, string(assets[len(assets)-2])))
 	tools.PanicIfErr(err)
 	buildFile, err := ioutil.ReadAll(buildFileRaw.Body)
 	tools.PanicIfErr(err)
-	
+
 	buildFileS := string(buildFile)
 
 	buildLoc := buildNumReg.FindStringIndex(buildFileS)
-	
+
 	if len(buildLoc) == 0 {
 		panic("Build num not located! Auto loading has failed :(")
 	}
 
-	return buildFileS[buildLoc[1]+3:buildLoc[1]+9]
+	return buildFileS[buildLoc[1]+3 : buildLoc[1]+9]
 }
 
 func (mask *HeadersMask) EncodeSuperProps() {
@@ -100,4 +100,4 @@ func (mask *HeadersMask) EncodeSuperProps() {
 
 var localeReg = regexp.MustCompile(`.._..`)
 var versionReg = regexp.MustCompile(`\d+\.\d+\.\d+`)
-var quotesReg = regexp.MustCompile(`"`)
+var quotesReg = regexp.MustCompile(`"`)

config/autoWindows.go

@@ -4,8 +4,8 @@ package config
 
 import (
 	"fmt"
-	"os/exec"
 	"os"
+	"os/exec"
 
 	"github.com/ShadiestGoat/DiscordChatExporter/tools"
 	"golang.org/x/sys/windows/registry"
@@ -49,4 +49,4 @@ func (mask *HeadersMask) Auto() {
 		mask.Locale,
 		mask.PullBuildId(),
 	)
-}
+}