web/notify.moe
Code Issues Pull Requests Activity

Fixed data races

Browse Source
This commit is contained in:
Eduard Urbach
2019-06-02 00:28:22 +09:00
parent 28db818c37
commit 4d919ef752
6 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
middleware/UserInfo.go
View File

@ -32,9 +32,7 @@ func UserInfo(next aero.Handler) aero.Handler {
return nil
}
// This works asynchronously so it doesn't block the response
go updateUserInfo(ctx, user)
updateUserInfo(ctx, user)
return err
}
}
@ -59,12 +57,12 @@ func updateUserInfo(ctx aero.Context, user *arn.User) {
user.OS.Version = os.Version
}
if user.IP != newIP {
updateUserLocation(user, newIP)
}
user.LastSeen = arn.DateTimeUTC()
user.Save()
if user.IP != newIP {
go updateUserLocation(user, newIP)
}
}
// Updates the location of the user.
@ -100,19 +98,23 @@ func updateUserLocation(user *arn.User, newIP string) {
return
}
if newLocation.CountryName != "-" {
user.Location.CountryName = newLocation.CountryName
user.Location.CountryCode = newLocation.CountryCode
user.Location.Latitude, _ = strconv.ParseFloat(newLocation.Latitude, 64)
user.Location.Longitude, _ = strconv.ParseFloat(newLocation.Longitude, 64)
user.Location.CityName = newLocation.CityName
user.Location.RegionName = newLocation.RegionName
user.Location.TimeZone = newLocation.TimeZone
user.Location.ZipCode = newLocation.ZipCode
// Make South Korea easier to read
if user.Location.CountryName == "Korea, Republic of" {
user.Location.CountryName = "South Korea"
}
if newLocation.CountryName == "" || newLocation.CountryName == "-" {
return
}
user.Location.CountryName = newLocation.CountryName
user.Location.CountryCode = newLocation.CountryCode
user.Location.Latitude, _ = strconv.ParseFloat(newLocation.Latitude, 64)
user.Location.Longitude, _ = strconv.ParseFloat(newLocation.Longitude, 64)
user.Location.CityName = newLocation.CityName
user.Location.RegionName = newLocation.RegionName
user.Location.TimeZone = newLocation.TimeZone
user.Location.ZipCode = newLocation.ZipCode
// Make South Korea easier to read
if user.Location.CountryName == "Korea, Republic of" {
user.Location.CountryName = "South Korea"
}
user.Save()
}