Add configurable edit update limits

README.md

@@ -76,6 +76,7 @@ There are two ways to authenticate a user in Stash-box: a session or an API key.
 | `voting_period` | `345600` | Time, in seconds, before a voting period is closed. |
 | `min_destructive_voting_period` | `172800` | Minimum time, in seconds, that needs to pass before a destructive edit can be immediately applied with sufficient positive votes. |
 | `vote_cron_interval` | `5m` | Time between runs to close edits whose voting periods have ended. |
+| `edit_update_limit` | `1` | Number of times an edit can be updated by the creator. |
 | `email_host` | (none) | Address of the SMTP server. Required to send emails for activation and recovery purposes. |
 | `email_port` | `25` | Port of the SMTP server. Only STARTTLS is supported. Direct TLS connections are not supported. |
 | `email_user` | (none) | Username for the SMTP server. Optional. |

frontend/src/components/editCard/EditCard.tsx

@@ -7,7 +7,7 @@ import { Icon, Tooltip } from "src/components/fragments";
 
 import { OperationEnum, EditFragment } from "src/graphql";
 
-import { formatDateTime, editHref, userHref } from "src/utils";
+import { formatDateTime, editHref, userHref, formatOrdinals } from "src/utils";
 import ModifyEdit from "./ModifyEdit";
 import EditComment from "./EditComment";
 import EditHeader from "./EditHeader";
@@ -78,6 +78,7 @@ const EditCardComponent: FC<Props> = ({ edit, showVotes = false }) => {
             <div>
               <b className="me-2">Updated:</b>
               <span>{formatDateTime(edit.updated)}</span>
+              <small className="text-muted align-text-top ms-2">{`${formatOrdinals(edit.update_count)} revision`}</small>
             </div>
           )}
         </div>

frontend/src/graphql/fragments/EditFragment.gql

@@ -17,6 +17,8 @@ fragment EditFragment on Edit {
   updated
   closed
   expires
+  update_count
+  updatable
   vote_count
   destructive
   comments {

frontend/src/graphql/queries/EditUpdate.gql

@@ -12,6 +12,8 @@ query EditUpdate($id: ID!) {
     applied
     created
     updated
+    updatable
+    update_count
     vote_count
     merge_sources {
       ... on Tag {

frontend/src/graphql/types.ts

@@ -160,6 +160,8 @@ export type Edit = {
   /** Object being edited - null if creating a new object */
   target?: Maybe<EditTarget>;
   target_type: TargetTypeEnum;
+  updatable: Scalars["Boolean"]["output"];
+  update_count: Scalars["Int"]["output"];
   updated?: Maybe<Scalars["Time"]["output"]>;
   user?: Maybe<User>;
   /**  = Accepted - Rejected */
@@ -1960,6 +1962,8 @@ export type EditFragment = {
   updated?: string | null;
   closed?: string | null;
   expires?: string | null;
+  update_count: number;
+  updatable: boolean;
   vote_count: number;
   destructive: boolean;
   comments: Array<{
@@ -3290,6 +3294,8 @@ export type ApplyEditMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -4515,6 +4521,8 @@ export type PerformerEditMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -5550,6 +5558,8 @@ export type PerformerEditUpdateMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -6629,6 +6639,8 @@ export type SceneEditMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -7664,6 +7676,8 @@ export type SceneEditUpdateMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -8698,6 +8712,8 @@ export type StudioEditMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -9733,6 +9749,8 @@ export type StudioEditUpdateMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -10767,6 +10785,8 @@ export type TagEditMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -11802,6 +11822,8 @@ export type TagEditUpdateMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -12980,6 +13002,8 @@ export type VoteMutation = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -14274,6 +14298,8 @@ export type EditQuery = {
     updated?: string | null;
     closed?: string | null;
     expires?: string | null;
+    update_count: number;
+    updatable: boolean;
     vote_count: number;
     destructive: boolean;
     comments: Array<{
@@ -15305,6 +15331,8 @@ export type EditUpdateQuery = {
     applied: boolean;
     created: string;
     updated?: string | null;
+    updatable: boolean;
+    update_count: number;
     vote_count: number;
     merge_sources: Array<
       | { __typename: "Performer"; id: string }
@@ -15747,6 +15775,8 @@ export type EditsQuery = {
       updated?: string | null;
       closed?: string | null;
       expires?: string | null;
+      update_count: number;
+      updatable: boolean;
       vote_count: number;
       destructive: boolean;
       comments: Array<{
@@ -17098,6 +17128,8 @@ export type QueryExistingSceneQuery = {
       updated?: string | null;
       closed?: string | null;
       expires?: string | null;
+      update_count: number;
+      updatable: boolean;
       vote_count: number;
       destructive: boolean;
       comments: Array<{
@@ -19372,6 +19404,8 @@ export const EditFragmentDoc = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -22152,6 +22186,8 @@ export const ApplyEditDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -24633,6 +24669,8 @@ export const PerformerEditDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -26242,6 +26280,8 @@ export const PerformerEditUpdateDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -28037,6 +28077,8 @@ export const SceneEditDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -29643,6 +29685,8 @@ export const SceneEditUpdateDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -31236,6 +31280,8 @@ export const StudioEditDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -32842,6 +32888,8 @@ export const StudioEditUpdateDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -34435,6 +34483,8 @@ export const TagEditDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -36041,6 +36091,8 @@ export const TagEditUpdateDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -38310,6 +38362,8 @@ export const VoteDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -40755,6 +40809,8 @@ export const EditDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -41910,6 +41966,11 @@ export const EditUpdateDocument = {
                 { kind: "Field", name: { kind: "Name", value: "applied" } },
                 { kind: "Field", name: { kind: "Name", value: "created" } },
                 { kind: "Field", name: { kind: "Name", value: "updated" } },
+                { kind: "Field", name: { kind: "Name", value: "updatable" } },
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "update_count" },
+                },
                 { kind: "Field", name: { kind: "Name", value: "vote_count" } },
                 {
                   kind: "Field",
@@ -43389,6 +43450,8 @@ export const EditsDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {
@@ -45862,6 +45925,8 @@ export const QueryExistingSceneDocument = {
           { kind: "Field", name: { kind: "Name", value: "updated" } },
           { kind: "Field", name: { kind: "Name", value: "closed" } },
           { kind: "Field", name: { kind: "Name", value: "expires" } },
+          { kind: "Field", name: { kind: "Name", value: "update_count" } },
+          { kind: "Field", name: { kind: "Name", value: "updatable" } },
           { kind: "Field", name: { kind: "Name", value: "vote_count" } },
           { kind: "Field", name: { kind: "Name", value: "destructive" } },
           {

frontend/src/pages/edits/Edit.tsx

@@ -81,15 +81,13 @@ const EditComponent: FC = () => {
   const buttons = (isAdmin(auth.user) || auth.user?.id === edit.user?.id) &&
     edit.status === VoteStatusEnum.PENDING && (
       <div className="d-flex justify-content-end">
-        {auth.user?.id === edit.user?.id &&
-          edit.operation !== OperationEnum.DESTROY &&
-          !edit.updated && (
-            <Link to={createHref(ROUTE_EDIT_UPDATE, edit)} className="me-2">
-              <Button variant="primary" disabled={mutating}>
-                Update Edit
-              </Button>
-            </Link>
-          )}
+        {edit.updatable && (
+          <Link to={createHref(ROUTE_EDIT_UPDATE, edit)} className="me-2">
+            <Button variant="primary" disabled={mutating}>
+              Update Edit
+            </Button>
+          </Link>
+        )}
         <Button
           variant="danger"
           className="me-2"

frontend/src/pages/edits/EditUpdate.tsx

@@ -1,29 +1,22 @@
-import { FC, useContext } from "react";
+import { FC } from "react";
 import { useParams } from "react-router-dom";
 
-import { useEditUpdate, TargetTypeEnum, OperationEnum } from "src/graphql";
-import AuthContext from "src/AuthContext";
+import { useEditUpdate, TargetTypeEnum } from "src/graphql";
 import { ErrorMessage, LoadingIndicator } from "src/components/fragments";
 import { SceneEditUpdate } from "src/pages/scenes/SceneEditUpdate";
 import { PerformerEditUpdate } from "src/pages/performers/PerformerEditUpdate";
 import { TagEditUpdate } from "src/pages/tags/TagEditUpdate";
 import { StudioEditUpdate } from "src/pages/studios/StudioEditUpdate";
 
 const EditUpdateComponent: FC = () => {
-  const auth = useContext(AuthContext);
   const { id } = useParams();
   const { data, loading } = useEditUpdate({ id: id ?? "" }, !id);
 
   if (loading) return <LoadingIndicator message="Loading..." />;
 
   const edit = data?.findEdit;
   if (!edit) return <ErrorMessage error="Failed to load edit." />;
-  if (edit.user?.id != auth.user?.id)
-    return <ErrorMessage error="Only the creator can update edits." />;
-  if (edit.updated)
-    return <ErrorMessage error="Edits can only be updated once." />;
-  if (edit.operation === OperationEnum.DESTROY)
-    return <ErrorMessage error="Destroy edits can't be edited." />;
+  if (!edit.updatable) return <ErrorMessage error="Unable to update edit" />;
 
   switch (edit.target_type) {
     case TargetTypeEnum.SCENE:

frontend/src/utils/index.ts

@@ -10,3 +10,4 @@ export * from "./enum";
 export * from "./user";
 export * from "./diff";
 export * from "./data";
+export * from "./intl";