diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-07-18 14:24:19 +0200 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-07-18 14:24:19 +0200 |
| commit | bda3d2784986e0a3fe2df78ec881332e81b54b3b (patch) | |
| tree | 86b36f9bc948a38550696e050e2795faaad53cdb /internal/server/server.go | |
| parent | b2cd79227d299476b5d7e28cb53434b8e919e15f (diff) | |
All: Run Gofumpt formatter
Diffstat (limited to 'internal/server/server.go')
| -rw-r--r-- | internal/server/server.go | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/internal/server/server.go b/internal/server/server.go index a34e8ec..f7ebbc3 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -14,16 +14,16 @@ import ( // The base type for servers type ServerBase struct { - URL string `json:"base_url"` - DisplayName map[string]string `json:"display_name"` - SupportContact []string `json:"support_contact"` - Endpoints ServerEndpoints `json:"endpoints"` - Profiles ServerProfileInfo `json:"profiles"` - ProfilesRaw string `json:"profiles_raw"` - StartTime int64 `json:"start_time"` - EndTime int64 `json:"expire_time"` - Logger *log.FileLogger `json:"-"` - FSM *fsm.FSM `json:"-"` + URL string `json:"base_url"` + DisplayName map[string]string `json:"display_name"` + SupportContact []string `json:"support_contact"` + Endpoints ServerEndpoints `json:"endpoints"` + Profiles ServerProfileInfo `json:"profiles"` + ProfilesRaw string `json:"profiles_raw"` + StartTime int64 `json:"start_time"` + EndTime int64 `json:"expire_time"` + Logger *log.FileLogger `json:"-"` + FSM *fsm.FSM `json:"-"` } // An instute access server @@ -38,8 +38,8 @@ type InstituteAccessServer struct { // A secure internet server which has its own OAuth tokens // It specifies the current location url it is connected to type SecureInternetHomeServer struct { - DisplayName map[string]string `json:"display_name"` - OAuth oauth.OAuth `json:"oauth"` + DisplayName map[string]string `json:"display_name"` + OAuth oauth.OAuth `json:"oauth"` // The home server has a list of info for each configured server location BaseMap map[string]*ServerBase `json:"base_map"` @@ -523,17 +523,16 @@ func askForProfileID(server Server) error { } type ServerInfoScreen struct { - DisplayName map[string]string `json:"display_name"` - CountryCode string `json:"country_code,omitempty"` - SupportContact []string `json:"support_contact"` - ProfilesRaw string `json:"profiles"` - ExpireTime int64 `json:"expire_time"` + DisplayName map[string]string `json:"display_name"` + CountryCode string `json:"country_code,omitempty"` + SupportContact []string `json:"support_contact"` + ProfilesRaw string `json:"profiles"` + ExpireTime int64 `json:"expire_time"` } func (servers *Servers) GetCurrentServerInfoJSON() (string, error) { errorMessage := "failed getting JSON for server" - currentServer, currentServerErr := servers.GetCurrentServer() if currentServerErr != nil { return "{}", &types.WrappedErrorMessage{Message: errorMessage, Err: currentServerErr} |