[MM-12536] Migrate to idiomatic error handling the file app/user_agent.go in the mattermost-server (#9575) (#9576)

* Make changes to function getPlatformName.

* Make changes to the function getOSName, use switch statement inside instead of nested if

* create helper function and make getBrowserVersion() more idiomatic

* update getUAVersion

* update getBrowserName

* changes required in review done
Этот коммит содержится в:
Mukul Rawat
2018-10-16 00:31:35 +05:30
коммит произвёл George Goldberg
родитель 457a34c5f4
Коммит a06e453ea1

Просмотреть файл

@@ -25,11 +25,11 @@ var platformNames = map[uasurfer.Platform]string{
func getPlatformName(ua *uasurfer.UserAgent) string { func getPlatformName(ua *uasurfer.UserAgent) string {
platform := ua.OS.Platform platform := ua.OS.Platform
if name, ok := platformNames[platform]; !ok { name, ok := platformNames[platform]
if !ok {
return platformNames[uasurfer.PlatformUnknown] return platformNames[uasurfer.PlatformUnknown]
} else {
return name
} }
return name
} }
var osNames = map[uasurfer.OSName]string{ var osNames = map[uasurfer.OSName]string{
@@ -53,57 +53,55 @@ func getOSName(ua *uasurfer.UserAgent) string {
major := os.Version.Major major := os.Version.Major
minor := os.Version.Minor minor := os.Version.Minor
name := "Windows" switch {
case major == 5 && minor == 0:
// Adapted from https://github.com/mssola/user_agent/blob/master/operating_systems.go#L26 return "Windows 2000"
if major == 5 { case major == 5 && minor == 1:
if minor == 0 { return "Windows XP"
name = "Windows 2000" case major == 5 && minor == 2:
} else if minor == 1 { return "Windows XP x64 Edition"
name = "Windows XP" case major == 6 && minor == 0:
} else if minor == 2 { return "Windows Vista"
name = "Windows XP x64 Edition" case major == 6 && minor == 1:
} return "Windows 7"
} else if major == 6 { case major == 6 && minor == 2:
if minor == 0 { return "Windows 8"
name = "Windows Vista" case major == 6 && minor == 3:
} else if minor == 1 { return "Windows 8.1"
name = "Windows 7" case major == 10:
} else if minor == 2 { return "Windows 10"
name = "Windows 8" default:
} else if minor == 3 { return "Windows"
name = "Windows 8.1"
}
} else if major == 10 {
name = "Windows 10"
} }
return name
} else if name, ok := osNames[os.Name]; ok {
return name
} else {
return osNames[uasurfer.OSUnknown]
} }
name, ok := osNames[os.Name]
if ok {
return name
}
return osNames[uasurfer.OSUnknown]
} }
func getBrowserVersion(ua *uasurfer.UserAgent, userAgentString string) string { func getBrowserVersion(ua *uasurfer.UserAgent, userAgentString string) string {
if index := strings.Index(userAgentString, "Mattermost/"); index != -1 { if index := strings.Index(userAgentString, "Mattermost/"); index != -1 {
afterVersion := userAgentString[index+len("Mattermost/"):] afterVersion := userAgentString[index+len("Mattermost/"):]
return strings.Fields(afterVersion)[0] return strings.Fields(afterVersion)[0]
} else if index := strings.Index(userAgentString, "Franz/"); index != -1 { }
if index := strings.Index(userAgentString, "Franz/"); index != -1 {
afterVersion := userAgentString[index+len("Franz/"):] afterVersion := userAgentString[index+len("Franz/"):]
return strings.Fields(afterVersion)[0] return strings.Fields(afterVersion)[0]
} else {
return getUAVersion(ua.Browser.Version)
} }
return getUAVersion(ua.Browser.Version)
} }
func getUAVersion(version uasurfer.Version) string { func getUAVersion(version uasurfer.Version) string {
if version.Patch == 0 { if version.Patch == 0 {
return fmt.Sprintf("%v.%v", version.Major, version.Minor) return fmt.Sprintf("%v.%v", version.Major, version.Minor)
} else {
return fmt.Sprintf("%v.%v.%v", version.Major, version.Minor, version.Patch)
} }
return fmt.Sprintf("%v.%v.%v", version.Major, version.Minor, version.Patch)
} }
var browserNames = map[uasurfer.BrowserName]string{ var browserNames = map[uasurfer.BrowserName]string{
@@ -122,11 +120,16 @@ func getBrowserName(ua *uasurfer.UserAgent, userAgentString string) string {
if strings.Contains(userAgentString, "Mattermost") { if strings.Contains(userAgentString, "Mattermost") {
return "Desktop App" return "Desktop App"
} else if browser == uasurfer.BrowserIE && ua.Browser.Version.Major > 11 {
return "Edge"
} else if name, ok := browserNames[browser]; ok {
return name
} else {
return browserNames[uasurfer.BrowserUnknown]
} }
if browser == uasurfer.BrowserIE && ua.Browser.Version.Major > 11 {
return "Edge"
}
if name, ok := browserNames[browser]; ok {
return name
}
return browserNames[uasurfer.BrowserUnknown]
} }