From 05d82767adab8fd95805198bb28be985caafbc77 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Sat, 20 Feb 2021 16:26:08 +0000 Subject: [PATCH] Open links in new tab --- main.go | 9 +++------ tweet.svg.tmpl | 12 ++++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/main.go b/main.go index 7430cbd..813c7d3 100644 --- a/main.go +++ b/main.go @@ -75,19 +75,16 @@ func getTweet(w http.ResponseWriter, r *http.Request) { for _, emoji := range emojis { emojiCount += len([]byte(emoji)) - 1 } - - fmt.Println(tweet.FullText) - tweet.FullText = tweet.FullText[tweet.DisplayTextRange[0] : tweet.DisplayTextRange[1]+emojiCount] for _, user := range tweet.Entities.User_mentions { - tweet.FullText = strings.ReplaceAll(tweet.FullText, "@"+user.Screen_name, fmt.Sprintf("@%s", user.Screen_name, user.Screen_name)) + tweet.FullText = strings.ReplaceAll(tweet.FullText, "@"+user.Screen_name, fmt.Sprintf("@%s", user.Screen_name, user.Screen_name)) } for _, url := range tweet.Entities.Urls { - tweet.FullText = strings.ReplaceAll(tweet.FullText, url.Url, fmt.Sprintf("%s", url.Expanded_url, url.Display_url)) + tweet.FullText = strings.ReplaceAll(tweet.FullText, url.Url, fmt.Sprintf("%s", url.Expanded_url, url.Display_url)) } for _, hashtag := range tweet.Entities.Hashtags { - tweet.FullText = strings.ReplaceAll(tweet.FullText, "#"+hashtag.Text, fmt.Sprintf("#%s", hashtag.Text, hashtag.Text)) + tweet.FullText = strings.ReplaceAll(tweet.FullText, "#"+hashtag.Text, fmt.Sprintf("#%s", hashtag.Text, hashtag.Text)) } templateFuncs := template.FuncMap{ diff --git a/tweet.svg.tmpl b/tweet.svg.tmpl index 620e4d1..575dc0a 100644 --- a/tweet.svg.tmpl +++ b/tweet.svg.tmpl @@ -16,14 +16,14 @@ .tweetsvg.reply{font-size:15px;color:rgb(110, 118, 125);}
- + -

{{ .User.Name }}

 +

{{ .User.Name }}

 -

@{{ .User.ScreenName }}

 +

@{{ .User.ScreenName }}

 {{ if .InReplyToScreenName }} -

Replying to @{{ .InReplyToScreenName }}

+

Replying to @{{ .InReplyToScreenName }}

{{ end }}

{{ html .FullText }}

@@ -31,12 +31,12 @@ {{ if .ExtendedEntities }} {{ range .ExtendedEntities.Media }} - {{ .ExtAltText }} + {{ .ExtAltText }} {{ end }} {{ end }} - +