Push to repo first, don't upload in build step

.drone.yml

@@ -24,7 +24,6 @@ steps:
      - ARCH=amd64 packaging/build-package.sh
      - ARCH=armv7 packaging/build-package.sh
      - ARCH=arm64 packaging/build-package.sh
-     - packaging/package-upload.sh
     volumes:
       - name: build
         path: /build
@@ -44,6 +43,17 @@ steps:
     environment:
       PLUGIN_API_KEY:
         from_secret: gitea_token
+  - name: repo
+    image: tystuyfzand/drone-deb-simple
+    volumes:
+      - name: build
+        path: /build
+    settings:
+      url:
+        from_secret: upload_url
+      key:
+        from_secret: upload_key
+      files: [ '/build/*/owapi_*.deb' ]
 
 volumes:
   - name: build

endpoints.go

@@ -12,7 +12,7 @@ import (
 )
 
 func stats(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	data, err := statsResponse(w, ps, nil)
+	data, err := statsResponse(w, r, ps, nil)
 
 	if err != nil {
 		writeError(w, err)
@@ -25,7 +25,7 @@ func stats(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 }
 
 func profile(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	cacheKey := generateCacheKey(ps) + "-profile"
+	cacheKey := generateCacheKey(r, ps) + "-profile"
 
 	res, err := cacheProvider.Get(cacheKey)
 
@@ -36,7 +36,7 @@ func profile(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	}
 
 	// Cache result for profile specifically
-	data, err := statsResponse(w, ps, profilePatch)
+	data, err := statsResponse(w, r, ps, profilePatch)
 
 	if err != nil {
 		writeError(w, err)
@@ -63,7 +63,7 @@ func heroes(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 
 	sort.Strings(names)
 
-	cacheKey := generateCacheKey(ps) + "-heroes-" + hex.EncodeToString(md5.New().Sum([]byte(strings.Join(names, ","))))
+	cacheKey := generateCacheKey(r, ps) + "-heroes-" + hex.EncodeToString(md5.New().Sum([]byte(strings.Join(names, ","))))
 
 	res, err := cacheProvider.Get(cacheKey)
 
@@ -108,7 +108,7 @@ func heroes(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	}
 
 	// Create a patch to remove all but specified heroes
-	data, err := statsResponse(w, ps, patch)
+	data, err := statsResponse(w, r, ps, patch)
 
 	if err != nil {
 		writeError(w, err)

go.mod

@@ -4,19 +4,12 @@ go 1.12
 
 require (
 	github.com/PuerkitoBio/goquery v1.5.1-0.20190109230704-3dcf72e6c17f
-	github.com/andybalholm/cascadia v1.1.0 // indirect
 	github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/go-redis/redis v6.15.6+incompatible
 	github.com/julienschmidt/httprouter v1.3.0
-	github.com/kr/pretty v0.1.0 // indirect
 	github.com/miekg/dns v1.1.26
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/onsi/gomega v1.5.0 // indirect
 	github.com/rs/cors v1.7.0
-	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
-	gopkg.in/yaml.v2 v2.2.2 // indirect
+	golang.org/x/net v0.0.0-20190923162816-aa69164e4478
 	s32x.com/ovrstat v0.0.0-20200131231416-4cb42edd331d
 )

main.go

@@ -4,10 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"flag"
+	"fmt"
 	"git.meow.tf/ow-api/ow-api/cache"
 	"git.meow.tf/ow-api/ow-api/json-patch"
 	"github.com/julienschmidt/httprouter"
 	"github.com/rs/cors"
+	"golang.org/x/net/context"
 	"log"
 	"net/http"
 	"regexp"
@@ -17,12 +19,19 @@ import (
 )
 
 const (
-	Version = "2.3.3"
+	Version = "2.3.7"
 
 	OpAdd    = "add"
 	OpRemove = "remove"
 )
 
+type ApiVersion int
+
+const (
+	VersionOne ApiVersion = iota
+	VersionTwo
+)
+
 type gamesStats struct {
 	Played int64 `json:"played"`
 	Won    int64 `json:"won"`
@@ -145,11 +154,30 @@ func loadHeroNames() {
 	}
 }
 
+var (
+	versionRegexp = regexp.MustCompile("^/(v\\d+)/")
+)
+
 func injectPlatform(platform string, handler httprouter.Handle) httprouter.Handle {
 	return func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 		ps = append(ps, httprouter.Param{Key: "platform", Value: platform})
 
-		handler(w, r, ps)
+		ctx := context.Background()
+
+		m := versionRegexp.FindStringSubmatch(r.RequestURI)
+
+		if m != nil {
+			version := VersionOne
+
+			switch m[1] {
+			case "v2":
+				version = VersionTwo
+			}
+
+			ctx = context.WithValue(ctx, "version", version)
+		}
+
+		handler(w, r.WithContext(ctx), ps)
 	}
 }
 
@@ -157,15 +185,21 @@ var (
 	tagRegexp = regexp.MustCompile("-(\\d+)$")
 )
 
-func statsResponse(w http.ResponseWriter, ps httprouter.Params, patch *jsonpatch.Patch) ([]byte, error) {
+func statsResponse(w http.ResponseWriter, r *http.Request, ps httprouter.Params, patch *jsonpatch.Patch) ([]byte, error) {
 	var stats *ovrstat.PlayerStats
 	var err error
 
+	version := VersionOne
+
+	if v := r.Context().Value("version"); v != nil {
+		version = v.(ApiVersion)
+	}
+
 	tag := ps.ByName("tag")
 
 	tag = strings.Replace(tag, "#", "-", -1)
 
-	cacheKey := generateCacheKey(ps)
+	cacheKey := generateCacheKey(r, ps)
 
 	platform := ps.ByName("platform")
 
@@ -267,6 +301,31 @@ func statsResponse(w http.ResponseWriter, ps httprouter.Params, patch *jsonpatch
 		urlBase := iconUrl[0 : strings.Index(iconUrl, "rank-icons/")+11]
 
 		ratingIcon = urlBase + iconFor(rating)
+
+		if version == VersionTwo {
+			m := make(map[string]ovrstat.Rating)
+
+			ratingsPatches := make([]patchOperation, len(stats.Ratings))
+
+			for i, rating := range stats.Ratings {
+				m[rating.Role] = rating
+				ratingsPatches[i] = patchOperation{
+					Op:   OpRemove,
+					Path: "/ratings/" + rating.Role + "/role",
+				}
+			}
+
+			extra = append(extra, patchOperation{
+				Op:   OpRemove,
+				Path: "/ratings",
+			}, patchOperation{
+				Op:    OpAdd,
+				Path:  "/ratings",
+				Value: m,
+			})
+
+			extra = append(extra, ratingsPatches...)
+		}
 	}
 
 	extra = append(extra, patchOperation{
@@ -330,6 +389,16 @@ func iconFor(rating int) string {
 	return "rank-BronzeTier.png"
 }
 
-func generateCacheKey(ps httprouter.Params) string {
-	return ps.ByName("platform") + "-" + ps.ByName("tag")
+func generateCacheKey(r *http.Request, ps httprouter.Params) string {
+	version := VersionOne
+
+	if v := r.Context().Value("version"); v != nil {
+		version = v.(ApiVersion)
+	}
+
+	return versionToString(version) + "-" + ps.ByName("platform") + "-" + ps.ByName("tag")
+}
+
+func versionToString(version ApiVersion) string {
+	return fmt.Sprintf("v%d", version)
 }

packaging/build-package.sh

@@ -1,5 +1,5 @@
 fpm -s dir -t deb -p /build/$ARCH/owapi_${VERSION}_${ARCH}.deb \
-    -n ow-api -v $VERSION \
+    -n ow-api -v $VERSION -a $ARCH \
     --deb-priority optional --force \
     --deb-compression bzip2 \
     --description "Overwatch API Server" \

packaging/package-upload.sh

@@ -1 +1,3 @@
-curl -X POST "$UPLOAD_URL" -F "file_i386=@/build/i386/owapi_${VERSION}_i386.deb" -F "file_amd64=@/build/amd64/owapi_${VERSION}_amd64.deb" -F "file_armv7=@/build/armv7/owapi_${VERSION}_armv7.deb"
+curl -X POST "$UPLOAD_URL" -F "file_i386=@/build/i386/owapi_${VERSION}_i386.deb" \
+  -F "file_amd64=@/build/amd64/owapi_${VERSION}_amd64.deb" \
+  -F "file_armv7=@/build/armv7/owapi_${VERSION}_armv7.deb"

validator/validator.go

@@ -7,12 +7,13 @@ import (
 	"log"
 	"net/http"
 	"regexp"
+	"strings"
 )
 
 const (
 	baseURL = "https://playoverwatch.com/en-us/career"
 
-	apiURL = "https://playoverwatch.com/en-us/career/platforms/"
+	apiURL = "https://playoverwatch.com/en-us/search/account-by-name/"
 )
 
 type Platform struct {
@@ -86,20 +87,12 @@ func ValidateEndpoint() error {
 		return err
 	}
 
-	code, err := pd.Html()
-
 	if err != nil {
 		return err
 	}
 
-	split := careerInitRegexp.FindStringSubmatch(code)
-
-	if split == nil || len(split) < 2 {
-		return errNoCareerInit
-	}
-
 	// Validate API response
-	if err := validateApi(split[1]); err != nil {
+	if err := validateApi(strings.Replace(url[strings.LastIndex(url, "/")+1:], "-", "%23", -1)); err != nil {
 		return err
 	}
 
@@ -154,13 +147,13 @@ func validateCareerStats(careerStatsSelector *goquery.Selection, parent string)
 	}
 
 	selectors := []string{
-		"div.row div.js-stats",                                              // Top level
-		"div.row div.js-stats div.column.xs-12",                             // stat boxes
-		"div.row div.js-stats div.column.xs-12 .stat-title",                 // stat boxes
-		"div.row div.js-stats div.column.xs-12 table.DataTable",             // data table
-		"div.row div.js-stats div.column.xs-12 table.DataTable tbody",       // data table tbody
-		"div.row div.js-stats div.column.xs-12 table.DataTable tbody tr",    // data table tbody tr
-		"div.row div.js-stats div.column.xs-12 table.DataTable tbody tr td", // data table tbody tr td
+		"div.row div.js-stats",                                        // Top level
+		"div.row div.js-stats div.column",                             // stat boxes
+		"div.row div.js-stats div.column .stat-title",                 // stat boxes
+		"div.row div.js-stats div.column table.DataTable",             // data table
+		"div.row div.js-stats div.column table.DataTable tbody",       // data table tbody
+		"div.row div.js-stats div.column table.DataTable tbody tr",    // data table tbody tr
+		"div.row div.js-stats div.column table.DataTable tbody tr td", // data table tbody tr td
 	}
 
 	return validateElementsExist(careerStatsSelector, parent, selectors...)