mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[bugfix] Log + ignore unknown notification types (#3577)
* [bugfix] Log + ignore unknown notification types * pass context to ParseNotificationTypes
This commit is contained in:
@ -18,13 +18,11 @@
|
||||
package util
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -218,51 +216,6 @@ func ParseInteractionReblogs(value string, defaultValue bool) (bool, gtserror.Wi
|
||||
return parseBool(value, defaultValue, InteractionReblogsKey)
|
||||
}
|
||||
|
||||
func ParseNotificationType(value string) (gtsmodel.NotificationType, gtserror.WithCode) {
|
||||
switch strings.ToLower(value) {
|
||||
case "follow":
|
||||
return gtsmodel.NotificationFollow, nil
|
||||
case "follow_request":
|
||||
return gtsmodel.NotificationFollowRequest, nil
|
||||
case "mention":
|
||||
return gtsmodel.NotificationMention, nil
|
||||
case "reblog":
|
||||
return gtsmodel.NotificationReblog, nil
|
||||
case "favourite":
|
||||
return gtsmodel.NotificationFave, nil
|
||||
case "poll":
|
||||
return gtsmodel.NotificationPoll, nil
|
||||
case "status":
|
||||
return gtsmodel.NotificationStatus, nil
|
||||
case "admin.sign_up":
|
||||
return gtsmodel.NotificationSignup, nil
|
||||
case "pending.favourite":
|
||||
return gtsmodel.NotificationPendingFave, nil
|
||||
case "pending.reply":
|
||||
return gtsmodel.NotificationPendingReply, nil
|
||||
case "pending.reblog":
|
||||
return gtsmodel.NotificationPendingReblog, nil
|
||||
default:
|
||||
text := fmt.Sprintf("unrecognized notification type %s", value)
|
||||
return 0, gtserror.NewErrorBadRequest(errors.New(text), text)
|
||||
}
|
||||
}
|
||||
|
||||
func ParseNotificationTypes(values []string) ([]gtsmodel.NotificationType, gtserror.WithCode) {
|
||||
if len(values) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
ntypes := make([]gtsmodel.NotificationType, len(values))
|
||||
for i, value := range values {
|
||||
ntype, errWithCode := ParseNotificationType(value)
|
||||
if errWithCode != nil {
|
||||
return nil, errWithCode
|
||||
}
|
||||
ntypes[i] = ntype
|
||||
}
|
||||
return ntypes, nil
|
||||
}
|
||||
|
||||
/*
|
||||
Parse functions for *REQUIRED* parameters.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user