From 5fc84bd9141fee6737526c53d37e37101a2760fd Mon Sep 17 00:00:00 2001 From: Alicia Date: Sat, 23 Feb 2019 13:11:47 +0000 Subject: [PATCH] fix schiavo error and changing rippleapi to api --- README.md | 2 +- app/method.go | 2 +- app/peppy/beatmap.go | 2 +- app/peppy/common.go | 2 +- app/peppy/score.go | 2 +- app/peppy/user.go | 2 +- app/peppy/user_x.go | 2 +- app/router.go | 2 +- app/start.go | 10 +++++----- app/tokens.go | 2 +- app/v1/404.go | 2 +- app/v1/badge.go | 2 +- app/v1/beatmap.go | 2 +- app/v1/beatmap_requests.go | 4 ++-- app/v1/blog.go | 2 +- app/v1/errors.go | 2 +- app/v1/friend.go | 2 +- app/v1/leaderboard.go | 2 +- app/v1/manage_user.go | 2 +- app/v1/meta_linux.go | 2 +- app/v1/meta_windows.go | 2 +- app/v1/ping.go | 2 +- app/v1/rap.go | 2 +- app/v1/score.go | 2 +- app/v1/self.go | 2 +- app/v1/token.go | 2 +- app/v1/user.go | 2 +- app/v1/user_achievements.go | 2 +- app/v1/user_scores.go | 2 +- app/v1/user_scores_ap.go | 2 +- app/v1/user_scores_relax.go | 2 +- app/websockets/identify.go | 2 +- app/websockets/restricted_visibility.go | 2 +- app/websockets/scores.go | 4 ++-- beatmapget/beatmapget.go | 2 +- beatmapget/fullset.go | 2 +- main.go | 8 ++++---- startuato_linux.go | 4 ++-- startuato_windows.go | 2 +- vendor/vendor.json | 4 ++-- 40 files changed, 51 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 8a9dc57..c225168 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is the source code for Ripple's API. -- Origin: https://git.github.com/osuYozora/rippleapi +- Origin: https://git.github.com/osuYozora/api - Mirror: https://github.com/osuyozora/api ## Note to fellow developers: this is not how you do it! diff --git a/app/method.go b/app/method.go index 9beda4e..4c1ffec 100644 --- a/app/method.go +++ b/app/method.go @@ -9,7 +9,7 @@ import ( "unsafe" "github.com/valyala/fasthttp" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // Method wraps an API method to a HandlerFunc. diff --git a/app/peppy/beatmap.go b/app/peppy/beatmap.go index a158a87..d93b6d2 100644 --- a/app/peppy/beatmap.go +++ b/app/peppy/beatmap.go @@ -7,7 +7,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/thehowl/go-osuapi" "github.com/valyala/fasthttp" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // GetBeatmap retrieves general beatmap information. diff --git a/app/peppy/common.go b/app/peppy/common.go index 2c64713..4e45ef7 100644 --- a/app/peppy/common.go +++ b/app/peppy/common.go @@ -7,7 +7,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/valyala/fasthttp" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) var modes = []string{"std", "taiko", "ctb", "mania"} diff --git a/app/peppy/score.go b/app/peppy/score.go index 83f6e3f..d9f5189 100644 --- a/app/peppy/score.go +++ b/app/peppy/score.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "github.com/jmoiron/sqlx" "github.com/valyala/fasthttp" diff --git a/app/peppy/user.go b/app/peppy/user.go index 354b254..edc3340 100644 --- a/app/peppy/user.go +++ b/app/peppy/user.go @@ -13,7 +13,7 @@ import ( "github.com/valyala/fasthttp" "gopkg.in/redis.v5" "github.com/osuYozora/ocl" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // R is a redis client. diff --git a/app/peppy/user_x.go b/app/peppy/user_x.go index 719d487..e89ed2b 100644 --- a/app/peppy/user_x.go +++ b/app/peppy/user_x.go @@ -7,7 +7,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/valyala/fasthttp" "gopkg.in/thehowl/go-osuapi.v1" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "zxq.co/x/getrank" ) diff --git a/app/router.go b/app/router.go index 8148b2d..6d3a902 100644 --- a/app/router.go +++ b/app/router.go @@ -9,7 +9,7 @@ import ( "github.com/buaazp/fasthttprouter" "github.com/jmoiron/sqlx" "github.com/valyala/fasthttp" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type router struct { diff --git a/app/start.go b/app/start.go index a380c84..ebbe949 100644 --- a/app/start.go +++ b/app/start.go @@ -9,11 +9,11 @@ import ( "github.com/getsentry/raven-go" "github.com/jmoiron/sqlx" "gopkg.in/redis.v5" - "github.com/osuYozora/rippleapi/app/internals" - "github.com/osuYozora/rippleapi/app/peppy" - "github.com/osuYozora/rippleapi/app/v1" - "github.com/osuYozora/rippleapi/app/websockets" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/app/internals" + "github.com/osuYozora/api/app/peppy" + "github.com/osuYozora/api/app/v1" + "github.com/osuYozora/api/app/websockets" + "github.com/osuYozora/api/common" ) var ( diff --git a/app/tokens.go b/app/tokens.go index 576486b..86d1d68 100644 --- a/app/tokens.go +++ b/app/tokens.go @@ -8,7 +8,7 @@ import ( "time" "github.com/jmoiron/sqlx" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // GetTokenFull retrieves an user ID and their token privileges knowing their API token. diff --git a/app/v1/404.go b/app/v1/404.go index ca77f91..5dee56c 100644 --- a/app/v1/404.go +++ b/app/v1/404.go @@ -4,7 +4,7 @@ import ( "encoding/json" "github.com/valyala/fasthttp" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type response404 struct { diff --git a/app/v1/badge.go b/app/v1/badge.go index 5f5d70c..d15a8e7 100644 --- a/app/v1/badge.go +++ b/app/v1/badge.go @@ -3,7 +3,7 @@ package v1 import ( "database/sql" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type singleBadge struct { diff --git a/app/v1/beatmap.go b/app/v1/beatmap.go index 7ad9ed4..d3a0995 100644 --- a/app/v1/beatmap.go +++ b/app/v1/beatmap.go @@ -3,7 +3,7 @@ package v1 import ( "database/sql" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type difficulty struct { diff --git a/app/v1/beatmap_requests.go b/app/v1/beatmap_requests.go index 3118c3c..82510ac 100644 --- a/app/v1/beatmap_requests.go +++ b/app/v1/beatmap_requests.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "github.com/osuYozora/rippleapi/common" - "github.com/osuYozora/rippleapi/limit" + "github.com/osuYozora/api/common" + "github.com/osuYozora/api/limit" ) type rankRequestsStatusResponse struct { diff --git a/app/v1/blog.go b/app/v1/blog.go index 2c82663..4b40ffe 100644 --- a/app/v1/blog.go +++ b/app/v1/blog.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // This basically proxies requests from Medium's API and is used on Ripple's diff --git a/app/v1/errors.go b/app/v1/errors.go index 4508873..676c69b 100644 --- a/app/v1/errors.go +++ b/app/v1/errors.go @@ -3,7 +3,7 @@ package v1 import ( "strings" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // Boilerplate errors diff --git a/app/v1/friend.go b/app/v1/friend.go index 34d42dc..b016055 100644 --- a/app/v1/friend.go +++ b/app/v1/friend.go @@ -3,7 +3,7 @@ package v1 import ( "database/sql" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type friendData struct { diff --git a/app/v1/leaderboard.go b/app/v1/leaderboard.go index 09e7bb7..5b78c45 100644 --- a/app/v1/leaderboard.go +++ b/app/v1/leaderboard.go @@ -10,7 +10,7 @@ import ( redis "gopkg.in/redis.v5" "github.com/osuYozora/ocl" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type leaderboardUser struct { diff --git a/app/v1/manage_user.go b/app/v1/manage_user.go index 915e826..64cd933 100644 --- a/app/v1/manage_user.go +++ b/app/v1/manage_user.go @@ -9,7 +9,7 @@ import ( "time" redis "gopkg.in/redis.v5" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type setAllowedData struct { diff --git a/app/v1/meta_linux.go b/app/v1/meta_linux.go index eae916e..3b4864d 100644 --- a/app/v1/meta_linux.go +++ b/app/v1/meta_linux.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // MetaRestartGET restarts the API with Zero Downtime™. diff --git a/app/v1/meta_windows.go b/app/v1/meta_windows.go index 8ced73e..77dad9a 100644 --- a/app/v1/meta_windows.go +++ b/app/v1/meta_windows.go @@ -5,7 +5,7 @@ package v1 import ( "time" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // MetaRestartGET restarts the API with Zero Downtime™. diff --git a/app/v1/ping.go b/app/v1/ping.go index 30ef293..03989fd 100644 --- a/app/v1/ping.go +++ b/app/v1/ping.go @@ -4,7 +4,7 @@ import ( "math/rand" "time" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) var rn = rand.New(rand.NewSource(time.Now().UnixNano())) diff --git a/app/v1/rap.go b/app/v1/rap.go index 84ac372..fdc4361 100644 --- a/app/v1/rap.go +++ b/app/v1/rap.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type rapLogData struct { diff --git a/app/v1/score.go b/app/v1/score.go index 2d53d88..40e9240 100644 --- a/app/v1/score.go +++ b/app/v1/score.go @@ -8,7 +8,7 @@ import ( "strings" "gopkg.in/thehowl/go-osuapi.v1" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "zxq.co/x/getrank" ) diff --git a/app/v1/self.go b/app/v1/self.go index eedfef5..852b736 100644 --- a/app/v1/self.go +++ b/app/v1/self.go @@ -3,7 +3,7 @@ package v1 import ( "strings" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "github.com/osuYozora/semantic-icons-ugc" ) diff --git a/app/v1/token.go b/app/v1/token.go index 68dafd1..362b82d 100644 --- a/app/v1/token.go +++ b/app/v1/token.go @@ -11,7 +11,7 @@ import ( "github.com/jmoiron/sqlx" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "github.com/osuYozora/schiavolib" ) diff --git a/app/v1/user.go b/app/v1/user.go index e4b683c..39dbcd8 100644 --- a/app/v1/user.go +++ b/app/v1/user.go @@ -9,7 +9,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/osuYozora/ocl" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type userData struct { diff --git a/app/v1/user_achievements.go b/app/v1/user_achievements.go index b68213c..70e67a1 100644 --- a/app/v1/user_achievements.go +++ b/app/v1/user_achievements.go @@ -6,7 +6,7 @@ import ( "time" "github.com/jmoiron/sqlx" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // Achievement represents an achievement in the database. diff --git a/app/v1/user_scores.go b/app/v1/user_scores.go index db129a9..a9a4f15 100644 --- a/app/v1/user_scores.go +++ b/app/v1/user_scores.go @@ -5,7 +5,7 @@ import ( "strings" "gopkg.in/thehowl/go-osuapi.v1" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "zxq.co/x/getrank" ) diff --git a/app/v1/user_scores_ap.go b/app/v1/user_scores_ap.go index c642ccd..9628c0d 100644 --- a/app/v1/user_scores_ap.go +++ b/app/v1/user_scores_ap.go @@ -5,7 +5,7 @@ import ( "strings" "gopkg.in/thehowl/go-osuapi.v1" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "zxq.co/x/getrank" ) diff --git a/app/v1/user_scores_relax.go b/app/v1/user_scores_relax.go index 323f170..e434fae 100644 --- a/app/v1/user_scores_relax.go +++ b/app/v1/user_scores_relax.go @@ -5,7 +5,7 @@ import ( "strings" "gopkg.in/thehowl/go-osuapi.v1" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "zxq.co/x/getrank" ) diff --git a/app/websockets/identify.go b/app/websockets/identify.go index 1086ba0..fba2e77 100644 --- a/app/websockets/identify.go +++ b/app/websockets/identify.go @@ -8,7 +8,7 @@ import ( "database/sql" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) type websocketUser struct { diff --git a/app/websockets/restricted_visibility.go b/app/websockets/restricted_visibility.go index f8513c3..73be086 100644 --- a/app/websockets/restricted_visibility.go +++ b/app/websockets/restricted_visibility.go @@ -3,7 +3,7 @@ package websockets import ( "encoding/json" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) // SetRestrictedVisibility sets whether the information of restricted users diff --git a/app/websockets/scores.go b/app/websockets/scores.go index 622dffe..b14f22d 100644 --- a/app/websockets/scores.go +++ b/app/websockets/scores.go @@ -7,8 +7,8 @@ import ( "sync" "gopkg.in/thehowl/go-osuapi.v1" - "github.com/osuYozora/rippleapi/app/v1" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/app/v1" + "github.com/osuYozora/api/common" "zxq.co/x/getrank" ) diff --git a/beatmapget/beatmapget.go b/beatmapget/beatmapget.go index 6fd1045..4bbd23a 100644 --- a/beatmapget/beatmapget.go +++ b/beatmapget/beatmapget.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "github.com/jmoiron/sqlx" "gopkg.in/thehowl/go-osuapi.v1" ) diff --git a/beatmapget/fullset.go b/beatmapget/fullset.go index f2e92e3..622bb31 100644 --- a/beatmapget/fullset.go +++ b/beatmapget/fullset.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" "gopkg.in/thehowl/go-osuapi.v1" ) diff --git a/main.go b/main.go index 4bedb6d..a54a24f 100644 --- a/main.go +++ b/main.go @@ -7,10 +7,10 @@ import ( "syscall" "github.com/osuYozora/agplwarning" - "github.com/osuYozora/rippleapi/app" - "github.com/osuYozora/rippleapi/beatmapget" - "github.com/osuYozora/rippleapi/common" - "github.com/osuYozora/schiavolib" + "github.com/osuYozora/api/app" + "github.com/osuYozora/api/beatmapget" + "github.com/osuYozora/api/common" + "zxq.co/ripple/schiavolib" // Golint pls dont break balls _ "github.com/go-sql-driver/mysql" "github.com/jmoiron/sqlx" diff --git a/startuato_linux.go b/startuato_linux.go index a4f67cf..b652416 100644 --- a/startuato_linux.go +++ b/startuato_linux.go @@ -10,8 +10,8 @@ import ( "github.com/rcrowley/goagain" "github.com/valyala/fasthttp" - "github.com/osuYozora/rippleapi/common" - "github.com/osuYozora/schiavolib" + "github.com/osuYozora/api/common" + "zxq.co/ripple/schiavolib" ) func startuato(hn fasthttp.RequestHandler) { diff --git a/startuato_windows.go b/startuato_windows.go index 82e9401..2faef3d 100644 --- a/startuato_windows.go +++ b/startuato_windows.go @@ -10,7 +10,7 @@ import ( "net" "github.com/valyala/fasthttp" - "github.com/osuYozora/rippleapi/common" + "github.com/osuYozora/api/common" ) func startuato(hn fasthttp.RequestHandler) { diff --git a/vendor/vendor.json b/vendor/vendor.json index 87028d8..43aa274 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -196,7 +196,7 @@ }, { "checksumSHA1": "+6t1fYk62F/7QAol2NrKdVfQIkE=", - "path": "github.com/osuYozora/schiavolib", + "path": "zxq.co/ripple/schiavolib", "revision": "9cdc674dad0700ec79618de4ab558db6ad1de372", "revisionTime": "2016-11-09T21:02:50Z" }, @@ -213,5 +213,5 @@ "revisionTime": "2017-04-18T18:31:09Z" } ], - "rootPath": "github.com/osuYozora/rippleapi" + "rootPath": "github.com/osuYozora/api" }