summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--internal/api/client/admin/domainpermissiondraftsget.go14
-rw-r--r--internal/api/client/notifications/notificationsget.go12
-rw-r--r--internal/db/bundb/migrations/20230828101322_admin_action_locking.go2
-rw-r--r--internal/gtsmodel/adminaction.go9
-rw-r--r--internal/gtsmodel/domainpermission.go9
-rw-r--r--internal/gtsmodel/notification.go4
-rw-r--r--internal/processing/admin/accountaction.go2
7 files changed, 26 insertions, 26 deletions
diff --git a/internal/api/client/admin/domainpermissiondraftsget.go b/internal/api/client/admin/domainpermissiondraftsget.go
index dd3315857..d63179afc 100644
--- a/internal/api/client/admin/domainpermissiondraftsget.go
+++ b/internal/api/client/admin/domainpermissiondraftsget.go
@@ -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 {
diff --git a/internal/api/client/notifications/notificationsget.go b/internal/api/client/notifications/notificationsget.go
index 7caadbe7d..b530c515d 100644
--- a/internal/api/client/notifications/notificationsget.go
+++ b/internal/api/client/notifications/notificationsget.go
@@ -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
}
diff --git a/internal/db/bundb/migrations/20230828101322_admin_action_locking.go b/internal/db/bundb/migrations/20230828101322_admin_action_locking.go
index b72976cc9..29c29a747 100644
--- a/internal/db/bundb/migrations/20230828101322_admin_action_locking.go
+++ b/internal/db/bundb/migrations/20230828101322_admin_action_locking.go
@@ -77,7 +77,7 @@ func init() {
UpdatedAt: oldAction.UpdatedAt,
TargetCategory: gtsmodel.AdminActionCategoryAccount,
TargetID: oldAction.TargetAccountID,
- Type: gtsmodel.NewAdminActionType(string(oldAction.Type)),
+ Type: gtsmodel.ParseAdminActionType(string(oldAction.Type)),
AccountID: oldAction.AccountID,
Text: oldAction.Text,
SendEmail: util.Ptr(oldAction.SendEmail),
diff --git a/internal/gtsmodel/adminaction.go b/internal/gtsmodel/adminaction.go
index e8b82e495..5ca8244a0 100644
--- a/internal/gtsmodel/adminaction.go
+++ b/internal/gtsmodel/adminaction.go
@@ -19,6 +19,7 @@ package gtsmodel
import (
"path"
+ "strings"
"time"
)
@@ -46,8 +47,8 @@ func (c AdminActionCategory) String() string {
}
}
-func NewAdminActionCategory(in string) AdminActionCategory {
- switch in {
+func ParseAdminActionCategory(in string) AdminActionCategory {
+ switch strings.ToLower(in) {
case "account":
return AdminActionCategoryAccount
case "domain":
@@ -96,8 +97,8 @@ func (t AdminActionType) String() string {
}
}
-func NewAdminActionType(in string) AdminActionType {
- switch in {
+func ParseAdminActionType(in string) AdminActionType {
+ switch strings.ToLower(in) {
case "disable":
return AdminActionDisable
case "reenable":
diff --git a/internal/gtsmodel/domainpermission.go b/internal/gtsmodel/domainpermission.go
index 3d1ee873f..f1db4de59 100644
--- a/internal/gtsmodel/domainpermission.go
+++ b/internal/gtsmodel/domainpermission.go
@@ -17,7 +17,10 @@
package gtsmodel
-import "time"
+import (
+ "strings"
+ "time"
+)
// DomainPermission models a domain permission
// entry -- block / allow / draft / exclude.
@@ -62,8 +65,8 @@ func (p DomainPermissionType) String() string {
}
}
-func NewDomainPermissionType(in string) DomainPermissionType {
- switch in {
+func ParseDomainPermissionType(in string) DomainPermissionType {
+ switch strings.ToLower(in) {
case "block":
return DomainPermissionBlock
case "allow":
diff --git a/internal/gtsmodel/notification.go b/internal/gtsmodel/notification.go
index 47bf7daa5..1ef805081 100644
--- a/internal/gtsmodel/notification.go
+++ b/internal/gtsmodel/notification.go
@@ -87,8 +87,8 @@ func (t NotificationType) String() string {
}
}
-// NewNotificationType returns a notification type from the given value.
-func NewNotificationType(in string) NotificationType {
+// ParseNotificationType returns a notification type from the given value.
+func ParseNotificationType(in string) NotificationType {
switch strings.ToLower(in) {
case "follow":
return NotificationFollow
diff --git a/internal/processing/admin/accountaction.go b/internal/processing/admin/accountaction.go
index 7fd1047c4..59d4b420e 100644
--- a/internal/processing/admin/accountaction.go
+++ b/internal/processing/admin/accountaction.go
@@ -40,7 +40,7 @@ func (p *Processor) AccountAction(
return "", gtserror.NewErrorInternalError(err)
}
- switch gtsmodel.NewAdminActionType(request.Type) {
+ switch gtsmodel.ParseAdminActionType(request.Type) {
case gtsmodel.AdminActionSuspend:
return p.accountActionSuspend(ctx, adminAcct, targetAcct, request.Text)