mirror/PrivateCaptcha
1
0
Fork 0
mirror of https://github.com/PrivateCaptcha/PrivateCaptcha.git synced 2026-02-14 18:48:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix misaligned property levels in settings

Browse Source
This commit is contained in:
Taras Kushnir
2025-10-11 09:26:58 +03:00
parent 048ddd9f27
commit b23ab1ff49
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/portal/property.go
View File

@@ -104,8 +104,10 @@ type propertySettingsRenderContext struct {
func (pc *propertySettingsRenderContext) UpdateLevels() {
const epsilon = common.DifficultyDelta
pc.MinLevel = max(1, min(pc.EasyLevel-epsilon, int(pc.Property.Level)-epsilon))
pc.MaxLevel = min(int(common.MaxDifficultyLevel), max(pc.HardLevel+epsilon, int(pc.Property.Level)+epsilon))
pc.MinLevel = max(1, pc.EasyLevel-epsilon)
pc.MaxLevel = min(int(common.MaxDifficultyLevel), pc.HardLevel+epsilon)
pc.Property.Level = max(pc.MinLevel, min(pc.MaxLevel, pc.Property.Level))
}
type propertyIntegrationsRenderContext struct {
@@ -234,7 +236,7 @@ func parseMaxReplayCount(ctx context.Context, value string) int32 {
return max(minValue, min(int32(i), maxValue))
}
func difficultyLevelFromValue(ctx context.Context, value string) common.DifficultyLevel {
func difficultyLevelFromValue(ctx context.Context, value string, minLevel, maxLevel int) common.DifficultyLevel {
i, err := strconv.Atoi(value)
if err != nil {
slog.ErrorContext(ctx, "Failed to convert difficulty level", "value", value, common.ErrAttr(err))
@@ -245,7 +247,7 @@ func difficultyLevelFromValue(ctx context.Context, value string) common.Difficul
return common.DifficultyLevelMedium
}
return common.DifficultyLevel(i)
return common.DifficultyLevel(max(minLevel, min(maxLevel, i)))
}
func (s *Server) getNewOrgProperty(w http.ResponseWriter, r *http.Request) (Model, string, error) {
@@ -450,7 +452,7 @@ func (s *Server) echoPuzzle(w http.ResponseWriter, r *http.Request) {
var level common.DifficultyLevel
if difficultyParam, err := common.StrPathArg(r, common.ParamDifficulty); err == nil {
level = difficultyLevelFromValue(ctx, difficultyParam)
level = difficultyLevelFromValue(ctx, difficultyParam, 1, int(common.MaxDifficultyLevel))
} else {
slog.ErrorContext(ctx, "Failed to retrieve difficulty argument", common.ErrAttr(err))
level = common.DifficultyLevelSmall
@@ -794,7 +796,7 @@ func (s *Server) putProperty(w http.ResponseWriter, r *http.Request) (Model, str
}
}
difficulty := difficultyLevelFromValue(ctx, r.FormValue(common.ParamDifficulty))
difficulty := difficultyLevelFromValue(ctx, r.FormValue(common.ParamDifficulty), renderCtx.MinLevel, renderCtx.MaxLevel)
growth := growthLevelFromIndex(ctx, r.FormValue(common.ParamGrowth))
validityInterval := validityIntervalFromIndex(ctx, r.FormValue(common.ParamValidityInterval))
_, allowSubdomains := r.Form[common.ParamAllowSubdomains]

4
web/layouts/property/settings-basic-form.html
View File

@@ -119,10 +119,10 @@
</div>
<div class="col-span-full">
<label for="{{ .Const.Difficulty }}" class="pc-internal-form-label tooltip" data-tooltip="Initial difficulty for any captcha request"> Base difficulty </label>
<label for="{{ .Const.Difficulty }}" class="pc-internal-form-label tooltip" data-tooltip="Initial difficulty for any captcha request. Steps are exponential."> Base difficulty </label>
<div class="mt-2">
<div class="flex flex-col space-y-2 py-2">
<input name="{{ .Const.Difficulty }}" type="range" class="w-full accent-pclime-600" min="{{$.Params.MinLevel}}" max="{{$.Params.MaxLevel}}" step="1" value="{{$.Params.Property.Level}}" list="steplist" onchange="onDifficultyChange(this)" {{ if not .Params.CanEdit }}disabled{{ end }}/>
<input name="{{ .Const.Difficulty }}" type="range" class="w-full accent-pclime-600" min="{{$.Params.MinLevel}}" max="{{$.Params.MaxLevel}}" step="1" value="{{$.Params.Property.Level}}" list="steplist" onchange="onDifficultyChange(this)" title="{{$.Params.Property.Level}}" oninput="this.title = this.value" {{ if not .Params.CanEdit }}disabled{{ end }}/>
<datalist id="steplist" class="flex justify-evenly w-full">
<option value="{{$.Params.EasyLevel}}" label="Easy" class="translate-x-1/2"></option>
<option value="{{$.Params.NormalLevel}}" label="Normal"></option>