ElyBy-Mirror/chrly
1
0
Fork 0
mirror of https://github.com/elyby/chrly.git synced 2025-01-20 18:42:49 +05:30
Code Issues Packages Projects Releases Wiki Activity

Добавлен функционал сохранения id к username пользователя + метод Delete для SkinItem

Browse Source
This commit is contained in:
ErickSkrauch 2016-09-15 01:19:16 +03:00
parent 4bdab704a5
commit 408d411846
3 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/data/SkinItem.go
View File

@ -11,21 +11,55 @@ import (
) )
type SkinItem struct { type SkinItem struct {
UserId int `json:"userId"` UserId int `json:"userId"`
Username string `json:"username"` Username string `json:"username"`
SkinId int `json:"skinId"` SkinId int `json:"skinId"`
Url string `json:"url"` Url string `json:"url"`
Is1_8 bool `json:"is1_8"` Is1_8 bool `json:"is1_8"`
IsSlim bool `json:"isSlim"` IsSlim bool `json:"isSlim"`
Hash string `json:"hash"` Hash string `json:"hash"`
oldUsername string
} }
const accountIdToUsernameKey string = "hash:username-to-account-id"
func (s *SkinItem) Save() { func (s *SkinItem) Save() {
str, _ := json.Marshal(s) str, _ := json.Marshal(s)
services.RedisPool.Cmd("SET", tools.BuildKey(s.Username), str) pool, _ := services.RedisPool.Get()
pool.Cmd("MULTI")
// Если пользователь сменил ник, то мы должны удать его ключ
if (s.oldUsername != "" && s.oldUsername != s.Username) {
pool.Cmd("DEL", tools.BuildKey(s.oldUsername))
}
// Если это новая запись или если пользователь сменил ник, то обновляем значение в хэш-таблице
if (s.oldUsername != "" || s.oldUsername != s.Username) {
pool.Cmd("HSET", accountIdToUsernameKey, s.UserId, s.Username)
}
pool.Cmd("SET", tools.BuildKey(s.Username), str)
pool.Cmd("EXEC")
s.oldUsername = s.Username
} }
func FindRecord(username string) (SkinItem, error) { func (s *SkinItem) Delete() {
if (s.oldUsername == "") {
return;
}
pool, _ := services.RedisPool.Get()
pool.Cmd("MULTI")
pool.Cmd("DEL", tools.BuildKey(s.oldUsername))
pool.Cmd("HDEL", accountIdToUsernameKey, s.UserId)
pool.Cmd("EXEC")
}
func FindByUsername(username string) (SkinItem, error) {
var record SkinItem; var record SkinItem;
response := services.RedisPool.Cmd("GET", tools.BuildKey(username)); response := services.RedisPool.Cmd("GET", tools.BuildKey(username));
if (response.IsType(redis.Nil)) { if (response.IsType(redis.Nil)) {
@ -38,7 +72,20 @@ func FindRecord(username string) (SkinItem, error) {
if (decodeErr != nil) { if (decodeErr != nil) {
log.Println("Cannot decode record data") log.Println("Cannot decode record data")
} }
record.oldUsername = record.Username
} }
return record, err return record, err
} }
func FindById(id int) (SkinItem, error) {
response := services.RedisPool.Cmd("HGET", accountIdToUsernameKey, id);
if (response.IsType(redis.Nil)) {
return SkinItem{}, DataNotFound{"unknown"}
}
username, _ := response.Str()
return FindByUsername(username)
}

2
lib/routes/Skin.go
View File

@ -13,7 +13,7 @@ import (
func Skin(w http.ResponseWriter, r *http.Request) { func Skin(w http.ResponseWriter, r *http.Request) {
username := tools.ParseUsername(mux.Vars(r)["username"]) username := tools.ParseUsername(mux.Vars(r)["username"])
log.Println("request skin for username " + username); log.Println("request skin for username " + username);
rec, err := data.FindRecord(username) rec, err := data.FindByUsername(username)
if (err != nil) { if (err != nil) {
http.Redirect(w, r, "http://skins.minecraft.net/MinecraftSkins/" + username + ".png", 301) http.Redirect(w, r, "http://skins.minecraft.net/MinecraftSkins/" + username + ".png", 301)
return return

2
lib/routes/Textures.go
View File

@ -15,7 +15,7 @@ func Textures(w http.ResponseWriter, r *http.Request) {
username := tools.ParseUsername(mux.Vars(r)["username"]) username := tools.ParseUsername(mux.Vars(r)["username"])
log.Println("request textures for username " + username) log.Println("request textures for username " + username)
rec, err := data.FindRecord(username) rec, err := data.FindByUsername(username)
if (err != nil || rec.SkinId == 0) { if (err != nil || rec.SkinId == 0) {
rec.Url = "http://skins.minecraft.net/MinecraftSkins/" + username + ".png" rec.Url = "http://skins.minecraft.net/MinecraftSkins/" + username + ".png"
rec.Hash = string(tools.BuildNonElyTexturesHash(username)) rec.Hash = string(tools.BuildNonElyTexturesHash(username))