export a toJson version of deletedUser

resources/js/beatmap-discussions-history/main.tsx

@@ -10,7 +10,7 @@ import BeatmapsetDiscussionsBundleJson from 'interfaces/beatmapset-discussions-b
 import { isEmpty, keyBy } from 'lodash';
 import { computed, makeObservable } from 'mobx';
 import { observer } from 'mobx-react';
-import { deletedUser } from 'models/user';
+import { deletedUserJson } from 'models/user';
 import * as React from 'react';
 import { makeUrl } from 'utils/beatmapset-discussion-helper';
 import { trans } from 'utils/lang';
@@ -43,7 +43,7 @@ export default class Main extends React.Component<Props> {
   private get users() {
     const values = keyBy(this.props.bundle.users, 'id');
     // eslint-disable-next-line id-blacklist
-    values.null = values.undefined = deletedUser.toJson();
+    values.null = values.undefined = deletedUserJson;
 
     return values;
   }

resources/js/beatmap-discussions/beatmaps-owner-editor.tsx

@@ -5,7 +5,7 @@ import BeatmapsetExtendedJson from 'interfaces/beatmapset-extended-json';
 import UserJson from 'interfaces/user-json';
 import { makeObservable, observable } from 'mobx';
 import { observer } from 'mobx-react';
-import { deletedUser, normaliseUsername } from 'models/user';
+import { deletedUserJson, normaliseUsername } from 'models/user';
 import * as React from 'react';
 import { group as groupBeatmaps } from 'utils/beatmap-helper';
 import { trans } from 'utils/lang';
@@ -17,8 +17,6 @@ interface Props {
   users: Partial<Record<number, UserJson>>;
 }
 
-const deletedUserJson = deletedUser.toJson();
-
 @observer
 export default class BeatmapsOwnerEditor extends React.Component<Props> {
   @observable userByName = new Map<string, UserJson>();

resources/js/beatmap-discussions/discussion.tsx

@@ -9,7 +9,7 @@ import UserJson from 'interfaces/user-json';
 import { findLast } from 'lodash';
 import { action, computed, makeObservable } from 'mobx';
 import { observer } from 'mobx-react';
-import { deletedUser } from 'models/user';
+import { deletedUserJson } from 'models/user';
 import core from 'osu-core-singleton';
 import * as React from 'react';
 import { badgeGroup, canModeratePosts, formatTimestamp, makeUrl, startingPost } from 'utils/beatmapset-discussion-helper';
@@ -114,7 +114,7 @@ export class Discussion extends React.Component<Props> {
 
     this.lastResolvedState = false;
 
-    const user = this.props.users[this.props.discussion.user_id] ?? deletedUser.toJson();
+    const user = this.props.users[this.props.discussion.user_id] ?? deletedUserJson;
     const group = badgeGroup({
       beatmapset: this.props.beatmapset,
       currentBeatmap: this.props.currentBeatmap,
@@ -213,7 +213,7 @@ export class Discussion extends React.Component<Props> {
   }
 
   private renderPost(post: BeatmapsetDiscussionPostJson, type: 'discussion' | 'reply') {
-    const user = this.props.users[post.user_id] ?? deletedUser.toJson();
+    const user = this.props.users[post.user_id] ?? deletedUserJson;
 
     if (post.system) {
       return (

resources/js/beatmap-discussions/main.coffee

@@ -515,7 +515,7 @@ export class Main extends React.PureComponent
   users: =>
     if !@cache.users?
       @cache.users = _.keyBy @state.beatmapset.related_users, 'id'
-      @cache.users[null] = @cache.users[undefined] = deletedUser.toJson()
+      @cache.users[null] = @cache.users[undefined] = deletedUserJson
 
     @cache.users
 

resources/js/beatmap-discussions/post.tsx

@@ -22,7 +22,7 @@ import { route } from 'laroute';
 import { isEqual } from 'lodash';
 import { action, autorun, computed, makeObservable, observable, runInAction } from 'mobx';
 import { disposeOnUnmount, observer } from 'mobx-react';
-import { deletedUser } from 'models/user';
+import { deletedUser, deletedUserJson } from 'models/user';
 import core from 'osu-core-singleton';
 import * as React from 'react';
 import TextareaAutosize from 'react-autosize-textarea';
@@ -247,7 +247,7 @@ export default class Post extends React.Component<Props> {
       return null;
     }
 
-    const lastEditor = this.props.users[this.props.post.last_editor_id] ?? deletedUser.toJson();
+    const lastEditor = this.props.users[this.props.post.last_editor_id] ?? deletedUserJson;
 
     return (
       <span className={`${bn}__info`}>

resources/js/modding-profile/main.tsx

@@ -20,7 +20,7 @@ import { first, isEmpty, keyBy, last, throttle } from 'lodash';
 import { action, computed, makeObservable, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import Kudosu from 'modding-profile/kudosu';
-import { deletedUser } from 'models/user';
+import { deletedUserJson } from 'models/user';
 import core from 'osu-core-singleton';
 import Badges from 'profile-page/badges';
 import Cover from 'profile-page/cover';
@@ -122,7 +122,7 @@ export default class Main extends React.Component<Props> {
   private get users() {
     const values = keyBy(this.props.users, 'id');
     // eslint-disable-next-line id-blacklist
-    values.null = values.undefined = deletedUser.toJson();
+    values.null = values.undefined = deletedUserJson;
 
     return values;
   }

resources/js/modding-profile/posts.tsx

@@ -6,7 +6,7 @@ import BeatmapsetCover from 'components/beatmapset-cover';
 import { BeatmapsetDiscussionMessagePostJson } from 'interfaces/beatmapset-discussion-post-json';
 import UserJson from 'interfaces/user-json';
 import { route } from 'laroute';
-import { deletedUser } from 'models/user';
+import { deletedUserJson } from 'models/user';
 import * as React from 'react';
 import { makeUrl } from 'utils/beatmapset-discussion-helper';
 import { classWithModifiers } from 'utils/css';
@@ -84,7 +84,7 @@ export class Posts extends React.Component<Props> {
               readonly
               resolvedSystemPostId={-1} // TODO: Can probably move to context after refactoring state?
               type='reply'
-              user={this.props.users[post.user_id] ?? deletedUser.toJson()}
+              user={this.props.users[post.user_id] ?? deletedUserJson}
               users={this.props.users}
             />
           </div>

resources/js/models/user.ts

@@ -86,6 +86,9 @@ const deletedUser = new User(-1);
 deletedUser.isDeleted = true;
 deletedUser.username = trans('users.deleted');
 
+const deletedUserJson = deletedUser.toJson();
+
 export {
   deletedUser,
+  deletedUserJson,
 };

resources/js/register-components.tsx

@@ -21,7 +21,7 @@ import { UserCards } from 'components/user-cards';
 import { WikiSearch } from 'components/wiki-search';
 import { keyBy } from 'lodash';
 import { observable } from 'mobx';
-import { deletedUser } from 'models/user';
+import { deletedUserJson } from 'models/user';
 import NotificationWidget from 'notification-widget/main';
 import core from 'osu-core-singleton';
 import QuickSearch from 'quick-search/main';
@@ -59,7 +59,7 @@ core.reactTurbolinks.register('beatmap-discussion-events', () => {
 
   // TODO: move to store?
   // eslint-disable-next-line id-blacklist
-  props.users.null = props.users.undefined = deletedUser.toJson();
+  props.users.null = props.users.undefined = deletedUserJson;
 
   return <BeatmapsetEvents {...props} />;
 });