Merge branch 'master' into feature/chat-wait-socket-connection-ready

Author: nanaya

Diff for: app/Http/Controllers/ContestsController.php

@@ -37,6 +37,7 @@ public function judge($id)
         priv_check('ContestJudgeShow', $contest)->ensureCan();
 
         $contestJson = json_item($contest, new ContestTransformer(), [
+            'current_user_attributes',
             'entries.current_user_judge_vote.scores',
             'scoring_categories',
         ]);

Diff for: app/Libraries/ImageProcessor.php

@@ -91,14 +91,15 @@ public function process()
             }
 
             $newHeight = $this->inputDim[0] * $this->targetDim[1] / $this->targetDim[0];
-            $this->targetDim = $newHeight <= $this->inputDim[1]
+            $targetDim = $newHeight <= $this->inputDim[1]
                 ? [
                     $this->inputDim[0],
                     $newHeight,
                 ] : [
                     $this->inputDim[1] * $this->targetDim[0] / $this->targetDim[1],
                     $this->inputDim[1],
                 ];
+            $this->targetDim = array_map(fn ($d) => max(1, $d), $targetDim);
         }
 
         $start = [0, 0];

Diff for: app/Models/Contest.php

@@ -134,7 +134,7 @@ public function isJudged(): bool
 
     public function isJudgingActive(): bool
     {
-        return $this->isJudged() && $this->isVotingStarted() && !$this->show_votes;
+        return $this->isJudged() && $this->isVotingOpen() && !$this->show_votes;
     }
 
     public function isSubmittedBeatmaps(): bool

Diff for: app/Transformers/ContestTransformer.php

@@ -14,6 +14,7 @@
 class ContestTransformer extends TransformerAbstract
 {
     protected array $availableIncludes = [
+        'current_user_attributes',
         'entries',
         'scoring_categories',
         'max_judging_score',
@@ -46,6 +47,13 @@ public function transform(Contest $contest)
         ];
     }
 
+    public function includeCurrentUserAttributes(Contest $contest)
+    {
+        return $this->primitive([
+            'can_judge' => priv_check('ContestJudge', $contest)->can(),
+        ]);
+    }
+
     public function includeEntries(Contest $contest)
     {
         return $this->collection($contest->entriesByType(Auth::user()), new ContestEntryTransformer());

Diff for: app/helpers.php

@@ -389,9 +389,9 @@ function db_unsigned_increment($column, $count)
     return DB::raw($value);
 }
 
-function default_mode()
+function default_mode(): string
 {
-    return optional(auth()->user())->playmode ?? 'osu';
+    return Auth::user()?->playmode ?? 'osu';
 }
 
 function flag_url($countryCode)

Diff for: resources/css/bem/contest-judge-entry.less

@@ -1,12 +1,7 @@
 // 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.
 
-@margin: 10px;
-
 .contest-judge-entry {
-  margin-bottom: 20px;
-  max-width: 500px;
-
   &__button {
     display: flex;
     justify-content: flex-end;
@@ -17,6 +12,7 @@
     display: flex;
     flex-direction: column;
     gap: 10px;
+    max-width: 500px;
   }
 
   &__category {
@@ -76,7 +72,7 @@
   }
 
   &__title {
-    margin-bottom: @margin;
+    margin-bottom: 10px;
     font-size: @font-size--large;
     font-weight: bold;
     color: hsl(var(--hsl-l1));

Diff for: resources/css/bem/contest-judge.less

@@ -2,16 +2,28 @@
 // See the LICENCE file in the repository root for full licence text.
 
 .contest-judge {
-  .default-gutter-v2();
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
   font-size: @font-size--title-small;
-  padding-top: 15px;
-  padding-bottom: $padding-top;
+  background-color: hsl(var(--hsl-b5));
 
-  &--header {
+  &__header {
+    .default-gutter-v2();
     background-color: hsl(var(--hsl-d3));
+    padding-top: 15px;
+    padding-bottom: $padding-top;
   }
 
-  &--items {
-    background-color: hsl(var(--hsl-b5));
+  &__items {
+    .default-gutter-v2();
+    flex-direction: column;
+    gap: 20px;
+    margin-bottom: $gap;
+  }
+
+  &__switch {
+    font-weight: normal;
+    margin: 0;
   }
 }

Diff for: resources/css/bem/sort.less

@@ -55,11 +55,6 @@
       });
     }
 
-    &--contest-judge {
-      margin: 0;
-      padding: 0;
-    }
-
     &--title {
       padding: 0;
     }

Diff for: resources/js/chat/conversation-view.tsx

@@ -46,8 +46,9 @@ export default class ConversationView extends React.Component<Props> {
     let currentGroup: Message[] = [];
     let unreadMarkerShown = false;
     let currentDay: string;
+    const messages = this.messages;
 
-    each(channel.messages, (message: Message, key: number) => {
+    each(messages, (message: Message, key: number) => {
       // check if the last read indicator needs to be shown
       if (!unreadMarkerShown
         && typeof message.messageId === 'number'
@@ -84,7 +85,7 @@ export default class ConversationView extends React.Component<Props> {
         currentGroup.push(message);
       }
 
-      if (key === channel.messages.length - 1) {
+      if (key === messages.length - 1) {
         conversationStack.push(<MessageGroup key={currentGroup[0].uuid} messages={currentGroup} />);
       }
     });
@@ -97,6 +98,12 @@ export default class ConversationView extends React.Component<Props> {
     return core.dataStore.chatState.selectedChannel;
   }
 
+  private get messages() {
+    const channel = this.currentChannel;
+    if (channel == null) return [];
+    return channel.messages.filter((message) => !core.currentUserModel.blocks.has(message.senderId));
+  }
+
   constructor(props: Props) {
     super(props);
 

Diff for: resources/js/contest-judge/entry.tsx

@@ -44,7 +44,8 @@ export default class Entry extends React.Component<Props> {
 
   @computed
   private get canSubmit() {
-    return !this.commentTooLong
+    return this.store.canJudge
+      && !this.commentTooLong
       && this.currentVote.scores.size === this.store.scoringCategories.length
       && (this.currentVote.comment !== this.initialVote.comment
           || this.store.scoringCategories.some((category) => (
@@ -83,6 +84,7 @@ export default class Entry extends React.Component<Props> {
         >
           <TextareaAutosize
             className='input-text'
+            disabled={!this.store.canJudge}
             maxRows={20}
             onChange={this.handleCommentChange}
             rows={6}
@@ -133,6 +135,7 @@ export default class Entry extends React.Component<Props> {
         <input
           className='contest-judge-entry__slider'
           data-category-id={category.id}
+          disabled={!this.store.canJudge}
           max={category.max_value}
           onChange={this.handleRangeInputChange}
           type='range'

Diff for: resources/js/contest-judge/main.tsx

@@ -5,7 +5,6 @@ import { action, makeObservable, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import ContestJudgeStore from 'stores/contest-judge-store';
-import { classWithModifiers } from 'utils/css';
 import { trans } from 'utils/lang';
 import Entry from './entry';
 
@@ -35,12 +34,15 @@ export default class Main extends React.Component<Props> {
 
   render() {
     return (
-      <>
-        <div className='contest-judge contest-judge--header'>
+      <div className='contest-judge'>
+        <div className='contest-judge__header'>
           {this.renderShowJudgedToggle()}
+          {!this.props.store.canJudge && (
+            <div>{trans('authorization.contest.judging_not_active')}</div>
+          )}
         </div>
 
-        <div className='contest-judge contest-judge--items'>
+        <div className='contest-judge__items'>
           {this.filteredEntries.map((entry) => (
             <Entry
               key={entry.id}
@@ -49,27 +51,24 @@ export default class Main extends React.Component<Props> {
             />
           ))}
         </div>
-      </>
+      </div>
     );
   }
 
   private renderShowJudgedToggle() {
-    const iconClass = this.hideJudged
-      ? 'fas fa-check-square'
-      : 'far fa-square';
-
     return (
-      <button
-        className={classWithModifiers('sort__item', ['button', 'contest-judge'])}
-        onClick={this.toggleShowJudged}
-        type='button'
-      >
-        <span className='sort__item-icon'>
-          <span className={iconClass} />
-        </span>
-
+      <label className='contest-judge__switch'>
+        <div className='osu-switch-v2'>
+          <input
+            checked={this.hideJudged}
+            className='osu-switch-v2__input'
+            onChange={this.toggleShowJudged}
+            type='checkbox'
+          />
+          <span className='osu-switch-v2__content' />
+        </div>
         {trans('contest.judge.hide_judged')}
-      </button>
+      </label>
     );
   }
 

Diff for: resources/js/interfaces/contest-json.ts

@@ -5,6 +5,9 @@ import ContestEntryJson, { ContestEntryJsonForResults } from './contest-entry-js
 import ContestScoringCategoryJson from './contest-scoring-category-json';
 
 interface ContestJsonAvailableIncludes {
+  current_user_attributes: {
+    can_judge: boolean;
+  };
   entries: ContestEntryJson[];
   max_judging_score: number;
   max_total_score: number;
@@ -26,4 +29,4 @@ export type ContestJsonForResults = ContestJsonDefaultAttributes
 };
 
 export type ContestJsonForStore = ContestJsonDefaultAttributes
-& Required<Pick<ContestJsonAvailableIncludes, 'entries' | 'scoring_categories'>>;
+& Required<Pick<ContestJsonAvailableIncludes, 'current_user_attributes' | 'entries' | 'scoring_categories'>>;

Diff for: resources/js/mp-history/game.coffee

@@ -7,7 +7,7 @@ import { div, span, strong } from 'react-dom-factories'
 import { formatNumber } from 'utils/html'
 import { trans, transExists } from 'utils/lang'
 import GameHeader from './game-header'
-import { Score } from './score'
+import Score from './score'
 
 el = React.createElement