mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 13:42:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] rename New___(string) int signature functions to Parse___(string) int (#3580)

Browse source 
* rename New___(string) int {} signature functions to Parse___(string) int {}

* remove test output
This commit is contained in:
kim 2024-11-28 11:54:22 +00:00 • committed by GitHub
commit 312cb8b9c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/api/client/admin/domainpermissiondraftsget.go
View file

@ -147,16 +147,12 @@ func (m *Module) DomainPermissionDraftsGETHandler(c *gin.Context) {
return
}
permType := c.Query(apiutil.DomainPermissionPermTypeKey)
switch permType {
case "", "block", "allow":
// No problem.
default:
// Invalid.
permTypeStr := c.Query(apiutil.DomainPermissionPermTypeKey)
permType := gtsmodel.ParseDomainPermissionType(permTypeStr)
if permType == gtsmodel.DomainPermissionUnknown {
text := fmt.Sprintf(
"permission_type %s not recognized, valid values are empty string, block, or allow",
permType,
permTypeStr,
)
errWithCode := gtserror.NewErrorBadRequest(errors.New(text), text)
apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
@ -173,7 +169,7 @@ func (m *Module) DomainPermissionDraftsGETHandler(c *gin.Context) {
c.Request.Context(),
c.Query(apiutil.DomainPermissionSubscriptionIDKey),
c.Query(apiutil.DomainPermissionDomainKey),
gtsmodel.NewDomainPermissionType(permType),
permType,
page,
)
if errWithCode != nil {

12
internal/api/client/notifications/notificationsget.go
View file

@ -169,8 +169,8 @@ func (m *Module) NotificationsGETHandler(c *gin.Context) {
ctx,
authed,
page,
ParseNotificationTypes(ctx, c.QueryArray(TypesKey)), // Include types.
ParseNotificationTypes(ctx, c.QueryArray(ExcludeTypesKey)), // Exclude types.
parseNotificationTypes(ctx, c.QueryArray(TypesKey)), // Include types.
parseNotificationTypes(ctx, c.QueryArray(ExcludeTypesKey)), // Exclude types.
)
if errWithCode != nil {
apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
@ -184,9 +184,9 @@ func (m *Module) NotificationsGETHandler(c *gin.Context) {
apiutil.JSON(c, http.StatusOK, resp.Items)
}
// ParseNotificationTypes converts the given slice of string values
// parseNotificationTypes converts the given slice of string values
// to gtsmodel notification types, logging + skipping unknown types.
func ParseNotificationTypes(
func parseNotificationTypes(
ctx context.Context,
values []string,
) []gtsmodel.NotificationType {
@ -196,10 +196,10 @@ func ParseNotificationTypes(
ntypes := make([]gtsmodel.NotificationType, 0, len(values))
for _, value := range values {
ntype := gtsmodel.NewNotificationType(value)
ntype := gtsmodel.ParseNotificationType(value)
if ntype == gtsmodel.NotificationUnknown {
// Type we don't know about (yet), log and ignore it.
log.Debugf(ctx, "ignoring unknown type %s", value)
log.Warnf(ctx, "ignoring unknown type %s", value)
continue
}