reiver
/
go-mstdn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made it so Application "vapid_key" is not mandatory anymore

master
Charles Iliya Krempeaux 2024-08-07 07:50:07 -07:00
parent df08062999
commit e380da4d0c
1 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
ent/application.go
View File

@ -11,8 +11,7 @@ import (
var _ json.Marshaler = Application{} var _ json.Marshaler = Application{}
const ( const (
errCannotMashalApplicationAsJSONNoName = erorr.Error("cannot marshal ent.Application to JSON — no ‘name’ set") errCannotMashalApplicationAsJSONNoName = erorr.Error("cannot marshal ent.Application to JSON — no ‘name’ set")
errCannotMashalApplicationAsJSONNoVapidKey = erorr.Error("cannot marshal ent.Application to JSON — no ‘vapid_key’ set")
) )
// Appication represents a Mastodon API "Appication". // Appication represents a Mastodon API "Appication".
@ -22,7 +21,7 @@ const (
type Application struct { type Application struct {
Name opt.Optional[string] `json:"name"` Name opt.Optional[string] `json:"name"`
WebSite nul.Nullable[string] `json:"website"` // optional — field has JSON null value in JSON if not set WebSite nul.Nullable[string] `json:"website"` // optional — field has JSON null value in JSON if not set
VapidKey opt.Optional[string] `json:"vapid_key"` VapidKey opt.Optional[string] `json:"vapid_key"` // optional — field not included in JSON if not set
ClientID opt.Optional[string] `json:"client_id"` // optional — field not included in JSON if not set ClientID opt.Optional[string] `json:"client_id"` // optional — field not included in JSON if not set
ClientSecret opt.Optional[string] `json:"client_secret"` // optional — field not included in JSON if not set ClientSecret opt.Optional[string] `json:"client_secret"` // optional — field not included in JSON if not set
} }
@ -75,61 +74,49 @@ func (receiver Application) MarshalJSON() ([]byte, error) {
{ {
val, found := receiver.VapidKey.Get() val, found := receiver.VapidKey.Get()
if !found { if found {
return nil, errCannotMashalApplicationAsJSONNoVapidKey buffer = append(buffer, `,"vapid_key":`...)
}
buffer = append(buffer, `,"vapid_key":`...) {
marshaled, err := json.Marshal(val)
if nil != err {
return nil, erorr.Errorf("ent: could not marshal ent.Application.VapidKey as JSON: %w", err)
}
{ buffer = append(buffer, marshaled...)
marshaled, err := json.Marshal(val)
if nil != err {
return nil, erorr.Errorf("ent: could not marshal ent.Application.VapidKey as JSON: %w", err)
} }
buffer = append(buffer, marshaled...)
} }
} }
{ {
switch receiver.ClientID { val, found := receiver.ClientID.Get()
case opt.Nothing[string](): if found {
// Nothing here.
default:
clientID, found := receiver.ClientID.Get()
if !found {
return nil, erorr.Error("ent: could not marshal ent.Application.ClientID as JSON: internal error")
}
buffer = append(buffer, `,"client_id":`...) buffer = append(buffer, `,"client_id":`...)
marshaled, err := json.Marshal(clientID) {
if nil != err { marshaled, err := json.Marshal(val)
return nil, erorr.Errorf("ent: could not marshal ent.Application.ClientID as JSON: %w", err) if nil != err {
} return nil, erorr.Errorf("ent: could not marshal ent.Application.ClientID as JSON: %w", err)
}
buffer = append(buffer, marshaled...) buffer = append(buffer, marshaled...)
}
} }
} }
{ {
switch receiver.ClientSecret { val, found := receiver.ClientSecret.Get()
case opt.Nothing[string](): if found {
// Nothing here.
default:
clientSecret, found := receiver.ClientSecret.Get()
if !found {
return nil, erorr.Error("ent: could not marshal ent.Application.ClientSecret as JSON: internal error")
}
buffer = append(buffer, `,"client_secret":`...) buffer = append(buffer, `,"client_secret":`...)
marshaled, err := json.Marshal(clientSecret) {
if nil != err { marshaled, err := json.Marshal(val)
return nil, erorr.Errorf("ent: could not marshal ent.Application.ClientSecret as JSON: %w", err) if nil != err {
} return nil, erorr.Errorf("ent: could not marshal ent.Application.ClientSecret as JSON: %w", err)
}
buffer = append(buffer, marshaled...) buffer = append(buffer, marshaled...)
}
} }
} }