Gif support added to html export

Author: ShadiestGoat

components/main.go

@@ -65,6 +65,7 @@ func (theme *Theme) LoadTheme(themeName string, DW_MEDIA bool) {
 	theme.IMG = theme.parseComponent("img")
 	theme.STICKER = theme.parseComponent("sticker")
 	theme.REPLY = theme.parseComponent("reply")
+	theme.GIF = theme.parseComponent("gifs")
 	theme.DownloadMedia = DW_MEDIA
 }
 
@@ -93,6 +94,21 @@ func (theme Theme) MessageComponent(msg discord.Message, previousMsg discord.Mes
 			panic(attach.ContentType)
 		}
 	}
+	
+	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),
+			})
+			if msg.Content == embed.GifContentUrl {
+				content = ""
+			}
+		}
+	}
 
 	stickerContent := ""
 
@@ -121,14 +137,16 @@ func (theme Theme) MessageComponent(msg discord.Message, previousMsg discord.Mes
 			"ID": msg.ID,
 			"REPLY_CONTENT": replyContent,
 			"STICKER_CONTENT": stickerContent,
+			"GIFS": gifContents,
 		})
 	} else {
 		return tools.ParseTemplate(theme.MSG, map[string]string{
-			"DATE": discord.TimestampToTime(msg.Timestamp).Format("15:04:05"),
+			"DATE": discord.TimestampToTime(msg.Timestamp).Format("15:04"),
 			"CONTENT": content,
 			"ATTACH_CONTENT": attachContent,
 			"ID": msg.ID,
 			"STICKER_CONTENT": stickerContent,
+			"GIFS": gifContents,
 		})
 	}
 }

components/types.go

@@ -16,6 +16,7 @@ type Theme struct {
 	START_DM,
 	REPLY,
 	STICKER,
+	GIF,
 	IMG string
 	DownloadMedia bool
 }

discord/types.go

@@ -16,6 +16,7 @@ type Embed struct {
 	Description string
 	Color string
 	Thumbnail EmbedImageThumbnail
+	GifContentUrl string
 }
 
 type EmbedVideo struct {

discord/unmarshler.go

@@ -154,16 +154,17 @@ func (embed *Embed) UnmarshalJSON(b []byte) error {
 		switch key {
 			case "type":
 			case "url":
-				if embed.Type == EMBED_GIF {
-					continue
-				}
 
 				parsed := ""
 
 				err = json.Unmarshal(value, &parsed)
 				tools.PanicIfErr(err)
-
-				embed.Url = parsed
+				
+				if embed.Type == EMBED_GIF {
+					embed.GifContentUrl = parsed
+				} else {
+					embed.Url = parsed
+				}
 			case "title":
 				parsed := ""
 
@@ -191,9 +192,6 @@ func (embed *Embed) UnmarshalJSON(b []byte) error {
 
 				embed.Url = parsed.Url
 			case "thumbnail":
-				if embed.Type != EMBED_IMAGE {
-					continue
-				}
 				parsed := EmbedImageThumbnail{}
 
 				err = json.Unmarshal(value, &parsed)

fetcher/main.go

@@ -40,7 +40,6 @@ func (conf ConfigType) FetchMain() {
 	conf.checkToken()
 
 	ParsedMessages := map[string]JSONMetaData{}
-	NumLeft := conf.Filter.NumMax
 
 	maxTime := conf.Filter.MaxTime
 	minTime := conf.Filter.MinTime
@@ -150,21 +149,27 @@ func (conf ConfigType) FetchMain() {
 		}
 	}
 
-	if maxTime > maxMsg.Timestamp && maxMsg.Timestamp != 0 {
+	if (maxTime > maxMsg.Timestamp && maxMsg.Timestamp != 0) || (maxTime == 0 && maxMsg.Timestamp != 0) {
 		maxTime = maxMsg.Timestamp
 	}
 
-	if minTime < minMsg.Timestamp {
+	if (minTime < minMsg.Timestamp && maxMsg.Timestamp != 0 )|| (minTime == 0 && minMsg.Timestamp != 0) {
 		minTime = minMsg.Timestamp
 	}
 
+	if maxTime == 0 {
+		maxTime = 9999999999999999
+	}
+
 	for _, channel := range conf.Ids {
-		NumLeft = conf.Filter.NumMax
+		NumLeft := conf.Filter.NumMax
 
 		outputDir := tools.ParseTemplate(conf.ExportLocation, map[string]string{
 			"CHANNEL_ID": channel,
 		})
 
+		os.RemoveAll(outputDir)
+
 		os.Mkdir(outputDir, 0755)
 
 		mediaDir := ""
@@ -255,26 +260,24 @@ func (conf ConfigType) FetchMain() {
 			} // TODO: Add other channel types
 		}
 
+		lastID := fmt.Sprint(discord.TimestampToID(minTime))
+
+		if len(lastID) == 0 {
+			lastID = "0"
+		}
+
 		prevMsg := discord.Message{}
 
 		for {
 			fin := false
-
-			msgQSuffix := "&after=" + prevMsg.ID
-			if len(prevMsg.ID) == 0 {
-				if minTime != 0 {
-					msgQSuffix += discord.TimestampToID(maxTime)
-				} else {
-					msgQSuffix = ""
-				}
-			}
-
 			resp := []byte{}
-			err := conf.discordFetch(fmt.Sprintf("/channels/%v/messages?limit=%v%v", channel, limit, msgQSuffix), &resp)
+			msgUrl := fmt.Sprintf("/channels/%v/messages?limit=%v&after=%v", channel, limit, lastID)
+			fmt.Println(msgUrl)
+			err := conf.discordFetch(msgUrl, &resp)
 			tools.PanicIfErr(err)
 			allMsgs := []discord.Message{}
 			json.Unmarshal(resp, &allMsgs)
-			
+
 			if len(allMsgs) != limit {
 				fin = true // don't break because you still need proccessing
 			}
@@ -284,11 +287,20 @@ func (conf ConfigType) FetchMain() {
 				allMsgs[i], allMsgs[j] = allMsgs[j], allMsgs[i]
 			}
 
+			lastID = allMsgs[len(allMsgs)-1].ID
+
 			for _, msg := range allMsgs {
 				if NumLeft == 0 {
+					fin = true
 					break
 				}
 
+				if msg.Timestamp > maxTime {
+					break
+				}
+				
+				// fmt.Println(msg.Content)
+
 				for _, embed := range msg.Embeds {
 					if embed.Type == discord.EMBED_IMAGE {
 						msg.Attachments = append(msg.Attachments, discord.Attachment{
@@ -342,16 +354,10 @@ func (conf ConfigType) FetchMain() {
 				case config.EXPORT_TYPE_HTML:
 					msgTimestamp := discord.TimestampToTime(msg.Timestamp)
 					sameDate := tools.SameDate(msgTimestamp, discord.TimestampToTime(prevMsg.Timestamp))
-
 					if !sameDate {
 						file.WriteString(theme.DateSeperator(msgTimestamp))
 					}
-
 					file.WriteString(theme.MessageComponent(msg, prevMsg, prevMsg.Author.ID != msg.Author.ID || !sameDate || msg.IsReply))
-
-					prevMsg = msg
-					fin = true
-
 				case config.EXPORT_TYPE_JSON:
 					newChanInfo := ParsedMessages[channel]
 
@@ -364,15 +370,16 @@ func (conf ConfigType) FetchMain() {
 							Attachment: attachRaw,
 							AuthorID: msg.Author.ID,
 						}
-
+						
 						newChanInfo.AttachList = append(newChanInfo.AttachList, attachment)
 						newChanInfo.AttachIDToIndex[attachment.ID] = len(newChanInfo.AttachIDToIndex) - 1
 						newChanInfo.AttachByAuthor[msg.Author.ID] = append(newChanInfo.AttachByAuthor[msg.Author.ID], attachment.ID)
 					}
-
+					
 					ParsedMessages[channel] = newChanInfo
 				}
 
+				prevMsg = msg
 				NumLeft--
 			}
 

themes/base/components/gifs.html

@@ -0,0 +1,4 @@
+<video style="width: {{%WIDTH}}px; height: {{%HEIGHT}}px" autoplay muted loop>
+    <source src="{{%VIDEO_URL}}" type="video/mp4">
+    Update your browser, idiot!
+</video>

themes/base/components/msgStarter.html

@@ -9,6 +9,7 @@ <h3 class="msg-username sel">{{%USERNAME}}</h3>
             </div>
             <p class="msg-content sel">{{%CONTENT}}</p>
         {{%ATTACH_CONTENT}}
+        {{%GIFS}}
         {{%STICKER_CONTENT}}
         </div>
     </div>

themes/base/components/normalMsg.html

@@ -5,6 +5,7 @@
     <div class="msg-content-wrapper">
         <p class="msg-content sel">{{%CONTENT}}</p>
         {{%ATTACH_CONTENT}}
+        {{%GIFS}}
         {{%STICKER_CONTENT}}
     </div>
 </div>