nominationCount only used with discussionsState

Author: notbakaneko

resources/js/beatmap-discussions/discussions-state.ts

@@ -4,7 +4,7 @@
 import BeatmapsetDiscussionJson from 'interfaces/beatmapset-discussion-json';
 import BeatmapsetWithDiscussionsJson from 'interfaces/beatmapset-with-discussions-json';
 import GameMode from 'interfaces/game-mode';
-import { maxBy } from 'lodash';
+import { maxBy, sum } from 'lodash';
 import { action, computed, makeObservable, observable, reaction } from 'mobx';
 import moment from 'moment';
 import core from 'osu-core-singleton';
@@ -400,6 +400,25 @@ export default class DiscussionsState {
     }
   }
 
+  nominationsCount(type: 'current' | 'required') {
+    const nominations = this.beatmapset.nominations;
+    if (nominations.legacy_mode) {
+      return nominations[type];
+    }
+
+    if (type === 'current' || this.calculatedMainRuleset == null) {
+      return sum(Object.values(nominations[type]));
+    }
+
+    let total = 0;
+
+    Object.entries(nominations[type]).forEach(([ruleset, count]) =>
+      ruleset === this.calculatedMainRuleset ? total = total + count : ++total,
+    );
+
+    return total;
+  }
+
   saveState() {
     storeJson(jsonId, this.toJson());
   }

resources/js/beatmap-discussions/editor.tsx

@@ -19,7 +19,6 @@ import { Editable, ReactEditor, RenderElementProps, RenderLeafProps, Slate, with
 import { DOMRange } from 'slate-react/dist/utils/dom';
 import { onError } from 'utils/ajax';
 import { timestampRegex } from 'utils/beatmapset-discussion-helper';
-import { nominationsCount } from 'utils/beatmapset-helper';
 import { classWithModifiers } from 'utils/css';
 import { trans } from 'utils/lang';
 import DiscussionsState from './discussions-state';
@@ -440,7 +439,7 @@ export default class Editor extends React.Component<Props, State> {
     const canReset = core.currentUser != null && (core.currentUser.is_admin || core.currentUser.is_nat || core.currentUser.is_bng);
     const willReset =
       this.beatmapset.status === 'pending'
-        && nominationsCount(this.beatmapset.nominations, 'current', this.props.discussionsState.calculatedMainRuleset) > 0
+        && this.props.discussionsState.nominationsCount('current') > 0
         && docContainsProblem;
 
     if (canDisqualify && willDisqualify) {

resources/js/beatmap-discussions/new-discussion.tsx

@@ -17,7 +17,7 @@ import core from 'osu-core-singleton';
 import * as React from 'react';
 import { onError } from 'utils/ajax';
 import { canModeratePosts, formatTimestamp, makeUrl, NearbyDiscussion, nearbyDiscussions, parseTimestamp, validMessageLength } from 'utils/beatmapset-discussion-helper';
-import { downloadLimited, nominationsCount } from 'utils/beatmapset-helper';
+import { downloadLimited } from 'utils/beatmapset-helper';
 import { classWithModifiers } from 'utils/css';
 import { InputEventType, makeTextAreaHandler } from 'utils/input-handler';
 import { joinComponents, trans } from 'utils/lang';
@@ -270,7 +270,7 @@ export class NewDiscussion extends React.Component<Props> {
     if (canDisqualify && willDisqualify) return 'disqualify';
 
     const canReset = core.currentUser?.is_admin || core.currentUser?.is_nat || core.currentUser?.is_bng;
-    const currentNominations = nominationsCount(this.beatmapset.nominations, 'current', this.props.discussionsState.calculatedMainRuleset);
+    const currentNominations = this.props.discussionsState.nominationsCount('current');
     const willReset = this.beatmapset.status === 'pending' && currentNominations > 0;
 
     if (canReset && willReset) return 'nomination_reset';

resources/js/beatmap-discussions/nominations.tsx

@@ -26,7 +26,6 @@ import core from 'osu-core-singleton';
 import * as React from 'react';
 import { onError } from 'utils/ajax';
 import { canModeratePosts, makeUrl, startingPost } from 'utils/beatmapset-discussion-helper';
-import { nominationsCount } from 'utils/beatmapset-helper';
 import { classWithModifiers } from 'utils/css';
 import { formatNumber } from 'utils/html';
 import { joinComponents, trans, transExists } from 'utils/lang';
@@ -538,7 +537,7 @@ export class Nominations extends React.Component<Props> {
       <div>
         <div className={`${bn}__header`}>
           <span className={`${bn}__title`}>{trans('beatmaps.nominations.title')}</span>
-          <span>{formatNumber(nominationsCount(nominations, 'current'))} / {formatNumber(nominationsCount(nominations, 'required', this.props.discussionsState.calculatedMainRuleset))}</span>
+          <span>{formatNumber(this.props.discussionsState.nominationsCount('current'))} / {this.props.discussionsState.nominationsCount('required')}</span>
         </div>
         {this.renderLightsForNominations(nominations)}
       </div>

resources/js/utils/beatmapset-helper.ts

@@ -1,10 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-import BeatmapsetJson, { BeatmapsetNominationsInterface } from 'interfaces/beatmapset-json';
-import GameMode from 'interfaces/game-mode';
+import BeatmapsetJson from 'interfaces/beatmapset-json';
 import { route } from 'laroute';
-import { sum } from 'lodash';
 import { action, runInAction } from 'mobx';
 import core from 'osu-core-singleton';
 import { error } from 'utils/ajax';
@@ -36,24 +34,6 @@ export function getTitle(beatmapset: BeatmapsetJson) {
   return beatmapset.title;
 }
 
-export function nominationsCount(nominations: BeatmapsetNominationsInterface, type: 'current' | 'required', mainRuleset?: GameMode | null): number {
-  if (nominations.legacy_mode) {
-    return nominations[type];
-  }
-
-  if (type === 'current' || mainRuleset == null) {
-    return sum(Object.values(nominations[type]));
-  }
-
-  let total = 0;
-
-  Object.entries(nominations[type]).forEach(([ruleset, count]) =>
-    ruleset === mainRuleset ? total = total + count : ++total,
-  );
-
-  return total;
-}
-
 export function showVisual(beatmapset: BeatmapsetJson) {
   return !beatmapset.nsfw || core.userPreferences.get('beatmapset_show_nsfw');
 }