respect X-Forwarded-Proto when generated urls, improve reddit post links

ccbrown · ccbrown · commit 7bf0eae5db77 · 2017-02-10T01:59:52.000-08:00
diff --git a/main.go b/main.go
@@ -61,10 +61,10 @@ func main() {
 	e.GET("/activity.json", server.ActivityHandler(db))
 	e.GET("/rss", server.RSSHandler(db))
 	e.GET("/rss.php", func(c echo.Context) error {
-		return c.Redirect(http.StatusMovedPermanently, fmt.Sprintf("%v://%v/rss", c.Scheme(), c.Request().Host))
+		return c.Redirect(http.StatusMovedPermanently, server.AbsoluteURL(c, "/rss"))
 	})
 	e.File("/favicon.ico", path.Join(viper.GetString("staticdir"), "favicon.ico"))
 	e.Static("/static", viper.GetString("staticdir"))
 
-	log.Fatal(e.Start(fmt.Sprintf(":%v", viper.GetString("port"))))
+	log.Fatal(e.Start(fmt.Sprintf(":%v", viper.GetInt("port"))))
 }
diff --git a/server/common.go b/server/common.go
@@ -0,0 +1,16 @@
+package server
+
+import (
+	"github.com/labstack/echo"
+)
+
+func AbsoluteURL(c echo.Context, resource string) string {
+	if len(resource) > 0 && resource[0] != '/' {
+		resource = "/" + resource
+	}
+	scheme := c.Scheme()
+	if c.Request().Header.Get(echo.HeaderXForwardedProto) == "https" {
+		scheme = "https"
+	}
+	return scheme + "://" + c.Request().Host + resource
+}
diff --git a/server/index_handler.go b/server/index_handler.go
@@ -63,7 +63,7 @@ var index = `<!DOCTYPE html><html>
         </footer>
     </div>
 
-    <script src="static/index.js"></script>
+    <script src="static/index.js?v1"></script>
 </body>
 </html>`
 
diff --git a/server/reddit_indexer.go b/server/reddit_indexer.go
@@ -126,7 +126,7 @@ func (indexer *RedditIndexer) redditActivity(user string, page string) ([]Activi
 	if err != nil {
 		return nil, "", err
 	}
-	req.Header.Add("User-Agent", "GGGTracker (gggtracker.com) by /u/rz2yoj")
+	req.Header.Add("User-Agent", "GGG Tracker (https://github.com/ccbrown/gggtracker) by /u/rz2yoj")
 
 	resp, err := client.Do(req)
 	if err != nil {
diff --git a/server/rss_handler.go b/server/rss_handler.go
@@ -36,7 +36,7 @@ func RSSHandler(db *Database) echo.HandlerFunc {
 			Channel: rssChannel{
 				Title:       "GGG Tracker",
 				Description: "Latest activity from Grinding Gear Games",
-				Link:        fmt.Sprintf("%v://%v", c.Scheme(), c.Request().Host),
+				Link:        AbsoluteURL(c, ""),
 			},
 		}
 		for _, a := range activity {
diff --git a/server/static/index.js b/server/static/index.js
@@ -31,7 +31,10 @@ function loadActivity() {
                     .append($('<img src="static/images/snoo.png" />'))
                 ));
             } else {
-                $tr.append($('<td class="icon">').append($('<img src="static/images/snoo.png" />')));
+                $tr.append($('<td class="icon">').append($('<a>')
+                    .attr('href', 'https://www.reddit.com' + activity.permalink)
+                    .append($('<img src="static/images/snoo.png" />'))
+                ));
             }
 
             if (type == 'forum_post') {
@@ -41,7 +44,7 @@ function loadActivity() {
                 ));
             } else if (type == "reddit_post") {
                 $tr.append($('<td class="title">').append($('<a>')
-                    .attr('href', 'https://www.reddit.com' + activity.permalink)
+                    .attr('href', activity.url ? activity.url : ('https://www.reddit.com/r/pathofexile/comments/' + activity.post_id))
                     .text(activity.title)
                 ));
             } else if (type == "reddit_comment") {

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func (indexer *RedditIndexer) redditActivity(user string, page string) ([]Activi`
`126`	`126`	`if err != nil {`
`127`	`127`	`return nil, "", err`
`128`	`128`	`}`
`129`		`- req.Header.Add("User-Agent", "GGGTracker (gggtracker.com) by /u/rz2yoj")`
	`129`	`+ req.Header.Add("User-Agent", "GGG Tracker (https://github.com/ccbrown/gggtracker) by /u/rz2yoj")`
`130`	`130`
`131`	`131`	`resp, err := client.Do(req)`
`132`	`132`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func RSSHandler(db *Database) echo.HandlerFunc {`
`36`	`36`	`Channel: rssChannel{`
`37`	`37`	`Title: "GGG Tracker",`
`38`	`38`	`Description: "Latest activity from Grinding Gear Games",`
`39`		`- Link: fmt.Sprintf("%v://%v", c.Scheme(), c.Request().Host),`
	`39`	`+ Link: AbsoluteURL(c, ""),`
`40`	`40`	`},`
`41`	`41`	`}`
`42`	`42`	`for _, a := range activity {`