add localizations

Author: ccbrown

server/activity.go

@@ -1,52 +1,10 @@
 package server
 
 import (
-	"net/http"
-	"strings"
 	"time"
 )
 
 type Activity interface {
 	ActivityTime() time.Time
 	ActivityKey() uint32
 }
-
-func ActivityFilterForRequest(r *http.Request) func(Activity) bool {
-	subdomain := ""
-	if r.Host != "" {
-		subdomain = strings.Split(r.Host, ".")[0]
-	}
-
-	includeReddit := false
-	includeForumHost := map[string]bool{}
-
-	switch subdomain {
-	case "br":
-		includeForumHost["br.pathofexile.com"] = true
-	case "ru":
-		includeForumHost["ru.pathofexile.com"] = true
-	case "th":
-		includeForumHost["th.pathofexile.com"] = true
-	case "de":
-		includeForumHost["de.pathofexile.com"] = true
-	case "fr":
-		includeForumHost["fr.pathofexile.com"] = true
-	case "es":
-		includeForumHost["es.pathofexile.com"] = true
-	default:
-		includeReddit = true
-		includeForumHost["www.pathofexile.com"] = true
-	}
-
-	return func(a Activity) bool {
-		switch a := a.(type) {
-		case *ForumPost:
-			return includeForumHost[a.Host]
-		case *RedditComment:
-			return includeReddit
-		case *RedditPost:
-			return includeReddit
-		}
-		return false
-	}
-}

server/activity_handler.go

@@ -16,7 +16,7 @@ type jsonResponse struct {
 
 func ActivityHandler(db *Database) echo.HandlerFunc {
 	return func(c echo.Context) error {
-		activity, next := db.Activity(c.QueryParam("next"), 50, ActivityFilterForRequest(c.Request()))
+		activity, next := db.Activity(c.QueryParam("next"), 50, LocaleForRequest(c.Request()).ActivityFilter)
 		response := jsonResponse{
 			Next: next,
 		}

server/common.go

@@ -1,6 +1,8 @@
 package server
 
 import (
+	"strings"
+
 	"github.com/labstack/echo"
 )
 
@@ -14,3 +16,16 @@ func AbsoluteURL(c echo.Context, resource string) string {
 	}
 	return scheme + "://" + c.Request().Host + resource
 }
+
+func SubdomainURL(c echo.Context, subdomain string) string {
+	scheme := c.Scheme()
+	if c.Request().Header.Get(echo.HeaderXForwardedProto) == "https" {
+		scheme = "https"
+	}
+	locale := LocaleForRequest(c.Request())
+	host := strings.TrimPrefix(c.Request().Host, locale.Subdomain+".")
+	if subdomain != "" {
+		host = subdomain + "." + host
+	}
+	return scheme + "://" + host
+}

server/forum_indexer.go

@@ -43,16 +43,6 @@ func (indexer *ForumIndexer) Close() {
 func (indexer *ForumIndexer) run() {
 	log.Info("starting forum indexer")
 
-	hosts := []string{
-		"www.pathofexile.com",
-		"br.pathofexile.com",
-		"ru.pathofexile.com",
-		"th.pathofexile.com",
-		"de.pathofexile.com",
-		"fr.pathofexile.com",
-		"es.pathofexile.com",
-	}
-
 	accounts := []string{
 		"Chris", "Jonathan", "Erik", "Mark_GGG", "Samantha", "Rory", "Rhys", "Qarl", "Andrew_GGG",
 		"Damien_GGG", "Joel_GGG", "Ari", "Thomas", "BrianWeissman", "Edwin_GGG", "Support", "Dylan",
@@ -84,18 +74,18 @@ func (indexer *ForumIndexer) run() {
 	}
 
 	var wg sync.WaitGroup
-	wg.Add(len(hosts))
+	wg.Add(len(Locales))
 
-	for _, host := range hosts {
-		host := host
+	for _, l := range Locales {
+		l := l
 		go func() {
 			for {
 				for _, account := range accounts {
 					select {
 					case <-indexer.closeSignal:
 						return
 					default:
-						indexer.index(host, account, timezone)
+						indexer.index(l, account, timezone)
 						time.Sleep(time.Second)
 					}
 				}
@@ -135,34 +125,7 @@ var postURLExpression = regexp.MustCompile("^/forum/view-thread/([0-9]+)/page/([
 var threadURLExpression = regexp.MustCompile("^/forum/view-thread/([0-9]+)")
 var forumURLExpression = regexp.MustCompile("^/forum/view-forum/([0-9]+)")
 
-var monthReplacer = strings.NewReplacer(
-	"ม.ค.", "Jan",
-	"ก.พ.", "Feb",
-	"มี.ค.", "Mar",
-	"เม.ย.", "Apr",
-	"พ.ค.", "May",
-	"มิ.ย.", "Jun",
-	"ก.ค.", "Jul",
-	"ส.ค.", "Aug",
-	"ก.ย.", "Sep",
-	"ต.ค.", "Oct",
-	"พ.ย.", "Nov",
-	"ธ.ค.", "Dec",
-	"janv.", "Jan",
-	"févr.", "Feb",
-	"mars", "Mar",
-	"avril", "Apr",
-	"mai", "May",
-	"juin", "Jun",
-	"juil.", "Jul",
-	"août", "Aug",
-	"sept.", "Sep",
-	"oct.", "Oct",
-	"nov.", "Nov",
-	"déc.", "Dec",
-)
-
-func ScrapeForumPosts(doc *goquery.Document, timezone *time.Location) ([]*ForumPost, error) {
+func ScrapeForumPosts(doc *goquery.Document, locale *Locale, timezone *time.Location) ([]*ForumPost, error) {
 	posts := []*ForumPost(nil)
 
 	err := error(nil)
@@ -178,21 +141,9 @@ func ScrapeForumPosts(doc *goquery.Document, timezone *time.Location) ([]*ForumP
 		}
 		post.BodyHTML = body
 
-		timeText := monthReplacer.Replace(sel.Find(".post_date").Text())
-
-		for _, format := range []string{
-			"Jan _2, 2006 3:04:05 PM",
-			"2/1/2006 15:04:05",
-			"2.1.2006 15:04:05",
-			"_2 Jan 2006, 15:04:05",
-			"_2 Jan 2006 15:04:05",
-		} {
-			if t, err := time.ParseInLocation(format, timeText, timezone); err == nil {
-				post.Time = t
-				break
-			}
-		}
-		if post.Time.IsZero() {
+		timeText := sel.Find(".post_date").Text()
+
+		if post.Time, err = locale.ParseTime(timeText, timezone); err != nil {
 			log.WithField("text", timeText).Error("unable to parse time")
 			return false
 		}
@@ -226,32 +177,32 @@ func ScrapeForumPosts(doc *goquery.Document, timezone *time.Location) ([]*ForumP
 	return posts, nil
 }
 
-func (indexer *ForumIndexer) forumPosts(host, poster string, page int, timezone *time.Location) ([]*ForumPost, error) {
-	doc, err := indexer.requestDocument(host, fmt.Sprintf("/account/view-posts/%v/page/%v", poster, page))
+func (indexer *ForumIndexer) forumPosts(locale *Locale, poster string, page int, timezone *time.Location) ([]*ForumPost, error) {
+	doc, err := indexer.requestDocument(locale.ForumHost(), fmt.Sprintf("/account/view-posts/%v/page/%v", poster, page))
 	if err != nil {
 		return nil, err
 	}
-	posts, err := ScrapeForumPosts(doc, timezone)
+	posts, err := ScrapeForumPosts(doc, locale, timezone)
 	if err != nil {
 		return nil, err
 	}
 	for _, post := range posts {
-		post.Host = host
+		post.Host = locale.ForumHost()
 	}
 	return posts, nil
 }
 
-func (indexer *ForumIndexer) index(host, poster string, timezone *time.Location) {
+func (indexer *ForumIndexer) index(locale *Locale, poster string, timezone *time.Location) {
 	logger := log.WithFields(log.Fields{
-		"host":   host,
+		"host":   locale.ForumHost(),
 		"poster": poster,
 	})
 
 	cutoff := time.Now().Add(time.Hour * -12)
 	activity := []Activity(nil)
 
 	for page := 1; ; page++ {
-		posts, err := indexer.forumPosts(host, poster, page, timezone)
+		posts, err := indexer.forumPosts(locale, poster, page, timezone)
 		if err != nil {
 			logger.WithError(err).Error("error requesting forum posts")
 		}

server/forum_indexer_test.go

@@ -21,7 +21,7 @@ func TestScrapeForumPosts(t *testing.T) {
 	tz, err := time.LoadLocation("America/Los_Angeles")
 	require.NoError(t, err)
 
-	posts, err := ScrapeForumPosts(doc, tz)
+	posts, err := ScrapeForumPosts(doc, Locales[0], tz)
 	require.NoError(t, err)
 	assert.Equal(t, 10, len(posts))
 

server/index_handler.go

@@ -11,7 +11,7 @@ var index = `<!DOCTYPE html><html>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <title>GGG Tracker</title>
     <link rel="shortcut icon" href="static/favicon.ico" />
-    <link rel="stylesheet" type="text/css" href="static/style.css?v4" />
+    <link rel="stylesheet" type="text/css" href="static/style.css?v5" />
     <link rel="alternate" type="application/rss+xml" title="GGG Tracker Forum Feed" href="rss" />
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
@@ -34,19 +34,24 @@ var index = `<!DOCTYPE html><html>
     <div class="container">
 		<header>
 			<a href="/"><img src="static/images/ggg-dark.png" /></a>
+			<ul id="locale-selection">
+				{{range .Locales}}
+				<li{{if eq .Subdomain $.Locale.Subdomain}} class="selected-locale"{{end}}><a href="{{call $.SubdomainURL .Subdomain}}"><img src="{{.Image}}" /></a></li>
+				{{end}}
+			</ul>
 		</header>
         <div class="content-box">
-            <h1>Activity</h1>
+            <h1>{{call $.Translate "Activity"}}</h1>
             <a href="rss"><img src="static/images/rss-icon-28.png" class="rss-icon" /></a>
             <table id="activity-table" class="list">
                 <thead>
                     <tr>
                         <th></th>
                         <th></th>
-                        <th>Thread</th>
-                        <th>Poster</th>
-                        <th>Time</th>
-                        <th>Forum</th>
+                        <th>{{call $.Translate "Thread"}}</th>
+                        <th>{{call $.Translate "Poster"}}</th>
+                        <th>{{call $.Translate "Time"}}</th>
+                        <th>{{call $.Translate "Forum"}}</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -71,16 +76,33 @@ type IndexConfiguration struct {
 	GoogleAnalytics string
 }
 
-func IndexHandler(configuration IndexConfiguration) echo.HandlerFunc {
+var indexTemplate *template.Template
+
+func init() {
 	t, err := template.New("index").Parse(index)
 	if err != nil {
 		panic(err)
 	}
+	indexTemplate = t
+}
+
+func IndexHandler(configuration IndexConfiguration) echo.HandlerFunc {
 	return func(c echo.Context) error {
-		return t.Execute(c.Response(), struct {
+		locale := LocaleForRequest(c.Request())
+		return indexTemplate.Execute(c.Response(), struct {
 			Configuration IndexConfiguration
+			Locales       []*Locale
+			Locale        *Locale
+			Translate     func(string) string
+			SubdomainURL  func(string) string
 		}{
 			Configuration: configuration,
+			Locales:       Locales,
+			Locale:        locale,
+			Translate:     locale.Translate,
+			SubdomainURL: func(subdomain string) string {
+				return SubdomainURL(c, subdomain)
+			},
 		})
 	}
 }