Added deprecated notices

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
Fixed double dash in tweets
2023-06-02 14:58:26 +01:00 · 2022-11-05 09:10:37 +00:00 · 2022-02-21 16:57:27 +00:00 · 2021-09-04 16:41:15 +01:00 · 2021-07-24 11:20:38 +01:00 · 2021-07-24 11:19:44 +01:00
7 changed files with 61 additions and 21 deletions
--- a/2
+++ b/2
@@ -47,7 +47,7 @@ ci:

 .PHONY: release # Release the latest version of the application
 release:
-	@kubectl --namespace tweetsvg set image deployment tweetsvg web=docker.cluster.fun/averagemarcus/tweetsvg:$(SHA)
+	@kubectl --namespace tweetsvg rollout restart deployment tweetsvg

 .PHONY: help # Show this list of commands
 help:
--- a/README.md
+++ b/README.md
@@ -1,10 +1,15 @@
+# ⚠️ DEPRECATED
+# Twitter has killed off its free API so this no longer works
+
+---
+
 ![TweetSVG](logo.png)

 Generate an SVG for a given Tweet ID

 Available at https://tweet.cluster.fun/

-## Example 
+## Example

 ```
 <img src="https://tweet.cluster.fun/1363048182020792325" />
--- a/chars.go
+++ b/chars.go
@@ -74,9 +74,10 @@ var charWidths = map[string]float64{
 	"%":  18.416671752929688,
 	"^":  9.683334350585938,
 	"*":  9.683334350585938,
-	"(":  7,
-	")":  7,
+	"(":  7.8,
+	")":  7.8,
 	"-":  10.300003051757812,
+	"—":  10.300003051757812,
 	"_":  9.73333740234375,
 	"=":  14.333328247070312,
 	"+":  14.333328247070312,
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/garyburd/go-oauth v0.0.0-20180319155456-bca2e7f09a17 // indirect
 	github.com/grokify/html-strip-tags-go v0.0.1
 	github.com/joho/godotenv v1.3.0
+	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/rivo/uniseg v0.2.0
 	github.com/tmdvs/Go-Emoji-Utils v1.1.0
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
--- a/go.sum
+++ b/go.sum
@@ -14,6 +14,8 @@ github.com/grokify/html-strip-tags-go v0.0.1 h1:0fThFwLbW7P/kOiTBs03FsJSV9RM2M/Q
 github.com/grokify/html-strip-tags-go v0.0.1/go.mod h1:2Su6romC5/1VXOQMaWL2yb618ARB8iVo6/DR99A6d78=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/tmdvs/Go-Emoji-Utils v1.1.0 h1:gtPix7HZPrd49+MNDcuRLvv4xVNxCE5wgjqyuvmbyYg=
--- a/index.html
+++ b/index.html
@@ -13,9 +13,10 @@
  <meta property="og:url" content="https://tweet.cluster.fun">
  <meta property="og:description" content="Generate an SVG for a given Tweet ID">
  <meta property="og:type" content="website">
-  <meta property="og:image" content="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSItNTAwIC0xMDAgMTUxMiA3MTIiPgogIDxnPgogICAgPHBhdGggZD0iTTYxIDE0MGMtOCAwLTE0LTYtMTQtMTRWNjFjMC04IDYtMTQgMTQtMTRoNjVhMTQgMTQgMCAxMTAgMjhINzV2NTFjMCA4LTYgMTQtMTQgMTR6IiBmaWxsPSIjZWY3MWE4Ii8+CiAgICA8cGF0aCBkPSJNNDUxIDQ2NWgtNjVhMTQgMTQgMCAxMTAtMjhoNTF2LTUxYTE0IDE0IDAgMTEyOCAwdjY1YzAgOC02IDE0LTE0IDE0eiIgZmlsbD0iI2VmNzFhOCIvPgogICAgPHBhdGggZD0iTTQ5OCA1MTJIMTRjLTggMC0xNC02LTE0LTE0VjE0QzAgNiA2IDAgMTQgMGg0ODRjOCAwIDE0IDYgMTQgMTR2NDg0YzAgOC02IDE0LTE0IDE0ek0yOCA0ODRoNDU2VjI4SDI4djQ1NnoiIGZpbGw9IiNlZjcxYTgiLz4KICA8L2c+CiAgPHBhdGggZD0iTTM2OSAyNjZjOC0yMSAxMi00NCAxMi02NXYtMWMwLTQgMi03IDUtOSAxMC05IDI2LTMwIDI2LTMwbC00MC02Yy0yIDAtMTItMTEtMTQtMTJhNjggNjggMCAwMC02Ni0xNGMtMjIgNy0zOSAyNS00NCA0Ny0yIDgtMyAxNy0yIDI1djJhMyAzIDAgMDEtMiAxIDE3OCAxNzggMCAwMS0xMjItNjVjLTItMi01LTItNiAwYTY4IDY4IDAgMDAxMSA4MmMtNS0xLTExLTMtMTUtNi0zLTEtNiAxLTYgMyAwIDI4IDE2IDUyIDQwIDYzYTcwIDcwIDAgMDEtMTMtMWMtMy0xLTUgMi00IDQgOCAyNCAyOSA0MiA1MyA0Ni0yMCAxNC00NCAyMS02OSAyMWgtOGMtMyAwLTUgMi01IDQtMSAzIDAgNSAyIDYgMjkgMTcgNjEgMjUgOTQgMjVhMTc2IDE3NiAwIDAwMTM4LTYxIiBmaWxsPSIjNzFjYWQxIi8+CiAgPHBhdGggZD0iTTE5NiA0MDFjLTM2IDAtNzAtMTAtMTAxLTI4LTctNC0xMS0xMy05LTIxIDItOSAxMC0xNSAxOS0xNWg4YzEyIDAgMjQtMiAzNS01YTgyIDgyIDAgMDEtMzMtNDRjLTEtMy0xLTggMS0xMWE4MiA4MiAwIDAxLTI0LTU5YzAtNSAzLTEwIDctMTRhODIgODIgMCAwMTUtNzIgMTggMTggMCAwMTI5LTIgMTY0IDE2NCAwIDAwOTkgNThsMi0xNWE4MCA4MCAwIDAxNzktNjIgODIgODIgMCAwMTU3IDIzbDcgNyAzOCA2YTE0IDE0IDAgMDE5IDIzYy0yIDItMTcgMjEtMjkgMzEgMCAyMy00IDQ3LTEzIDcwYTE0IDE0IDAgMTEtMjYtMTBjNy0yMCAxMS00MCAxMS02MHYtMWMwLTggNC0xNSAxMC0yMGw5LTktMTUtMmMtNi0xLTExLTUtMjEtMTRsLTEtMmE1MyA1MyAwIDAwLTUzLTExYy0xNyA2LTMwIDIwLTM0IDM3LTIgNy0yIDE0LTIgMjBhMTcgMTcgMCAwMS0xOCAxOSAxOTEgMTkxIDAgMDEtMTIwLTU3IDU0IDU0IDAgMDAxNSA1MCAxNCAxNCAwIDAxLTE0IDI0YzQgMTQgMTUgMjYgMjkgMzNhMTQgMTQgMCAwMS0yIDI2YzggMTIgMjEgMjAgMzUgMjJhMTQgMTQgMCAwMTUgMjZjLTE1IDEwLTMyIDE3LTUwIDIxYTE3NCAxNzQgMCAwMDEyOS02YzIxLTEwIDM5LTIzIDU0LTQxYTE0IDE0IDAgMTEyMSAxOSAxOTAgMTkwIDAgMDEtMTQ4IDY2em00OS0yMTF6bTEyNy0yMXptLTI2MS0yMXptMjYyLTh6IiBmaWxsPSIjZWY3MWE4Ii8+Cjwvc3ZnPgo=">
-  <meta name="twitter:card" content="summary" />
+  <meta property="og:image" content="https://opengraph.cluster.fun/opengraph/?siteTitle=&title=&tags=&image=https%3A%2F%2Fcdn.githubraw.com%2FAverageMarcus%2Ftweetsvg%2Fmaster%2Flogo.png&twitter=Marcus_Noble_&github=AverageMarcus%2Ftweetsvg&website=https%3A%2F%2Ftweet.cluster.fun&bgColor=%23ffffff&fgColor=%23263943">
+  <meta name="twitter:card" content="summary_large_image" />
  <meta name="twitter:creator" content="@Marcus_Noble_" />
+  <meta name="twitter:image" content="https://opengraph.cluster.fun/opengraph/?siteTitle=&title=&tags=&image=https%3A%2F%2Fcdn.githubraw.com%2FAverageMarcus%2Ftweetsvg%2Fmaster%2Flogo.png&twitter=Marcus_Noble_&github=AverageMarcus%2Ftweetsvg&website=https%3A%2F%2Ftweet.cluster.fun&bgColor=%23ffffff&fgColor=%23263943">


  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,300italic,700,700italic">
@@ -47,6 +48,11 @@
    figcaption {
      text-align: center;
    }
+
+    .announcement {
+      font-size: 3em;
+      font-weight: bold;
+    }
  </style>
 </head>
 <body>
@@ -60,6 +66,10 @@
      Generate an SVG for a given Tweet ID
    </blockquote>

+    <p class="announcement">
+      ⚠️ DEPRECATED - Twitter has killed off its free API so this no longer works
+    </p>
+
    <p>
      Enter the URL or ID of a tweet to have an SVG generated for it, no JavaScript required!
    </p>
--- a/main.go
+++ b/main.go
@@ -18,6 +18,7 @@ import (
 	"github.com/ChimeraCoder/anaconda"
 	strip "github.com/grokify/html-strip-tags-go"
 	"github.com/joho/godotenv"
+	"github.com/patrickmn/go-cache"
 	"github.com/rivo/uniseg"
 	emoji "github.com/tmdvs/Go-Emoji-Utils"
 )
@@ -36,6 +37,8 @@ var (
 	accessTokenSecret string
 	consumerKey       string
 	consumerSecret    string
+
+	ch *cache.Cache
 )

 func init() {
@@ -46,6 +49,8 @@ func init() {
 	accessTokenSecret = os.Getenv("ACCESS_TOKEN_SECRET")
 	consumerKey = os.Getenv("CONSUMER_KEY")
 	consumerSecret = os.Getenv("CONSUMER_SECRET")
+
+	ch = cache.New(24*time.Hour, 48*time.Hour)
 }

 func main() {
@@ -78,26 +83,34 @@ func getTweet(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(400)
 		return
 	}
-	tweet, err := api.GetTweet(i, nil)
-	if err != nil {
-		switch err := err.(type) {
-		case *anaconda.ApiError:
-			switch err.Decoded.Errors[0].Code {
-			case 63:
-				fmt.Printf("Generating suspended tweet image for %s\n", id)
-				suspendedTweet(w)
-				return
+
+	result, found := ch.Get(id)
+	if !found {
+		fmt.Println("No cached tweet found, generating new...")
+		tweet, err := api.GetTweet(i, nil)
+		if err != nil {
+			switch err := err.(type) {
+			case *anaconda.ApiError:
+				switch err.Decoded.Errors[0].Code {
+				case 63:
+					fmt.Printf("Generating suspended tweet image for %s\n", id)
+					suspendedTweet(w)
+					return
+				}
 			}
+			fmt.Println(err)
+			w.WriteHeader(404)
+			return
 		}
-		fmt.Println(err)
-		w.WriteHeader(404)
-		return
+
+		processTweet(&tweet)
+
+		result = renderTemplate(tweet, false)
+		ch.Set(id, result, cache.DefaultExpiration)
 	}

-	processTweet(&tweet)
-
 	w.Header().Set("Content-type", "image/svg+xml")
-	_, err = w.Write(renderTemplate(tweet, false))
+	_, err = w.Write(result.([]byte))
 	if err != nil {
 		fmt.Println(err)
 		w.WriteHeader(500)
@@ -195,12 +208,20 @@ func calculateHeight(tweet anaconda.Tweet) int64 {
 	lineHeight := 28.0
 	tweetText := strings.ReplaceAll(tweet.FullText, "<br />", " \n")
 	tweetText = strip.StripTags(tweetText)
+	tweetText = strings.ReplaceAll(tweetText, "--", "——")
 	words := regexp.MustCompile(`[ |-]`).Split(tweetText, -1)
 	for _, word := range words {
+		word = strings.ReplaceAll(word, "——", "--")
 		if len(emoji.FindAll(word)) > 0 {
 			lineHeight = 32.0
 		}

+		if strings.HasPrefix(word, "\n") {
+			height += lineHeight
+			lineWidth = 0
+			word = strings.TrimPrefix(word, "\n")
+		}
+
 		if strings.Contains(word, "\n") {
 			height += lineHeight
 			lineHeight = 28.0
Author	SHA1	Message	Date
Marcus Noble	956a979204	Added deprecated notices Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>	2023-06-02 14:58:26 +01:00
Marcus Noble	cfd9c7292c	Fixed double dash in tweets Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>	2022-11-05 09:10:37 +00:00
Marcus Noble	7f14289760	Tweak text sizing slightly Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>	2022-02-21 16:57:27 +00:00
Marcus Noble	091f6a455e	Added caching	2021-09-04 16:41:15 +01:00
Marcus Noble	d061860fa2	fix: update release task to restart deployment	2021-07-24 11:20:38 +01:00
Marcus Noble	afc1cee5d7	feat: added opengraph image	2021-07-24 11:19:44 +01:00