diff --git a/model/ability.go b/model/ability.go index 7a81cc2..b79978d 100644 --- a/model/ability.go +++ b/model/ability.go @@ -147,7 +147,12 @@ func FixAbility() (int, error) { return 0, err } var channels []Channel - err = DB.Where("id NOT IN (?)", abilityChannelIds).Find(&channels).Error + + if len(abilityChannelIds) == 0 { + err = DB.Find(&channels).Error + } else { + err = DB.Where("id NOT IN (?)", abilityChannelIds).Find(&channels).Error + } if err != nil { return 0, err } diff --git a/service/midjourney.go b/service/midjourney.go index 06730c8..c04c4d3 100644 --- a/service/midjourney.go +++ b/service/midjourney.go @@ -45,7 +45,7 @@ func GetMjRequestModel(relayMode int, midjRequest *dto.MidjourneyRequest) (strin case relayconstant.RelayModeMidjourneyTaskFetch, relayconstant.RelayModeMidjourneyTaskFetchByCondition, relayconstant.RelayModeMidjourneyNotify: return "", nil, true default: - return "", MidjourneyErrorWrapper(constant.MjRequestError, "unknown_action"), false + return "", MidjourneyErrorWrapper(constant.MjRequestError, "unknown_relay_action"), false } } modelName := CoverActionToModelName(action) @@ -93,6 +93,9 @@ func CoverPlusActionToNormalAction(midjRequest *dto.MidjourneyRequest) *dto.Midj } else if strings.Contains(action, "pan") { midjRequest.Action = constant.MjActionPan midjRequest.Index = 1 + } else if strings.Contains(action, "reroll") { + midjRequest.Action = constant.MjActionReRoll + midjRequest.Index = 1 } else if action == "Outpaint" || action == "CustomZoom" { midjRequest.Action = constant.MjActionZoom midjRequest.Index = 1 @@ -100,7 +103,7 @@ func CoverPlusActionToNormalAction(midjRequest *dto.MidjourneyRequest) *dto.Midj midjRequest.Action = constant.MjActionInPaintPre midjRequest.Index = 1 } else { - return MidjourneyErrorWrapper(constant.MjRequestError, "unknown_action") + return MidjourneyErrorWrapper(constant.MjRequestError, "unknown_action:"+customId) } return nil } diff --git a/web/src/pages/Channel/EditChannel.js b/web/src/pages/Channel/EditChannel.js index 225ce3f..757b56c 100644 --- a/web/src/pages/Channel/EditChannel.js +++ b/web/src/pages/Channel/EditChannel.js @@ -110,7 +110,7 @@ const EditChannel = (props) => { 'mj_zoom', 'mj_shorten', 'mj_inpaint_pre', - 'mj_inpaint_pre', + 'mj_inpaint', 'mj_high_variation', 'mj_low_variation', 'mj_pan',