From 4df72fb21cdda543117fd69e55b6df496579cd82 Mon Sep 17 00:00:00 2001
From: Flashy78 <90150289+Flashy78@users.noreply.github.com>
Date: Fri, 10 Feb 2023 14:28:31 -0800
Subject: [PATCH 1/5] Add config option for contributor guidelines url

---
 README.md                               |  1 +
 frontend/src/Main.tsx                   |  9 ++++
 frontend/src/graphql/queries/Config.gql |  1 +
 frontend/src/graphql/types.ts           |  2 +
 graphql/schema/types/config.graphql     |  1 +
 pkg/api/resolver.go                     |  1 +
 pkg/manager/config/config.go            |  6 +++
 pkg/models/generated_exec.go            | 62 +++++++++++++++++++++++++
 pkg/models/generated_models.go          |  1 +
 9 files changed, 84 insertions(+)

diff --git a/README.md b/README.md
index ee4f47b9a..656adbb22 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,7 @@ There are two ways to authenticate a user in Stash-box: a session or an API key.
 | `activation_expiry` | `7200` (2 hours) | The time - in seconds - after which an activation key (emailed to the user for email verification or password reset purposes) expires. |
 | `email_cooldown` | `300` (5 minutes) | The time - in seconds - that a user must wait before submitting an activation or reset password request for a specific email address. |
 | `default_user_roles` | `READ`, `VOTE`, `EDIT` | The roles assigned to new users when registering. This field must be expressed as a yaml array. |
+| `guidelines_url` | (none) | URL to link to a set of guidelines for users contributing edits. Should be in the form of `https://hostname.com`. |
 | `vote_promotion_threshold` | (none) | Number of approved edits before a user automatically has the `VOTE` role assigned. Leave empty to disable. |
 | `vote_application_threshold` | `3` | Number of same votes required for immediate application of an edit. Set to zero to disable automatic application. |
 | `voting_period` | `345600` | Time, in seconds, before a voting period is closed. |
diff --git a/frontend/src/Main.tsx b/frontend/src/Main.tsx
index 6b49ab922..ae3d87bd4 100644
--- a/frontend/src/Main.tsx
+++ b/frontend/src/Main.tsx
@@ -3,6 +3,7 @@ import { Navbar, Nav } from "react-bootstrap";
 import { NavLink, useLocation, useNavigate } from "react-router-dom";
 
 import SearchField, { SearchType } from "src/components/searchField";
+import { useConfig } from "src/graphql";
 import { getPlatformURL, getCredentialsSetting } from "src/utils/createClient";
 import { isAdmin, canEdit, userHref, setCachedUser } from "src/utils";
 import { useAuth } from "src/hooks";
@@ -33,6 +34,9 @@ const Main: FC<Props> = ({ children }) => {
   const location = useLocation();
   const navigate = useNavigate();
   const { loading, user } = useAuth();
+  const { data: configData } = useConfig();
+
+  const guidelinesURL = configData?.getConfig.guidelines_url;
 
   useEffect(() => {
     if (loading || user) return;
@@ -127,6 +131,11 @@ const Main: FC<Props> = ({ children }) => {
               Sites
             </NavLink>
           )}
+          {guidelinesURL && (
+            <a href={guidelinesURL} target="_blank" className="nav-link">
+              Guidelines
+            </a>
+          )}
         </Nav>
         <Nav className="align-items-center">
           {contextValue.authenticated && renderUserNav()}
diff --git a/frontend/src/graphql/queries/Config.gql b/frontend/src/graphql/queries/Config.gql
index 4d1778ab6..3b696cd4d 100644
--- a/frontend/src/graphql/queries/Config.gql
+++ b/frontend/src/graphql/queries/Config.gql
@@ -8,5 +8,6 @@ query Config {
     voting_period
     min_destructive_voting_period
     vote_cron_interval
+    guidelines_url
   }
 }
diff --git a/frontend/src/graphql/types.ts b/frontend/src/graphql/types.ts
index bbaa57d3f..7c89de19b 100644
--- a/frontend/src/graphql/types.ts
+++ b/frontend/src/graphql/types.ts
@@ -1502,6 +1502,7 @@ export enum SortDirectionEnum {
 
 export type StashBoxConfig = {
   __typename: "StashBoxConfig";
+  guidelines_url: Scalars["String"];
   host_url: Scalars["String"];
   min_destructive_voting_period: Scalars["Int"];
   require_activation: Scalars["Boolean"];
@@ -13874,6 +13875,7 @@ export type ConfigQuery = {
     voting_period: number;
     min_destructive_voting_period: number;
     vote_cron_interval: string;
+    guidelines_url: string;
   };
 };
 
diff --git a/graphql/schema/types/config.graphql b/graphql/schema/types/config.graphql
index 427de10f0..a3468300e 100644
--- a/graphql/schema/types/config.graphql
+++ b/graphql/schema/types/config.graphql
@@ -7,4 +7,5 @@ type StashBoxConfig {
   voting_period: Int!
   min_destructive_voting_period: Int!
   vote_cron_interval: String!
+  guidelines_url: String!
 }
diff --git a/pkg/api/resolver.go b/pkg/api/resolver.go
index 1ed749cfa..e2542696e 100644
--- a/pkg/api/resolver.go
+++ b/pkg/api/resolver.go
@@ -118,5 +118,6 @@ func (r *queryResolver) GetConfig(ctx context.Context) (*models.StashBoxConfig,
 		VotingPeriod:               config.GetVotingPeriod(),
 		MinDestructiveVotingPeriod: config.GetMinDestructiveVotingPeriod(),
 		VoteCronInterval:           config.GetVoteCronInterval(),
+		GuidelinesURL:              config.GetGuidelinesURL(),
 	}, nil
 }
diff --git a/pkg/manager/config/config.go b/pkg/manager/config/config.go
index 6e9f75efc..a281e089f 100644
--- a/pkg/manager/config/config.go
+++ b/pkg/manager/config/config.go
@@ -46,6 +46,8 @@ type config struct {
 	EmailCooldown     int      `mapstructure:"email_cooldown"`
 	DefaultUserRoles  []string `mapstructure:"default_user_roles"`
 
+	// URL link for contributor guidelines for submitting edits
+	GuidelinesURL string `mapstructure:"guidelines_url"`
 	// Number of approved edits before user automatically gets VOTE role
 	VotePromotionThreshold int `mapstructure:"vote_promotion_threshold"`
 	// Number of positive votes required for immediate approval
@@ -219,6 +221,10 @@ func GetHostURL() string {
 	return C.HostURL
 }
 
+func GetGuidelinesURL() string {
+	return C.GuidelinesURL
+}
+
 // GetImageLocation returns the path of where to locally store images.
 func GetImageLocation() string {
 	return C.ImageLocation
diff --git a/pkg/models/generated_exec.go b/pkg/models/generated_exec.go
index 4f43d32d5..4707ee139 100644
--- a/pkg/models/generated_exec.go
+++ b/pkg/models/generated_exec.go
@@ -475,6 +475,7 @@ type ComplexityRoot struct {
 	}
 
 	StashBoxConfig struct {
+		GuidelinesURL              func(childComplexity int) int
 		HostURL                    func(childComplexity int) int
 		MinDestructiveVotingPeriod func(childComplexity int) int
 		RequireActivation          func(childComplexity int) int
@@ -3403,6 +3404,13 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.Site.ValidTypes(childComplexity), true
 
+	case "StashBoxConfig.guidelines_url":
+		if e.complexity.StashBoxConfig.GuidelinesURL == nil {
+			break
+		}
+
+		return e.complexity.StashBoxConfig.GuidelinesURL(childComplexity), true
+
 	case "StashBoxConfig.host_url":
 		if e.complexity.StashBoxConfig.HostURL == nil {
 			break
@@ -4090,6 +4098,7 @@ var sources = []*ast.Source{
   voting_period: Int!
   min_destructive_voting_period: Int!
   vote_cron_interval: String!
+  guidelines_url: String!
 }
 `, BuiltIn: false},
 	{Name: "../../graphql/schema/types/draft.graphql", Input: `type DraftSubmissionStatus {
@@ -20996,6 +21005,8 @@ func (ec *executionContext) fieldContext_Query_getConfig(ctx context.Context, fi
 				return ec.fieldContext_StashBoxConfig_min_destructive_voting_period(ctx, field)
 			case "vote_cron_interval":
 				return ec.fieldContext_StashBoxConfig_vote_cron_interval(ctx, field)
+			case "guidelines_url":
+				return ec.fieldContext_StashBoxConfig_guidelines_url(ctx, field)
 			}
 			return nil, fmt.Errorf("no field named %q was found under type StashBoxConfig", field.Name)
 		},
@@ -25579,6 +25590,50 @@ func (ec *executionContext) fieldContext_StashBoxConfig_vote_cron_interval(ctx c
 	return fc, nil
 }
 
+func (ec *executionContext) _StashBoxConfig_guidelines_url(ctx context.Context, field graphql.CollectedField, obj *StashBoxConfig) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_StashBoxConfig_guidelines_url(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
+		ctx = rctx // use context from middleware stack in children
+		return obj.GuidelinesURL, nil
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		if !graphql.HasFieldError(ctx, fc) {
+			ec.Errorf(ctx, "must not be null")
+		}
+		return graphql.Null
+	}
+	res := resTmp.(string)
+	fc.Result = res
+	return ec.marshalNString2string(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_StashBoxConfig_guidelines_url(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "StashBoxConfig",
+		Field:      field,
+		IsMethod:   false,
+		IsResolver: false,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			return nil, errors.New("field of type String does not have child fields")
+		},
+	}
+	return fc, nil
+}
+
 func (ec *executionContext) _Studio_id(ctx context.Context, field graphql.CollectedField, obj *Studio) (ret graphql.Marshaler) {
 	fc, err := ec.fieldContext_Studio_id(ctx, field)
 	if err != nil {
@@ -40080,6 +40135,13 @@ func (ec *executionContext) _StashBoxConfig(ctx context.Context, sel ast.Selecti
 
 			out.Values[i] = ec._StashBoxConfig_vote_cron_interval(ctx, field, obj)
 
+			if out.Values[i] == graphql.Null {
+				invalids++
+			}
+		case "guidelines_url":
+
+			out.Values[i] = ec._StashBoxConfig_guidelines_url(ctx, field, obj)
+
 			if out.Values[i] == graphql.Null {
 				invalids++
 			}
diff --git a/pkg/models/generated_models.go b/pkg/models/generated_models.go
index f1833a20c..5dfeb712a 100644
--- a/pkg/models/generated_models.go
+++ b/pkg/models/generated_models.go
@@ -596,6 +596,7 @@ type StashBoxConfig struct {
 	VotingPeriod               int    `json:"voting_period"`
 	MinDestructiveVotingPeriod int    `json:"min_destructive_voting_period"`
 	VoteCronInterval           string `json:"vote_cron_interval"`
+	GuidelinesURL              string `json:"guidelines_url"`
 }
 
 type StringCriterionInput struct {

From c2dc0805ddf105fdd4fd878777ba6b7080d36819 Mon Sep 17 00:00:00 2001
From: Flashy78 <90150289+Flashy78@users.noreply.github.com>
Date: Sat, 11 Feb 2023 00:32:18 -0800
Subject: [PATCH 2/5] Adding noreferrer to link

---
 frontend/src/Main.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/Main.tsx b/frontend/src/Main.tsx
index ae3d87bd4..72975a8bc 100644
--- a/frontend/src/Main.tsx
+++ b/frontend/src/Main.tsx
@@ -132,7 +132,7 @@ const Main: FC<Props> = ({ children }) => {
             </NavLink>
           )}
           {guidelinesURL && (
-            <a href={guidelinesURL} target="_blank" className="nav-link">
+            <a href={guidelinesURL} target="_blank" rel="noopener noreferrer" className="nav-link">
               Guidelines
             </a>
           )}

From c9e4b35b185c113fb4db703f71848033f5633080 Mon Sep 17 00:00:00 2001
From: Flashy78 <90150289+Flashy78@users.noreply.github.com>
Date: Sat, 11 Feb 2023 00:47:13 -0800
Subject: [PATCH 3/5] Prettier

---
 frontend/src/Main.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Main.tsx b/frontend/src/Main.tsx
index 72975a8bc..6d2c7d680 100644
--- a/frontend/src/Main.tsx
+++ b/frontend/src/Main.tsx
@@ -132,7 +132,12 @@ const Main: FC<Props> = ({ children }) => {
             </NavLink>
           )}
           {guidelinesURL && (
-            <a href={guidelinesURL} target="_blank" rel="noopener noreferrer" className="nav-link">
+            <a
+              href={guidelinesURL}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="nav-link"
+            >
               Guidelines
             </a>
           )}

From 9c6e316ebf9c987c16542f2f7983b6f05a0bae00 Mon Sep 17 00:00:00 2001
From: InfiniteStash <117855276+InfiniteStash@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:40:42 +0000
Subject: [PATCH 4/5] Tweak

---
 frontend/src/Main.tsx         | 5 ++++-
 frontend/src/graphql/types.ts | 4 ++++
 pkg/models/generated_exec.go  | 4 +---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/src/Main.tsx b/frontend/src/Main.tsx
index 6d2c7d680..67ab5a61b 100644
--- a/frontend/src/Main.tsx
+++ b/frontend/src/Main.tsx
@@ -7,6 +7,8 @@ import { useConfig } from "src/graphql";
 import { getPlatformURL, getCredentialsSetting } from "src/utils/createClient";
 import { isAdmin, canEdit, userHref, setCachedUser } from "src/utils";
 import { useAuth } from "src/hooks";
+import { Icon} from "src/components/fragments";
+import { faBook, faUser } from "@fortawesome/free-solid-svg-icons";
 import {
   ROUTE_SCENES,
   ROUTE_PERFORMERS,
@@ -77,11 +79,11 @@ const Main: FC<Props> = ({ children }) => {
     contextValue.authenticated &&
     contextValue.user && (
       <>
-        <span>Logged in as</span>
         <NavLink
           to={userHref(contextValue.user)}
           className="nav-link ms-auto me-2"
         >
+          <Icon icon={faUser} className="me-2" />
           {contextValue.user.name}
         </NavLink>
         {isAdmin(user) && (
@@ -138,6 +140,7 @@ const Main: FC<Props> = ({ children }) => {
               rel="noopener noreferrer"
               className="nav-link"
             >
+              <Icon icon={faBook} className="mx-2" />
               Guidelines
             </a>
           )}
diff --git a/frontend/src/graphql/types.ts b/frontend/src/graphql/types.ts
index 3c952d57b..97f4010f0 100644
--- a/frontend/src/graphql/types.ts
+++ b/frontend/src/graphql/types.ts
@@ -39209,6 +39209,10 @@ export const ConfigDocument = {
                   kind: "Field",
                   name: { kind: "Name", value: "vote_cron_interval" },
                 },
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "guidelines_url" },
+                },
               ],
             },
           },
diff --git a/pkg/models/generated_exec.go b/pkg/models/generated_exec.go
index bbba4baa3..7cd6f9c3f 100644
--- a/pkg/models/generated_exec.go
+++ b/pkg/models/generated_exec.go
@@ -42314,11 +42314,9 @@ func (ec *executionContext) _StashBoxConfig(ctx context.Context, sel ast.Selecti
 				out.Invalids++
 			}
 		case "guidelines_url":
-
 			out.Values[i] = ec._StashBoxConfig_guidelines_url(ctx, field, obj)
-
 			if out.Values[i] == graphql.Null {
-				invalids++
+				out.Invalids++
 			}
 		default:
 			panic("unknown field " + strconv.Quote(field.Name))

From 39731219dcb498a664b7a1dfe63e7a9ce7154adf Mon Sep 17 00:00:00 2001
From: InfiniteStash <117855276+InfiniteStash@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:44:54 +0000
Subject: [PATCH 5/5] Format

---
 frontend/src/Main.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/Main.tsx b/frontend/src/Main.tsx
index 67ab5a61b..2287ea328 100644
--- a/frontend/src/Main.tsx
+++ b/frontend/src/Main.tsx
@@ -7,7 +7,7 @@ import { useConfig } from "src/graphql";
 import { getPlatformURL, getCredentialsSetting } from "src/utils/createClient";
 import { isAdmin, canEdit, userHref, setCachedUser } from "src/utils";
 import { useAuth } from "src/hooks";
-import { Icon} from "src/components/fragments";
+import { Icon } from "src/components/fragments";
 import { faBook, faUser } from "@fortawesome/free-solid-svg-icons";
 import {
   ROUTE_SCENES,