Update goc output path

Fix binary path
Update build system
2021-04-28 22:37:34 -04:00 · 2021-04-28 22:36:35 -04:00 · 2021-04-28 22:35:10 -04:00 · 2021-04-20 22:54:22 -04:00 · 2021-04-20 22:37:38 -04:00 · 2021-04-20 22:35:14 -04:00
12 changed files with 666 additions and 130 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -3,28 +3,20 @@ name: default

 steps:
  - name: build
-    image: golang:latest
+    image: tystuyfzand/goc
    group: build
    volumes:
      - name: build
        path: /build
    commands:
-     - mkdir -p /build/i386 /build/amd64 /build/armv7 /build/arm64
-     - GOOS=linux GOARCH=386 go build -o /build/i386/owapi_i386
-     - go build -o /build/amd64/owapi_amd64
-     - GOOS=linux GOARCH=arm GOARM=7 go build -o /build/armv7/owapi_armv7
-     - GOOS=linux GOARCH=arm64 go build -o /build/arm64/owapi_arm64
+     - GOOS=linux,windows GOARCH=386,arm,arm64,amd64 goc -o /build/owapi
  - name: package
    image: tystuyfzand/fpm
    commands:
     - export VERSION=`grep "Version" main.go | head -n 1 | awk '{print $3}' | sed -e 's/^"//' -e 's/"$//' | tr -d '\n'`
     - echo "v$VERSION" > /build/version.txt
-     - chmod +x packaging/build-package.sh packaging/package-upload.sh
-     - ARCH=i386 packaging/build-package.sh
-     - ARCH=amd64 packaging/build-package.sh
-     - ARCH=armv7 packaging/build-package.sh
-     - ARCH=arm64 packaging/build-package.sh
-     - packaging/package-upload.sh
+     - chmod +x packaging/build-package.sh
+     - ARCH=386,amd64,armv7,arm64 packaging/build-package.sh
    volumes:
      - name: build
        path: /build
@ -40,11 +32,21 @@ steps:
      gitea_server: https://git.meow.tf
      tag_file: /build/version.txt
      title_file: /build/version.txt
-      files: [ '/build/*/owapi_*' ]
+      files: [ '/build/owapi_*' ]
    environment:
      PLUGIN_API_KEY:
        from_secret: gitea_token
-
+  - name: docker
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: registry.meow.tf/ow-api/ow-api
+      registry: registry.meow.tf
+      tags:
+        - latest
 volumes:
  - name: build
    temp: {}
--- a/11
+++ b/11
@ -0,0 +1,11 @@
+FROM golang:alpine AS builder
+
+ADD . /build
+
+RUN cd /build && go build -o ow-api
+
+FROM golang:alpine
+
+COPY --from=builder /build/ow-api /usr/bin/ow-api
+
+CMD [ "/usr/bin/ow-api" ]
--- a/5
+++ b/5
@ -0,0 +1,5 @@
+Copyright 2020 Tyler Stuyfzand <admin@meow.tf>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/endpoints.go
+++ b/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)
--- a/go.mod
+++ b/go.mod
@ -3,15 +3,15 @@ module git.meow.tf/ow-api/ow-api
 go 1.12

 require (
-	github.com/PuerkitoBio/goquery v1.5.1-0.20190109230704-3dcf72e6c17f
+	github.com/PuerkitoBio/goquery v1.6.1
 	github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833
-	github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668
-	github.com/go-redis/redis v6.14.2+incompatible
-	github.com/julienschmidt/httprouter v1.2.0
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/onsi/gomega v1.5.0 // indirect
-	github.com/rs/cors v1.6.0
-	github.com/starboy/httpclient v0.0.0-20180910064439-d6d6e42b6080 // indirect
-	github.com/tystuyfzand/ovrstat v0.0.0-20181127024708-dc4fc9f39eb7
-	s32x.com/ovrstat v0.0.0-20190506040748-69ba35e9ff58
+	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/miekg/dns v1.1.26
+	github.com/rs/cors v1.7.0
+	github.com/stoewer/go-strcase v1.2.0
+	github.com/stretchr/objx v0.2.0 // indirect
+	golang.org/x/net v0.0.0-20200822124328-c89045814202
+	s32x.com/ovrstat v0.0.0-20210411215317-b668284adcc8
 )
--- a/go.sum
+++ b/go.sum
@ -1,65 +1,177 @@
 github.com/PuerkitoBio/goquery v1.5.1-0.20190109230704-3dcf72e6c17f h1:cWOyRTtBcTBjB0c+GyaQaXgP3g1HVM1KbvZL/Q5QNAM=
 github.com/PuerkitoBio/goquery v1.5.1-0.20190109230704-3dcf72e6c17f/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
+github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
+github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/PuerkitoBio/goquery v1.6.1 h1:FgjbQZKl5HTmcn4sKBgvx8vv63nhyhIpv7lJpFGCWpk=
+github.com/PuerkitoBio/goquery v1.6.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
 github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
+github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
+github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833 h1:yCfXxYaelOyqnia8F/Yng47qhmfC9nKTRIbYRrRueq4=
 github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833/go.mod h1:8c4/i2VlovMO2gBnHGQPN5EJw+H0lx1u/5p+cgsXtCk=
-github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668 h1:U/lr3Dgy4WK+hNk4tyD+nuGjpVLPEHuJSFXMw11/HPA=
-github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
+github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
+github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/go-redis/redis v6.14.2+incompatible h1:UE9pLhzmWf+xHNmZsoccjXosPicuiNaInPgym8nzfg0=
-github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-redis/redis v6.15.6+incompatible h1:H9evprGPLI8+ci7fxQx6WNZHJSb7be8FqJQRhdQZ5Sg=
+github.com/go-redis/redis v6.15.6+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a h1:eeaG9XMUvRBYXJi4pg1ZKM7nxc5AfXfojeLLW7O5J3k=
-github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/labstack/echo/v4 v4.0.1-0.20190313005416-e3717be4beda/go.mod h1:tZv7nai5buKSg5h/8E6zz4LsD/Dqh9/91Mvs7Z5Zyno=
-github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/labstack/echo/v4 v4.1.7-0.20190725203903-8cabd1e123d6 h1:ImU76UGnZN9+25dYuM+4uMhP0TFf/nT61rLy1RPPKUM=
+github.com/labstack/echo/v4 v4.1.7-0.20190725203903-8cabd1e123d6/go.mod h1:kU/7PwzgNxZH4das4XNsSpBSOD09XIF5YEPzjpkGnGE=
+github.com/labstack/echo/v4 v4.1.14 h1:h8XP66UfB3tUm+L3QPw7tmwAu3pJaA/nyfHPCcz46ic=
+github.com/labstack/echo/v4 v4.1.14/go.mod h1:Q5KZ1vD3V5FEzjM79hjwVrC3ABr7F5IdM23bXQMRDGg=
+github.com/labstack/echo/v4 v4.1.17 h1:PQIBaRplyRy3OjwILGkPg89JRtH2x5bssi59G2EL3fo=
+github.com/labstack/echo/v4 v4.1.17/go.mod h1:Tn2yRQL/UclUalpb5rPdXDevbkJ+lp/2svdyFBg6CHQ=
+github.com/labstack/echo/v4 v4.2.0 h1:jkCSsjXmBmapVXF6U4BrSz/cgofWM0CU3Q74wQvXkIc=
+github.com/labstack/echo/v4 v4.2.0/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
+github.com/labstack/gommon v0.2.9 h1:heVeuAYtevIQVYkGj6A41dtfT91LrvFG220lavpWhrU=
+github.com/labstack/gommon v0.2.9/go.mod h1:E8ZTmW9vw5az5/ZyHWCp0Lw4OH2ecsaBP1C/NKavGG4=
+github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw=
+github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
+github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
-github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
-github.com/starboy/httpclient v0.0.0-20180910064439-d6d6e42b6080 h1:2MLHNkv6Jl3E58fFOlOeshNo6eqanZV+yGPbJukRQIQ=
-github.com/starboy/httpclient v0.0.0-20180910064439-d6d6e42b6080/go.mod h1:ZaOOtAQcXELCP9jugRrAv1qg3ctLlGnz++lH0KpIZ24=
+github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
+github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
+github.com/seilem/ovrstat v0.0.0-20200123200456-7b7e24d39506 h1:xAdnQYUFimq8Uiz4Io7QlnNGV+4BtagWGC+DDxVG3Fo=
+github.com/seilem/ovrstat v0.0.0-20200123200456-7b7e24d39506/go.mod h1:UzsLSEoY8B4FByz4e+5GGKebJio+H+axo3RxLr7d7Mw=
+github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/tystuyfzand/ovrstat v0.0.0-20181127024708-dc4fc9f39eb7 h1:ZHUhYZJiBOfJ9NPDT/YEKHOCc0tTtQiLGpTcW0M2mBM=
-github.com/tystuyfzand/ovrstat v0.0.0-20181127024708-dc4fc9f39eb7/go.mod h1:GgVOFCqOnwT77FsVfvySTbw6u3rMW9rqUxvY7nGgpjg=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/tystuyfzand/ovrstat v0.0.0-20201003203341-5f1ad8502a8f h1:vjYPeN0jt5TJ1vP4teWyTLGbkufQoPi0bhYE9wzg/4w=
+github.com/tystuyfzand/ovrstat v0.0.0-20201003203341-5f1ad8502a8f/go.mod h1:UzsLSEoY8B4FByz4e+5GGKebJio+H+axo3RxLr7d7Mw=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
-golang.org/x/crypto v0.0.0-20190130090550-b01c7a725664/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
+github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M=
+golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
+golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U=
+golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190607181551-461777fb6f67/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc h1:WiYx1rIFmx8c0mXAFtv5D/mHyKe1+jmuP7PViuwqwuQ=
-golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190609082536-301114b31cce/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 h1:1/DFK4b7JH8DmkqhUk48onnSfrPzImPoVxuomtbT2nk=
+golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 h1:DvY3Zkh7KabQE/kfzMvYvKirSiguP9Q/veMtkYyf0o8=
+golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190608022120-eacb66d2a7c3/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-s32x.com/ovrstat v0.0.0-20190506040748-69ba35e9ff58 h1:1ioAQKrIwwtxMm4uZySpqj9imNuyCDbL7dk9ccxntmQ=
-s32x.com/ovrstat v0.0.0-20190506040748-69ba35e9ff58/go.mod h1:ukrDi0b+Kdtd+dI4M0HILhkMGtMZ4v3l2C82meAMzyw=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+s32x.com/ovrstat v0.0.0-20191125185405-f48c0d280dc1 h1:q5zjrLdxx3oo3i49aBKMMdppFoLCEEq6cSD8lWNCoAY=
+s32x.com/ovrstat v0.0.0-20191125185405-f48c0d280dc1/go.mod h1:UzsLSEoY8B4FByz4e+5GGKebJio+H+axo3RxLr7d7Mw=
+s32x.com/ovrstat v0.0.0-20200131231416-4cb42edd331d h1:G3p3gNYpF4WsklRFb4U2FWgXhicc2RDWgL+zNc//JWc=
+s32x.com/ovrstat v0.0.0-20200131231416-4cb42edd331d/go.mod h1:UzsLSEoY8B4FByz4e+5GGKebJio+H+axo3RxLr7d7Mw=
+s32x.com/ovrstat v0.0.0-20201003203341-5f1ad8502a8f/go.mod h1:UzsLSEoY8B4FByz4e+5GGKebJio+H+axo3RxLr7d7Mw=
+s32x.com/ovrstat v0.0.0-20201019064501-7679355452e1 h1:Ppeg8R00VA9EJ8n3owtEwy21vdGJPq/wJ7wLK0tElQA=
+s32x.com/ovrstat v0.0.0-20201019064501-7679355452e1/go.mod h1:M1e9y2Q2vUOaHRxB4l+vx3Dyje4HbaSls7L+dQ0PsEE=
+s32x.com/ovrstat v0.0.0-20210411215317-b668284adcc8 h1:UwvCWPAjUnC+BE2jlbozuYiiSfrJA5BtlkNdaMWUao0=
+s32x.com/ovrstat v0.0.0-20210411215317-b668284adcc8/go.mod h1:UJrvRJ1Rb0u6Croris6ZQQNQia+Yhu7JIM63uRyLOuc=
--- a/main.go
+++ b/main.go
@ -4,10 +4,14 @@ 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/PuerkitoBio/goquery"
 	"github.com/julienschmidt/httprouter"
 	"github.com/rs/cors"
+	"github.com/stoewer/go-strcase"
+	"golang.org/x/net/context"
 	"log"
 	"net/http"
 	"regexp"
@ -17,12 +21,20 @@ import (
 )

 const (
-	Version = "2.1.2"
+	Version = "2.4.6"

 	OpAdd    = "add"
 	OpRemove = "remove"
 )

+type ApiVersion int
+
+const (
+	VersionOne ApiVersion = iota
+	VersionTwo
+	VersionThree
+)
+
 type gamesStats struct {
 	Played int64 `json:"played"`
 	Won    int64 `json:"won"`
@ -39,7 +51,7 @@ type awardsStats struct {
 var (
 	flagBind      = flag.String("bind-address", ":8080", "Address to bind to for http requests")
 	flagCache     = flag.String("cache", "redis://localhost:6379", "Cache uri or 'none' to disable")
-	flagCacheTime = flag.Int("cacheTime", 600, "Cache time in seconds")
+	flagCacheTime = flag.Int("cacheTime", 300, "Cache time in seconds")

 	cacheProvider cache.Provider

@ -48,6 +60,8 @@ var (
 	profilePatch *jsonpatch.Patch

 	heroNames []string
+
+	platforms = []string{ovrstat.PlatformPC, ovrstat.PlatformXBL, ovrstat.PlatformPSN, ovrstat.PlatformNS}
 )

 func main() {
@ -74,24 +88,12 @@ func main() {

 	router := httprouter.New()

-	// PC
-	router.GET("/v1/stats/pc/:region/:tag/heroes/:heroes", injectPlatform("pc", heroes))
-	router.GET("/v1/stats/pc/:region/:tag/profile", injectPlatform("pc", profile))
-	router.GET("/v1/stats/pc/:region/:tag/complete", injectPlatform("pc", stats))
+	router.HEAD("/status", statusHandler)
+	router.GET("/status", statusHandler)

-	// Console
-	router.GET("/v1/stats/psn/:tag/heroes/:heroes", injectPlatform("psn", heroes))
-	router.GET("/v1/stats/psn/:tag/profile", injectPlatform("psn", profile))
-	router.GET("/v1/stats/psn/:tag/complete", injectPlatform("psn", stats))
-	router.GET("/v1/stats/xbl/:tag/heroes/:heroes", injectPlatform("xbl", heroes))
-	router.GET("/v1/stats/xbl/:tag/profile", injectPlatform("xbl", profile))
-	router.GET("/v1/stats/xbl/:tag/complete", injectPlatform("xbl", stats))
+	registerVersionOne(router)

-	// Version
-	router.GET("/v1/version", versionHandler)
-
-	router.HEAD("/v1/status", statusHandler)
-	router.GET("/v1/status", statusHandler)
+	registerVersionTwo(router)

 	c := cors.New(cors.Options{
 		AllowedOrigins: []string{"*"},
@ -106,35 +108,93 @@ func main() {
 	log.Fatal(http.ListenAndServe(*flagBind, c.Handler(router)))
 }

+func registerVersionOne(router *httprouter.Router) {
+	for _, platform := range platforms {
+		router.GET("/v1/stats/"+platform+"/:region/:tag/heroes/:heroes", injectPlatform(platform, heroes))
+		router.GET("/v1/stats/"+platform+"/:region/:tag/profile", injectPlatform(platform, profile))
+		router.GET("/v1/stats/"+platform+"/:region/:tag/complete", injectPlatform(platform, stats))
+	}
+
+	// Version
+	router.GET("/v1/version", versionHandler)
+
+	router.HEAD("/v1/status", statusHandler)
+	router.GET("/v1/status", statusHandler)
+}
+
+func registerVersionTwo(router *httprouter.Router) {
+	for _, platform := range platforms {
+		router.GET("/v2/stats/"+platform+"/:tag/heroes/:heroes", injectPlatform(platform, heroes))
+		router.GET("/v2/stats/"+platform+"/:tag/profile", injectPlatform(platform, profile))
+		router.GET("/v2/stats/"+platform+"/:tag/complete", injectPlatform(platform, stats))
+		router.GET("/v3/stats/"+platform+"/:tag/heroes/:heroes", injectPlatform(platform, heroes))
+		router.GET("/v3/stats/"+platform+"/:tag/profile", injectPlatform(platform, profile))
+		router.GET("/v3/stats/"+platform+"/:tag/complete", injectPlatform(platform, stats))
+	}
+
+	// Version
+	router.GET("/v2/version", versionHandler)
+	router.GET("/v3/version", versionHandler)
+}
+
 func loadHeroNames() {
-	stats, err := ovrstat.PCStats("cats-11481")
+	res, err := http.Get("https://playoverwatch.com/en-us/heroes/")

 	if err != nil {
 		return
 	}

-	m := make(map[string]bool)
+	defer res.Body.Close()

-	for k := range stats.QuickPlayStats.TopHeroes {
-		m[k] = true
+	doc, err := goquery.NewDocumentFromReader(res.Body)
+
+	if err != nil {
+		return
 	}

-	for k := range stats.QuickPlayStats.CareerStats {
-		m[k] = true
-	}
+	links := doc.Find(".hero-portrait-detailed")

 	heroNames = make([]string, 0)

-	for k := range m {
-		heroNames = append(heroNames, k)
+	links.Each(func(_ int, s *goquery.Selection) {
+		val, exists := s.Attr("data-hero-id")
+
+		if !exists {
+			return
 		}
+
+		heroNames = append(heroNames, strcase.LowerCamelCase(val))
+	})
+
+	log.Println("Loaded heroes", heroNames)
 }

+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
+			case "v3":
+				version = VersionThree
+			}
+
+			ctx = context.WithValue(ctx, "version", version)
+		}
+
+		handler(w, r.WithContext(ctx), ps)
 	}
 }

@ -142,26 +202,35 @@ 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)

-	if region := ps.ByName("region"); region != "" {
+	platform := ps.ByName("platform")
+
+	switch platform {
+	case ovrstat.PlatformPC:
 		if !tagRegexp.MatchString(tag) {
 			w.WriteHeader(http.StatusBadRequest)
 			return nil, errors.New("bad tag")
 		}
 		stats, err = ovrstat.PCStats(tag)
-	} else if platform := ps.ByName("platform"); platform != "" {
+	case ovrstat.PlatformPSN, ovrstat.PlatformXBL, ovrstat.PlatformNS:
 		stats, err = ovrstat.ConsoleStats(platform, tag)
-	} else {
-		return nil, errors.New("unknown region/platform")
+	default:
+		return nil, errors.New("unknown platform")
 	}

 	if err != nil {
@ -232,6 +301,60 @@ func statsResponse(w http.ResponseWriter, ps httprouter.Params, patch *jsonpatch
 		})
 	}

+	rating := 0
+	var ratingIcon string
+
+	if len(stats.Ratings) > 0 {
+		totalRating := 0
+		iconUrl := ""
+
+		for _, rating := range stats.Ratings {
+			totalRating += rating.Level
+			iconUrl = rating.RankIcon
+		}
+
+		rating = totalRating / len(stats.Ratings)
+
+		urlBase := iconUrl[0 : strings.Index(iconUrl, "rank-icons/")+11]
+
+		ratingIcon = urlBase + iconFor(rating)
+
+		if version == VersionThree {
+			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{
+		Op:    OpAdd,
+		Path:  "/rating",
+		Value: rating,
+	}, patchOperation{
+		Op:    OpAdd,
+		Path:  "/ratingIcon",
+		Value: ratingIcon,
+	})
+
 	b, err := json.Marshal(stats)

 	if err != nil {
@ -265,16 +388,34 @@ func statsResponse(w http.ResponseWriter, ps httprouter.Params, patch *jsonpatch
 	return b, err
 }

-func generateCacheKey(ps httprouter.Params) string {
-	var cacheKey string
-
-	tag := ps.ByName("tag")
-
-	if region := ps.ByName("region"); region != "" {
-		cacheKey = "pc-" + tag
-	} else if platform := ps.ByName("platform"); platform != "" {
-		cacheKey = platform + "-" + tag
+func iconFor(rating int) string {
+	if rating >= 4000 {
+		return "rank-GrandmasterTier.png"
+	} else if rating >= 3500 {
+		return "rank-MasterTier.png"
+	} else if rating >= 3000 {
+		return "rank-DiamondTier.png"
+	} else if rating >= 2500 {
+		return "rank-PlatinumTier.png"
+	} else if rating >= 2000 {
+		return "rank-GoldTier.png"
+	} else if rating >= 1500 {
+		return "rank-SilverTier.png"
 	}

-	return cacheKey
+	return "rank-BronzeTier.png"
+}
+
+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)
 }
--- a/ovrstat_test.go
+++ b/ovrstat_test.go
@ -2,12 +2,12 @@ package main

 import (
 	"encoding/json"
-	"github.com/tystuyfzand/ovrstat/ovrstat"
+	"s32x.com/ovrstat/ovrstat"
 	"testing"
 )

 func Test_Stats(t *testing.T) {
-	stats, err := ovrstat.PCStats("us", "cats-11481")
+	stats, err := ovrstat.PCStats("cats-11481")

 	if err != nil {
 		t.Fatal(err)
--- a/packaging/build-package.sh
+++ b/packaging/build-package.sh
@ -1,10 +1,12 @@
-fpm -s dir -t deb -p /build/$ARCH/owapi_${VERSION}_${ARCH}.deb \
-    -n ow-api -v $VERSION \
+for arch in $(echo $ARCH | sed "s/,/ /g"); do
+  fpm -s dir -t deb -p /build/owapi_${VERSION}_${arch}.deb \
+      -n ow-api -v $VERSION -a $arch \
      --deb-priority optional --force \
-    --deb-compression bzip2 \
+      --deb-compression gz \
      --description "Overwatch API Server" \
      -m "Tyler Stuyfzand <admin@meow.tf>" --vendor "Meow.tf" \
      --before-install packaging/scripts/preinst.deb \
      --after-install packaging/scripts/postinst.deb \
-    -a $ARCH /build/$ARCH/owapi_${ARCH}=/usr/bin/owapi \
+      /build/owapi_linux_${arch}=/usr/bin/owapi \
      packaging/owapi.service=/lib/systemd/system/owapi.service
+done
--- a/packaging/package-upload.sh
+++ b/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"
--- a/pro/main.go
+++ b/pro/main.go
@ -0,0 +1,268 @@
+package main
+
+import (
+	"context"
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"github.com/PuerkitoBio/goquery"
+	"github.com/miekg/dns"
+	"log"
+	"math/rand"
+	"net"
+	"net/http"
+	"net/url"
+	"s32x.com/ovrstat/ovrstat"
+	"strings"
+	"time"
+)
+
+func main() {
+	cloudfrontUrl, err := lookupCloudfrontURL()
+
+	if err != nil {
+		log.Fatalln("Unable to find url:", err)
+	}
+
+	log.Println("URL:", cloudfrontUrl)
+
+	ips, err := lookupIpv6Dns(cloudfrontUrl)
+
+	if err != nil {
+		log.Fatalln("Unable to find ips:", err)
+	}
+
+	log.Println("IPs:", ips)
+
+	localIps, err := checkIpv6Local()
+
+	if err != nil {
+		log.Fatalln("Unable to get local ips")
+	}
+
+	log.Println("Local IPs:", localIps)
+
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+
+	localAddr, err := net.ResolveIPAddr("ip", "")
+
+	if err != nil {
+		return
+	}
+
+	// You also need to do this to make it work and not give you a
+	// "mismatched local address type ip"
+	// This will make the ResolveIPAddr a TCPAddr without needing to
+	// say what SRC port number to use.
+	localTCPAddr := net.TCPAddr{
+		IP: localAddr.IP,
+	}
+
+	defaultDialer := &net.Dialer{
+		Timeout:   30 * time.Second,
+		KeepAlive: 30 * time.Second,
+	}
+
+	dialer := &net.Dialer{
+		LocalAddr: &localTCPAddr,
+		Timeout:   30 * time.Second,
+		KeepAlive: 30 * time.Second,
+	}
+
+	transport := &http.Transport{
+		DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
+			oldNetwork := network
+			oldAddr := addr
+
+			if addr == "playoverwatch.com:443" {
+				network = "tcp6"
+				addr = "[" + ips[r.Intn(len(ips))] + "]:443"
+			}
+
+			log.Println("Dial using", addr)
+
+			c, err := dialer.DialContext(ctx, network, addr)
+
+			if err != nil {
+				log.Println("Fallback")
+				c, err = defaultDialer.DialContext(ctx, oldNetwork, oldAddr)
+			}
+
+			return c, err
+		},
+		TLSClientConfig: &tls.Config{
+			ServerName: "playoverwatch.com",
+		},
+	}
+
+	http.DefaultClient = &http.Client{
+		Transport: transport,
+	}
+
+	stats, err := ovrstat.PCStats("cats-11481")
+
+	if err != nil {
+		log.Fatalln("Error retrieving:", err)
+	}
+
+	log.Println(stats.Name+" is level", stats.Level)
+}
+
+func lookupCloudfrontURL() (string, error) {
+	res, err := http.Get("https://playoverwatch.com/en-us/")
+
+	if err != nil {
+		return "", err
+	}
+
+	defer res.Body.Close()
+
+	doc, err := goquery.NewDocumentFromReader(res.Body)
+
+	links := doc.Find("link").Map(func(i int, s *goquery.Selection) string {
+		v, exists := s.Attr("href")
+
+		if !exists {
+			return ""
+		}
+
+		return v
+	})
+
+	for _, link := range links {
+		u, err := url.Parse(link)
+
+		if err != nil {
+			continue
+		}
+
+		if strings.HasSuffix(u.Host, "cloudfront.net") {
+			return u.Host, nil
+		}
+	}
+
+	return "", errors.New("no cloudfront url")
+}
+
+func lookupIpv6Dns(host string) ([]string, error) {
+	c := &dns.Client{
+		Net: "udp",
+	}
+
+	msg := new(dns.Msg)
+	msg.Id = dns.Id()
+	msg.RecursionDesired = true
+	msg.Question = make([]dns.Question, 1)
+	msg.Question[0] = dns.Question{Name: dns.Fqdn(host), Qtype: dns.TypeAAAA, Qclass: dns.ClassINET}
+
+	in, _, err := c.Exchange(msg, "8.8.8.8:53")
+
+	result := make([]string, 0)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if in != nil && in.Rcode != dns.RcodeSuccess {
+		return result, errors.New(dns.RcodeToString[in.Rcode])
+	}
+
+	for _, record := range in.Answer {
+		if t, ok := record.(*dns.AAAA); ok {
+			result = append(result, t.AAAA.String())
+		}
+	}
+	return result, err
+}
+
+func checkIpv6Local() ([]string, error) {
+	ifaces, err := net.Interfaces()
+
+	if err != nil {
+		return nil, err
+	}
+
+	ret := make([]string, 0)
+
+	for _, i := range ifaces {
+		addrs, err := i.Addrs()
+
+		if err != nil {
+			continue
+		}
+
+		for _, addr := range addrs {
+			var ip net.IP
+
+			switch v := addr.(type) {
+			case *net.IPNet:
+				ip = v.IP
+			case *net.IPAddr:
+				ip = v.IP
+			}
+
+			log.Println("Check", ip.String())
+
+			if ip == nil || ip.To4() == nil || isPrivateIP(ip) {
+				continue
+			}
+
+			log.Println("Checking", ip.String())
+
+			if ipnet, ok := addr.(*net.IPNet); ok {
+				for ip := ipnet.IP.Mask(ipnet.Mask); ipnet.Contains(ip); inc(ip) {
+					ret = append(ret, ip.String())
+				}
+
+				continue
+			}
+
+			ret = append(ret, ip.String())
+		}
+	}
+
+	return ret, nil
+}
+
+func inc(ip net.IP) {
+	for j := len(ip) - 1; j >= 0; j-- {
+		ip[j]++
+		if ip[j] > 0 {
+			break
+		}
+	}
+}
+
+var privateIPBlocks []*net.IPNet
+
+func init() {
+	for _, cidr := range []string{
+		"127.0.0.0/8",    // IPv4 loopback
+		"10.0.0.0/8",     // RFC1918
+		"172.16.0.0/12",  // RFC1918
+		"192.168.0.0/16", // RFC1918
+		"169.254.0.0/16", // RFC3927 link-local
+		"::1/128",        // IPv6 loopback
+		"fe80::/10",      // IPv6 link-local
+		"fc00::/7",       // IPv6 unique local addr
+	} {
+		_, block, err := net.ParseCIDR(cidr)
+		if err != nil {
+			panic(fmt.Errorf("parse error on %q: %v", cidr, err))
+		}
+		privateIPBlocks = append(privateIPBlocks, block)
+	}
+}
+
+func isPrivateIP(ip net.IP) bool {
+	if ip.IsLoopback() || ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() {
+		return true
+	}
+
+	for _, block := range privateIPBlocks {
+		if block.Contains(ip) {
+			return true
+		}
+	}
+	return false
+}
--- a/validator/validator.go
+++ b/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 {
@ -46,7 +47,7 @@ var (
 		"div.player-level div.u-vertical-center",
 		"div.player-level",
 		"div.player-rank",
-		"div.endorsement-level div.u-center",
+		"div.EndorsementIcon-tooltip div.u-center",
 		"div.EndorsementIcon",
 		"div.masthead p.masthead-detail.h4 span",
 	}
@ -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
 	}

@ -155,12 +148,12 @@ 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 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...)
Author	SHA1	Message	Date
Tyler	e31652d481	Update goc output path	2021-04-28 22:37:34 -04:00
Tyler	42a82d3e97	Fix binary path	2021-04-28 22:36:35 -04:00
Tyler	f345fe3b2c	Update build system	2021-04-28 22:35:10 -04:00
Tyler	8b8b818651	Proper compression identifier	2021-04-20 22:54:22 -04:00
Tyler	06740b6b86	Change to gzip compression	2021-04-20 22:37:38 -04:00
Tyler	6d5c00653b	Update ovrstat	2021-04-20 22:35:14 -04:00
Tyler	ead6298a55	Update ovrstat	2020-10-22 23:52:27 -04:00
Tyler	454419abec	Add license file	2020-10-03 16:46:22 -04:00
Tyler	b53357aad7	Resolve issue with PSN names	2020-10-03 16:42:21 -04:00
Tyler	fee92259b1	Add distro to build repo stage, move docker up	2020-08-16 18:35:54 -04:00
Tyler	c964c73824	Increment version	2020-08-16 18:31:45 -04:00
Tyler	c2882857a4	Build docker image	2020-08-16 18:25:12 -04:00
Tyler	f207f57536	Patch issue with v3 not being recognized	2020-06-15 20:48:47 -04:00
Tyler	30fbf1b611	Load hero names from heroes page	2020-06-15 20:40:59 -04:00
Tyler	70900ea2c7	Move keyed items to v3	2020-06-15 20:32:07 -04:00
Tyler	322e908147	Force new version	2020-06-14 05:42:18 -04:00
Tyler	308f853b81	Push to repo first, don't upload in build step	2020-06-14 05:19:17 -04:00
Tyler	d5de8568dd	Force rebuild with right arch flag	2020-06-14 05:15:10 -04:00
Tyler	8b80a73452	Add keyed ratings	2020-06-14 02:12:26 -04:00
Tyler Stuyfzand	20366ed3e4	Update ovrstat and validator	2020-04-16 20:29:23 -04:00
Tyler	1c52aae429	Update ovrstat	2020-01-31 18:17:06 -05:00
Tyler	c0bd927903	Use fork for ovrstat until updated	2020-01-23 21:52:09 -05:00
Tyler	3ca4448a7e	Fix accidentally removed region parameter	2019-12-24 12:17:40 -05:00
Tyler	8c42945e67	Support for switch, v2 of api without region	2019-12-23 21:47:48 -05:00
Tyler	c15121a873	Update ovrstat	2019-09-25 22:05:49 -04:00
Tyler	f954619223	Fix Platinum missing extension	2019-08-25 18:38:38 -04:00
Tyler	d010926c07	Resolve issue with map not observing ordering	2019-08-25 14:35:33 -04:00
Tyler	7e3f6cf674	Update API for Role Queue	2019-08-17 14:09:09 -04:00
Tyler	de5626814b	Decrease default cache time	2019-06-13 21:08:59 -04:00