feat: improve ograph embeds and fix some issues

Author: Bash06

api/share.go

@@ -22,8 +22,6 @@ import (
 	"bash06/vxinstagram/utils"
 	"log/slog"
 	"net/http"
-	"net/http/httputil"
-	"net/url"
 	"strings"
 
 	"github.com/getsentry/sentry-go"
@@ -83,6 +81,7 @@ func (h *Handler) FollowShare(c *gin.Context) {
 	}
 
 	var videoUrl string
+	var data *utils.ExtractedData
 	create := false
 
 	err = h.Db.Where("post_id = ?", postId).
@@ -92,7 +91,9 @@ func (h *Handler) FollowShare(c *gin.Context) {
 	if err != nil {
 		create = true
 		// 1: Try to scrape the HTML
-		videoUrl, err = utils.ScrapeFromHTML(postId)
+		data, err = utils.ScrapeFromHTML(postId)
+		videoUrl = data.VideoURL
+
 		if err != nil || videoUrl == "" {
 			slog.Error("Failed to scrape video URL from HTML. Trying to make an API request...", slog.Any("err", err))
 
@@ -125,35 +126,10 @@ func (h *Handler) FollowShare(c *gin.Context) {
 		})
 	}
 
-	remote, err := url.Parse(videoUrl)
-	if err != nil {
-		slog.Error("Failed to parse CDN video URL", slog.Any("err", err))
-		sentry.CaptureException(err)
-		c.HTML(http.StatusOK, "embed.html", &HtmlOpenGraphData{
-			Title:       "VxInstagram - Server Error",
-			Description: "VxInstagram encountered a server side error while processing your request. Request ID:`" + span.SpanID.String() + "`",
-		})
-		return
-	}
-
-	proxy := httputil.NewSingleHostReverseProxy(remote)
-	proxy.Director = func(r *http.Request) {
-		r.Header = c.Request.Header
-		r.Host = remote.Host
-		r.URL = remote
-		r.Header = c.Request.Header.Clone()
-
-		hopHeaders := []string{
-			"Connection", "Keep-Alive", "Proxy-Authenticate", "Proxy-Authorization", "Te", "Trailer", "Transfer-Encoding",
-		}
-		for _, h := range hopHeaders {
-			r.Header.Del(h)
-		}
-	}
-
-	slog.Debug("Success!")
-	c.Header("Cache-Control", "max-age=43200")
-	proxy.ServeHTTP(c.Writer, c.Request)
+	c.HTML(http.StatusOK, "embed.html", &HtmlOpenGraphData{
+		Title:    "❤️ " + data.Likes + "💬 " + data.Comments + "👀 " + data.Views,
+		VideoURL: videoUrl,
+	})
 
 	if create {
 		err := h.Db.Model(&utils.PostMemory{}).Create(&utils.PostMemory{

api/video.go

@@ -23,8 +23,6 @@ import (
 	"context"
 	"log/slog"
 	"net/http"
-	"net/http/httputil"
-	"net/url"
 	"strings"
 
 	"github.com/getsentry/sentry-go"
@@ -38,7 +36,6 @@ type HtmlOpenGraphData struct {
 	Description string
 	VideoURL    string
 	PostURL     string
-	Color       string
 }
 
 func (h *Handler) ServeVideo(c *gin.Context) {
@@ -62,12 +59,13 @@ func (h *Handler) ServeVideo(c *gin.Context) {
 		userAgent := strings.ToLower(c.Request.Header.Get("User-Agent"))
 
 		if !strings.Contains(userAgent, "discord") {
-			c.Redirect(http.StatusPermanentRedirect, "https://instagram.com/reel/"+postId)
+			c.Redirect(http.StatusPermanentRedirect, "https://instagram.com/"+c.Request.URL.String())
 			return
 		}
 	}
 
 	var videoUrl string
+	var data *utils.ExtractedData
 	create := false
 
 	err := h.Db.Where("post_id = ?", postId).
@@ -78,7 +76,9 @@ func (h *Handler) ServeVideo(c *gin.Context) {
 		slog.Debug("Reading from database failed")
 		create = true
 		// 1: Try to scrape the HTML
-		videoUrl, err = utils.ScrapeFromHTML(postId)
+		data, err = utils.ScrapeFromHTML(postId)
+		videoUrl = data.VideoURL
+
 		if err != nil || videoUrl == "" {
 			slog.Error("Failed to scrape video URL from HTML. Trying to make an API request...", slog.Any("err", err))
 
@@ -92,14 +92,15 @@ func (h *Handler) ServeVideo(c *gin.Context) {
 				slog.Error("Failed to fetch video URL from API. Critial failure!", slog.Any("err", err))
 				sentry.CaptureException(err)
 
-				c.HTML(http.StatusOK, "embed.html", &HtmlOpenGraphData{
-					Title:       "VxInstagram - Server Error",
-					Description: "VxInstagram encountered a server side error while processing your request. Request ID:`" + span.SpanID.String() + "`",
-				})
-				return
+				if err.Error() != "no instagram cookie provided" {
+					c.HTML(http.StatusOK, "embed.html", &HtmlOpenGraphData{
+						Title:       "VxInstagram - Server Error",
+						Description: "VxInstagram encountered a server side error while processing your request. Request ID:`" + span.SpanID.String() + "`",
+					})
+				}
+			} else {
+				videoUrl = data.Items[0].VideoVersions[0].URL
 			}
-
-			videoUrl = data.Items[0].VideoVersions[0].URL
 		}
 	}
 
@@ -111,36 +112,11 @@ func (h *Handler) ServeVideo(c *gin.Context) {
 		})
 	}
 
-	remote, err := url.Parse(videoUrl)
-	if err != nil {
-		slog.Error("Failed to parse CDN video URL", slog.Any("err", err))
-		sentry.CaptureException(err)
-		c.HTML(http.StatusOK, "embed.html", &HtmlOpenGraphData{
-			Title:       "VxInstagram - Server Error",
-			Description: "VxInstagram encountered a server side error while processing your request. Request ID:`" + span.SpanID.String() + "`",
-		})
-		return
-	}
-
-	proxy := httputil.NewSingleHostReverseProxy(remote)
-	proxy.Director = func(r *http.Request) {
-		r.Header = c.Request.Header
-		r.Host = remote.Host
-		r.URL = remote
-		r.Header = c.Request.Header.Clone()
-
-		hopHeaders := []string{
-			"Connection", "Keep-Alive", "Proxy-Authenticate", "Proxy-Authorization", "Te", "Trailer", "Transfer-Encoding",
-		}
-
-		for _, h := range hopHeaders {
-			r.Header.Del(h)
-		}
-	}
-
-	slog.Debug("Success!")
-	c.Header("Cache-Control", "max-age=43200")
-	proxy.ServeHTTP(c.Writer, c.Request)
+	c.HTML(http.StatusOK, "embed.html", &HtmlOpenGraphData{
+		Title:    "@" + data.Username,
+		VideoURL: videoUrl,
+		PostURL:  "https://instagram.com/" + c.Request.URL.String(),
+	})
 
 	if create {
 		err := h.Db.Model(&utils.PostMemory{}).Create(&utils.PostMemory{

middleware/cors.go

@@ -26,8 +26,10 @@ import (
 func CorsMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
+		c.Writer.Header().Set("Access-Control-Max-Age", "30000000")
 		c.Writer.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
 		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization")
+		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") // Optional
 
 		if c.Request.Method == http.MethodOptions {
 			c.AbortWithStatus(http.StatusNoContent)

templates/embed.html

@@ -1,28 +1,28 @@
+</html>
+
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
-        <meta property="og:title" content="{{.Title}}" />
-        <meta property="og:description" content="{{.Description}}" />
+    <meta property="og:title" content="{{.Title}}" />
+    <meta property="og:description" content="{{.Description}}" />
+    <meta property="og:type" content="video.other" />
 
-        <meta property="og:video" content="{{.VideoURL}}" />
-        <meta property="og:video:secure_url" content="{{.VideoURL}}" />
-        <meta property="og:video:type" content="video/mp4" />
-        <meta property="og:video:width" content="1280" />
-        <meta property="og:video:height" content="720" />
+    <meta property="og:video" content="{{.VideoURL}}" />
+    <meta property="og:video:secure_url" content="{{.VideoURL}}" />
+    <meta property="og:video:type" content="video/mp4" />
 
-        <meta property="twitter:player:width" content="1280" />
-        <meta property="twitter:player:height" content="720" />
-        <meta property="twitter:player:stream" content="{{.VideoURL}}" />
-        <meta property="twitter:player:stream:content_type" content="video/mp4" />
+    <meta name="twitter:card" content="player" />
+    <meta name="twitter:title" content="{{.Title}}" />
+    <meta name="twitter:description" content="{{.Description}}" />
+    <meta name="twitter:player" content="{{.VideoURL}}" />
 
-        <meta property="theme-color" content="{{.Color}}" />
-        <title>Vxinstgram</title>
+    <meta property="theme-color" content="#2b2d31" />
+    <title>{{.Title}}</title>
 </head>
-        <a href="{{.PostURL}}">
-                <p>If redirects don't work in your browser, click here to go to the original post</p>
-        </a>
 <body>
+    <video controls width="1280" height="720">
+        <source src="{{.VideoURL}}" type="video/mp4">
+        Your browser does not support the video tag.
+    </video>
 </body>
-
-</html>
+</html>

utils/extractUrl.go

@@ -18,38 +18,76 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 package utils
 
 import (
-	"fmt"
 	"strings"
 )
 
+type ExtractedData struct {
+	VideoURL     string
+	ThumbnailURL string
+	IsVideo      string
+	Title        string
+	Views        string
+	Comments     string
+	Likes        string
+	Username     string
+}
+
+var prefixes = map[string]string{
+	"VideoURL":     `\"video_url\":`,
+	"ThumbnailURL": `\"display_url\":`,
+	"IsVideo":      `\"is_video\":`,
+	"Title":        `\"title\":`,
+	"Views":        `\"video_views\":`,
+	"Comments":     `\"commenter_count\":`,
+	"Likes":        `\"likes_count\":`,
+	"Username":     `\"username\":`,
+}
+
 const (
-	prefix    = `\"video_url\":`
-	quote     = `\"`
-	prefixLen = len(prefix) + 1
+	quote = `\"`
 )
 
 // Extracts the video URL from response
-func ExtractUrl(s string) (string, bool) {
-	// Thanks a lot for this tyler
-	// Find the first prefix
-	startIdx := strings.Index(s, prefix)
-	if startIdx == -1 {
-		return "", false
-	}
+func ExtractUrl(s string) (*ExtractedData, bool) {
+	data := &ExtractedData{}
+	ok := false
 
-	// Offset start by prefix len
-	start := startIdx + prefixLen
+	for key, prefix := range prefixes {
+		startIdx := strings.Index(s, prefix)
+		if startIdx == -1 {
+			continue
+		}
+		start := startIdx + len(prefix) + 1
+		end := strings.Index(s[start:], quote)
+		if end == -1 {
+			continue
+		}
 
-	end := strings.Index(s[start:], quote)
-	if end == -1 {
-		return "", false
-	}
+		value := s[start : start+end]
+		value = UnescapeJSONString(value)
+		value = strings.ReplaceAll(value, `\/`, `/`)
 
-	result := s[start : start+end]
-	result = UnescapeJSONString(result)
-	result = strings.ReplaceAll(result, `\/`, `/`)
+		switch key {
+		case "ThumbnailURL":
+			data.ThumbnailURL = value[1:]
+		case "Title":
+			data.Title = value[1:]
+		case "Views":
+			data.Views = value[1:]
+		case "Comments":
+			data.Comments = value[1:]
+		case "Likes":
+			data.Likes = value[1:]
+		case "Username":
+			data.Username = value[1:]
+		case "VideoURL":
+			data.VideoURL = value[1:]
+		case "IsVideo":
+			data.IsVideo = value[1:]
+		}
 
-	fmt.Println(result)
+		ok = true
+	}
 
-	return result[1:], true
+	return data, ok
 }

utils/scrape.go

@@ -26,13 +26,13 @@ import (
 	"time"
 )
 
-func ScrapeFromHTML(postId string) (string, error) {
+func ScrapeFromHTML(postId string) (*ExtractedData, error) {
 	origin := "https://instagram.com/p/" + postId + "/embed/captioned"
 
 	slog.Debug("Preparing request", slog.String("origin", origin))
 	req, err := http.NewRequest("GET", origin, nil)
 	if err != nil {
-		return "", fmt.Errorf("failed to prepare HTTP request: %v", err)
+		return nil, fmt.Errorf("failed to prepare HTTP request: %v", err)
 	}
 
 	req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36")
@@ -49,7 +49,7 @@ func ScrapeFromHTML(postId string) (string, error) {
 
 	res, err := client.Do(req)
 	if err != nil {
-		return "", fmt.Errorf("HTTP request failed: %v", err)
+		return nil, fmt.Errorf("HTTP request failed: %v", err)
 	}
 
 	defer res.Body.Close()
@@ -60,15 +60,15 @@ func ScrapeFromHTML(postId string) (string, error) {
 	slog.Debug("Scanning response body for video url")
 	for scanner.Scan() {
 		line := scanner.Text()
-		if url, found := ExtractUrl(line); found && url != "" {
-			slog.Debug("Video URL found!")
-			return url, nil
+		if data, ok := ExtractUrl(line); ok {
+			slog.Debug("Data found!")
+			return data, nil
 		}
 	}
 
 	if err := scanner.Err(); err != nil {
-		return "", fmt.Errorf("error scanning response: %v", err)
+		return nil, fmt.Errorf("error scanning response: %v", err)
 	}
 
-	return "", nil
+	return nil, nil
 }