fix: some things with display urls

Author: Preloading

bridge/bridge.go

@@ -163,10 +163,10 @@ type Media struct {
 	// Sizes         map[string]MediaSize `json:"sizes"`
 	Type      string `json:"type" xml:"type"`
 	Indices   []int  `json:"indices,omitempty" xml:"-"`
-	Start     int    `xml:"start"`
-	End       int    `xml:"end"`
-	StartAttr int    `xml:"start,attr"`
-	EndAttr   int    `xml:"end,attr"`
+	Start     int    `xml:"start" json:"-"`
+	End       int    `xml:"end" json:"-"`
+	StartAttr int    `xml:"start,attr" json:"-"`
+	EndAttr   int    `xml:"end,attr" json:"-"`
 }
 
 type Entities struct {

config/config.go

@@ -49,7 +49,9 @@ func LoadConfig() (*Config, error) {
     viper.SetDefault("TRACK_ANALYTICS", true)
     viper.SetDefault("CDN_URL", "http://localhost:3000")
     viper.SetDefault("USE_X_FORWARDED_FOR", false)
-    viper.SetDefault("IMG_DISPLAY_TEXT", "pic.twitter.com/{shortblob}")
+    //viper.SetDefault("IMG_DISPLAY_TEXT", "pic.twitter.com/{shortblob}")
+    // Since IMG_DISPLAY_TEXT isn't fully implemented, we'll have it disabled
+    viper.SetDefault("IMG_DISPLAY_TEXT", "")
     viper.SetDefault("VID_DISPLAY_TEXT", "pic.twitter.com/{shortblob}")
 
     // Read config file

twitterv1/post_viewing.go

@@ -302,6 +302,7 @@ func TranslatePostToTweet(tweet blueskyapi.Post, replyMsgBskyURI string, replyUs
 		// Add the image "url" to the text
 		startLen, endLen := 0, 0
 		displayURL := configData.ImgDisplayText
+		mediaWebURL := ""
 		if displayURL != "" {
 			displayURL = strings.ReplaceAll(displayURL, "{shortblob}", image.Image.Ref.Link[len(image.Image.Ref.Link)-6:])
 			displayURL = strings.ReplaceAll(displayURL, "{fullblob}", image.Image.Ref.Link)
@@ -317,6 +318,7 @@ func TranslatePostToTweet(tweet blueskyapi.Post, replyMsgBskyURI string, replyUs
 
 				processedText = processedText + " " + displayURL
 			}
+			mediaWebURL = configData.CdnURL + "/cdn/img/bsky/" + tweet.Author.DID + "/" + image.Image.Ref.Link + ".jpg"
 		}
 
 		// Process each image
@@ -330,8 +332,8 @@ func TranslatePostToTweet(tweet blueskyapi.Post, replyMsgBskyURI string, replyUs
 			DisplayURL: displayURL,
 			//ExpandedURL: displayURL,
 			//URL:         displayURL,
-			ExpandedURL: configData.CdnURL + "/cdn/img/bsky/" + tweet.Author.DID + "/" + image.Image.Ref.Link + ".jpg",
-			URL:         configData.CdnURL + "/cdn/img/bsky/" + tweet.Author.DID + "/" + image.Image.Ref.Link + ".jpg",
+			ExpandedURL: mediaWebURL,
+			URL:         mediaWebURL,
 
 			Sizes: bridge.MediaSize{
 				Thumb: func() bridge.Size {