Consolidated

Signed-off-by: Minecon724 <minecon724@noreply.git.m724.eu>

ABOUT-FORK.md

@@ -0,0 +1,25 @@
+## FORK
+
+This is a fork of Forgejo.
+
+This fork doesn't add any specialized features. It adds things that should be in Forgejo, but aren't.
+
+This fork is based on a release. There's no master branch. Patches of this fork do not follow releases; because of scope, they're released immediately.
+
+This fork is a drop-in replacement. You can switch back and forth, as there are no breaking changes.
+
+### Features
+
+- Privacy Policy support
+  - Consent checkbox
+  - Footer link
+  - Configured with `service.PRIVACY_POLICY_URL`
+- Captcha tweaks
+  - Shorter: 4-5 instead of 6 digits
+  - Bigger
+  - Fixed colors on dark theme
+- Aesthetics
+
+### Builds
+
+Docker builds [are available here](https://hub.docker.com/r/minecon724/forgejo724) for amd64 and arm64.

README.md

@@ -1,3 +1,9 @@
+## FORK
+
+This is a fork of Forgejo. [Read more here.](ABOUT-FORK.md)
+
+
+
 <div align="center">
     <img src="./assets/logo.svg" alt="" width="192" align="center" />
     <h1 align="center">Welcome to Forgejo</h1>

modules/setting/service.go

@@ -85,6 +85,7 @@ var Service = struct {
 	DefaultOrgMemberVisible                 bool
 	UserDeleteWithCommentsMaxTime           time.Duration
 	ValidSiteURLSchemes                     []string
+	PrivacyPolicyURL                        string
 
 	// OpenID settings
 	EnableOpenIDSignIn bool
@@ -263,6 +264,8 @@ func loadServiceFrom(rootCfg ConfigProvider) {
 	}
 	Service.ValidSiteURLSchemes = schemes
 
+	Service.PrivacyPolicyURL = sec.Key("PRIVACY_POLICY_URL").MustString("")
+
 	mustMapSetting(rootCfg, "service.explore", &Service.Explore)
 
 	loadOpenIDSetting(rootCfg)

modules/web/middleware/data.go

@@ -59,5 +59,6 @@ func CommonTemplateContextData() ContextData {
 		"PageStartTime":      time.Now(),
 
 		"RunModeIsProd":    setting.IsProd,
+		"PrivacyPolicyURL": setting.Service.PrivacyPolicyURL,
 	}
 }

options/locale/locale_en-US.ini

@@ -28,6 +28,7 @@ licenses = Licenses
 return_to_forgejo = Return to Forgejo
 toggle_menu = Toggle menu
 more_items = More items
+privacy_policy = Privacy Policy
 
 username = Username
 email = Email address
@@ -38,6 +39,7 @@ captcha = CAPTCHA
 twofa = Two-factor authentication
 twofa_scratch = Two-factor scratch code
 passcode = Passcode
+consent_agree = I agree to the <a href="%s">Privacy Policy</a>
 
 webauthn_insert_key = Insert your security key
 webauthn_sign_in = Press the button on your security key. If your security key has no button, re-insert it.
@@ -485,6 +487,7 @@ password_pwned_err = Could not complete request to HaveIBeenPwned
 last_admin = You cannot remove the last admin. There must be at least one admin.
 back_to_sign_in = Back to Sign in
 sign_in_openid = Proceed with OpenID
+must_consent = Agreement to our Privacy Policy is required to register.
 
 [mail]
 view_it_on = View it on %s

routers/web/auth/auth.go

@@ -479,6 +479,12 @@ func SignUpPost(ctx *context.Context) {
 		ctx.RenderWithErr(password.BuildComplexityError(ctx.Locale), tplSignUp, &form)
 		return
 	}
+
+	if !form.Consent {
+		ctx.RenderWithErr(ctx.Tr("auth.must_consent"), tplSignUp, &form)
+		return
+	} // consent is required before sending password anywhere
+
 	if err := password.IsPwned(ctx, form.Password); err != nil {
 		errMsg := ctx.Tr("auth.password_pwned", "https://haveibeenpwned.com/Passwords")
 		if password.IsErrIsPwnedRequest(err) {

services/context/captcha.go

@@ -5,6 +5,7 @@ package context
 
 import (
 	"fmt"
+	"math/rand"
 	"sync"
 
 	"code.gitea.io/gitea/modules/base"
@@ -55,7 +56,9 @@ func GetImageCaptcha() string {
 	imageCaptchaOnce.Do(func() {
 		captcha.SetCustomStore(&imageCaptchaStore{c: cache.GetCache()})
 	})
-	return captcha.New()
+
+	length := 4 + rand.Intn(2) // 4 or 5 chars
+	return captcha.NewLen(length)
 }
 
 // SetCaptchaData sets common captcha data

services/forms/user_form.go

@@ -96,6 +96,7 @@ type RegisterForm struct {
 	Email    string `binding:"Required;MaxSize(254)"`
 	Password string `binding:"MaxSize(255)"`
 	Retype   string
+	Consent  bool
 }
 
 // Validate validates the fields

templates/base/footer_content.tmpl

@@ -4,11 +4,10 @@
 			<a target="_blank" rel="noopener noreferrer" href="https://forgejo.org">{{ctx.Locale.Tr "powered_by" "Forgejo"}}</a>
 		{{end}}
 		{{if (or .ShowFooterVersion .PageIsAdmin)}}
-			{{ctx.Locale.Tr "version"}}:
 			{{if .IsAdmin}}
-				<a href="{{AppSubUrl}}/admin/config">{{AppVer}}</a>
+				<a href="{{AppSubUrl}}/admin/config">v{{AppVer}}</a>
 			{{else}}
-				{{AppVerNoMetadata}}
+				v{{AppVerNoMetadata}}
 			{{end}}
 		{{end}}
 		{{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}}
@@ -26,7 +25,7 @@
 			</div>
 		</div>
 		<a href="{{AssetUrlPrefix}}/licenses.txt">{{ctx.Locale.Tr "licenses"}}</a>
-		{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
+		{{if .PrivacyPolicyURL}}<a href="{{.PrivacyPolicyURL}}">{{ctx.Locale.Tr "privacy_policy"}}</a>{{end}}
 		{{template "custom/extra_links_footer" .}}
 	</div>
 </footer>

templates/user/auth/signup_inner.tmpl

@@ -37,6 +37,17 @@
 
 				{{template "user/auth/captcha" .}}
 
+				{{ if (.PrivacyPolicyURL) }}
+						<div class="inline field required">
+						  <div class="ui checkbox">
+            	  <input id="consent" name="consent" type="checkbox">
+           		  <label for="consent">{{ ctx.Locale.Tr "consent_agree" .PrivacyPolicyURL }}</label>
+              </div>
+            </div>
+				{{ else }}
+					<input id="consent" name="consent" type="checkbox" checked hidden>
+        {{ end }}
+
 				<div class="inline field">
 					<button class="ui primary button tw-w-full">
 						{{if .LinkAccountMode}}

web_src/css/base.css

@@ -372,6 +372,7 @@ a.label,
   color: var(--color-text);
   user-select: auto;
   line-height: var(--line-height-default); /* fomantic uses "1" which causes overflow problems because "1" doesn't consider the descent part */
+  transition: none;
 }
 
 .ui.menu .item > .svg {

web_src/css/form.css

@@ -47,9 +47,16 @@ fieldset label + .ui.dropdown {
 
 fieldset label > input[type="checkbox"],
 fieldset label > input[type="radio"] {
-  margin-right: 0.75em;
+  margin-right: 0.5em;
   margin-top: 0 !important;
   vertical-align: initial !important; /* overrides a semantic.css rule, remove when obsolete */
+  cursor: pointer;
+}
+
+
+fieldset label:has(input[type="checkbox"]),
+fieldset label:has(input[type="radio"]) {
+  cursor: pointer;
 }
 
 @media (min-width: 768px) {
@@ -334,6 +341,11 @@ input:-webkit-autofill:active,
   display: inline-block;
 }
 
+
+.captcha-img {
+  width: min(30em, 100%);
+}
+
 @media (min-width: 768px) {
   .g-recaptcha-style,
   .h-captcha-style {

web_src/css/home.css

@@ -70,7 +70,7 @@
 .page-footer .right-links > a {
   border-left: 1px solid var(--color-secondary-dark-1);
   padding-left: 8px;
-  margin-left: 5px;
+  margin-left: 8px;
 }
 
 .page-footer .ui.dropdown.language .menu {

web_src/css/markup/dark.css

@@ -11,3 +11,10 @@
 .markup [href$="#dark-mode-only"] {
   display: unset;
 }
+
+
+/* The reason we're doing this *here* is because dark vanilla templates always use this file, and there's no other way to detect dark theme */
+
+.captcha-img {
+  filter: invert();
+}

web_src/css/modules/button.css

@@ -5,6 +5,7 @@
   background: var(--color-button);
   border: 1px solid var(--color-light-border);
   color: var(--color-text);
+  transition: none;
 }
 
 .ui.button:hover,

web_src/css/modules/checkbox.css

@@ -41,7 +41,8 @@ input[type="radio"] {
 
 .ui.checkbox label,
 .ui.radio.checkbox label {
-  margin-left: 1.85714em;
+  padding-left: 1.85714em;
+  cursor: pointer;
 }
 
 .ui.checkbox + label {

web_src/css/themes/theme-forgejo-dark.css

@@ -231,7 +231,7 @@
   --color-markup-table-row: #ffffff06;
   --color-markup-code-block: var(--steel-800);
   --color-markup-code-inline: var(--steel-850);
-  --color-button: var(--steel-600);
+  --color-button: var(--steel-650);
   --color-code-bg: var(--steel-750);
   --color-shadow: #00000060;
   --color-secondary-bg: var(--steel-700);

web_src/css/themes/theme-forgejo-light.css

@@ -247,7 +247,7 @@
   --color-markup-table-row: #ffffff06;
   --color-markup-code-block: var(--zinc-150);
   --color-markup-code-inline: var(--zinc-200);
-  --color-button: var(--zinc-150);
+  --color-button: var(--zinc-100);
   --color-code-bg: var(--zinc-50);
   --color-shadow: #00000060;
   --color-secondary-bg: var(--zinc-100);