3 files changed, 13 insertions, 9 deletions
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