', $text); - $text = str_replace("[/heading:{$this->uid}]", '
', $text); + $text = preg_replace("#\[/heading:{$this->uid}\]\n?#", '', $text); return $text; } + public function parseImagemap($text) + { + return preg_replace_callback( + '#(\[imagemap\].+?\[/imagemap\]\n?)#', + function ($m) { + return preg_replace_callback( + '#\[imagemap\]\n(?- ', $text); // convert list items. - $text = preg_replace("#\[/\*(:m)?:{$this->uid}\]\n?#", ' ', $text); - $text = str_replace("[*:{$this->uid}]", '
- ', $text); + $text = preg_replace("#\[/\*(:m)?:{$this->uid}\]\n?\n?#", ' ', $text); + $text = preg_replace("#\s*\[\*:{$this->uid}\]#", '
- ', $text); // close list tags. - $text = str_replace("[/list:o:{$this->uid}]", '
- $1
- $2', $text);
@@ -236,13 +281,12 @@ public function parseQuote($text)
{
$text = preg_replace("#\[quote="([^:]+)":{$this->uid}\]\s*#", '
', $text); return $text; } // stolen from: www/forum/includes/functions.php:2845 - public function parseSmilies($text) { return preg_replace('#\\1 wrote:
', $text); $text = preg_replace("#\[quote:{$this->uid}\]\s*#", '', $text); - $text = preg_replace("#\s*\[/quote:{$this->uid}\]\s*#", '', $text); + $text = preg_replace("#\s*\[/quote:{$this->uid}\]\n?\n?#", '
", $text);
+ $text = str_replace("[youtube:{$this->uid}]", "
", $text);
return $text;
}
@@ -304,13 +352,13 @@ public function toHTML()
$text = $this->text;
// block
+ $text = $this->parseImagemap($text);
$text = $this->parseBox($text);
$text = $this->parseCode($text);
$text = $this->parseList($text);
$text = $this->parseNotice($text);
$text = $this->parseQuote($text);
$text = $this->parseHeading($text);
- $text = $this->clearSpacesBetweenTags($text);
// inline
$text = $this->parseAudio($text);
diff --git a/app/Libraries/ChangeUsername.php b/app/Libraries/ChangeUsername.php
index 5f78384b058..87cebeb65fa 100644
--- a/app/Libraries/ChangeUsername.php
+++ b/app/Libraries/ChangeUsername.php
@@ -68,7 +68,7 @@ public function validate(): ValidationErrors
return $this->validationErrors()->merge(UsernameValidation::validateAvailability($this->username));
}
- public function validationErrorsTranslationPrefix()
+ public function validationErrorsTranslationPrefix(): string
{
return 'user';
}
diff --git a/app/Libraries/CleanHTML.php b/app/Libraries/CleanHTML.php
index f4293501be7..3327563a77e 100644
--- a/app/Libraries/CleanHTML.php
+++ b/app/Libraries/CleanHTML.php
@@ -28,6 +28,7 @@ public function __construct()
$config->set('Cache.SerializerPath', $cachePath);
$config->set('Attr.AllowedRel', ['nofollow']);
$config->set('HTML.Trusted', true);
+ $config->set('CSS.Trusted', true);
$def = $config->getHTMLDefinition(true);
diff --git a/app/Libraries/Elasticsearch/Hit.php b/app/Libraries/Elasticsearch/Hit.php
index 56324eef39f..82f92e638b0 100644
--- a/app/Libraries/Elasticsearch/Hit.php
+++ b/app/Libraries/Elasticsearch/Hit.php
@@ -83,22 +83,22 @@ public function source($key = null)
// ArrayAccess
//================
- public function offsetExists($key)
+ public function offsetExists($key): bool
{
return array_has($this->raw, $key);
}
- public function offsetGet($key)
+ public function offsetGet($key): mixed
{
return data_get($this->raw, $key);
}
- public function offsetSet($key, $value)
+ public function offsetSet($key, $value): void
{
throw new \BadMethodCallException('not supported');
}
- public function offsetUnset($key)
+ public function offsetUnset($key): void
{
throw new \BadMethodCallException('not supported');
}
diff --git a/app/Libraries/Elasticsearch/SearchResponse.php b/app/Libraries/Elasticsearch/SearchResponse.php
index caefa081602..28dc2eecf6e 100644
--- a/app/Libraries/Elasticsearch/SearchResponse.php
+++ b/app/Libraries/Elasticsearch/SearchResponse.php
@@ -30,7 +30,7 @@ public function aggregations(string $name = null)
: $this->raw['aggregations'][$name] ?? [];
}
- public function count()
+ public function count(): int
{
return count($this->hits());
}
@@ -136,22 +136,22 @@ public function total()
// ArrayAccess
//================
- public function offsetExists($key)
+ public function offsetExists($key): bool
{
return array_has($this->hits(), $key);
}
- public function offsetGet($key)
+ public function offsetGet($key): mixed
{
return new Hit(data_get($this->hits(), $key));
}
- public function offsetSet($key, $value)
+ public function offsetSet($key, $value): void
{
throw new \BadMethodCallException('not supported');
}
- public function offsetUnset($key)
+ public function offsetUnset($key): void
{
throw new \BadMethodCallException('not supported');
}
@@ -160,27 +160,27 @@ public function offsetUnset($key)
// Iterator
//================
- public function current()
+ public function current(): mixed
{
return $this[$this->index];
}
- public function key()
+ public function key(): mixed
{
return $this->index;
}
- public function next()
+ public function next(): void
{
$this->index++;
}
- public function rewind()
+ public function rewind(): void
{
$this->index = 0;
}
- public function valid()
+ public function valid(): bool
{
return $this->offsetExists($this->index);
}
diff --git a/app/Libraries/Fulfillments/BannerFulfillment.php b/app/Libraries/Fulfillments/BannerFulfillment.php
index e568f2e86f2..c1036d9e5fb 100644
--- a/app/Libraries/Fulfillments/BannerFulfillment.php
+++ b/app/Libraries/Fulfillments/BannerFulfillment.php
@@ -87,12 +87,12 @@ private function revokeBanner(OrderItem $orderItem)
//================
// Validatable
//================
- public function validationErrorsTranslationPrefix()
+ public function validationErrorsTranslationPrefix(): string
{
return 'fulfillments.banner-supporter';
}
- public function validationErrorsKeyBase()
+ public function validationErrorsKeyBase(): string
{
return 'model_validation/';
}
diff --git a/app/Libraries/Fulfillments/GenericFulfillment.php b/app/Libraries/Fulfillments/GenericFulfillment.php
index 9c67b43ccfa..ffdaee29d01 100644
--- a/app/Libraries/Fulfillments/GenericFulfillment.php
+++ b/app/Libraries/Fulfillments/GenericFulfillment.php
@@ -31,7 +31,7 @@ public function revoke()
event("store.fulfillments.revoke.{$this->taggedName()}", new OrderFulfillerEvent($this->order));
}
- public function validationErrorsTranslationPrefix()
+ public function validationErrorsTranslationPrefix(): string
{
return '';
}
diff --git a/app/Libraries/Fulfillments/OrderFulfiller.php b/app/Libraries/Fulfillments/OrderFulfiller.php
index a3c4b829ba7..e351fd350f7 100644
--- a/app/Libraries/Fulfillments/OrderFulfiller.php
+++ b/app/Libraries/Fulfillments/OrderFulfiller.php
@@ -49,7 +49,7 @@ protected function throwOnFail(bool $valid = false)
}
}
- abstract public function validationErrorsTranslationPrefix();
+ abstract public function validationErrorsTranslationPrefix(): string;
protected function dispatchValidationFailed()
{
diff --git a/app/Libraries/Fulfillments/SupporterTagFulfillment.php b/app/Libraries/Fulfillments/SupporterTagFulfillment.php
index 0e21c1a1efa..8abe13c4756 100644
--- a/app/Libraries/Fulfillments/SupporterTagFulfillment.php
+++ b/app/Libraries/Fulfillments/SupporterTagFulfillment.php
@@ -73,7 +73,7 @@ private function afterRun()
);
}
- if (present($donor->user_email)) {
+ if (is_valid_email_format($donor->user_email)) {
$donationTotal = $items->sum('cost');
$totalDuration = $isGift ? null : $items->sum('extra_data.duration'); // duration is not relevant for gift.
@@ -90,7 +90,7 @@ private function afterRun()
Event::generate('userSupportGift', ['user' => $giftee, 'date' => $this->order->paid_at]);
- if (present($giftee->user_email)) {
+ if (is_valid_email_format($giftee->user_email)) {
$duration = 0;
$messages = [];
@@ -172,12 +172,12 @@ private function createFulfiller(OrderItem $item)
//================
// Validatable
//================
- public function validationErrorsTranslationPrefix()
+ public function validationErrorsTranslationPrefix(): string
{
return 'fulfillments.supporter_tag';
}
- public function validationErrorsKeyBase()
+ public function validationErrorsKeyBase(): string
{
return 'model_validation/';
}
diff --git a/app/Libraries/Fulfillments/UsernameChangeFulfillment.php b/app/Libraries/Fulfillments/UsernameChangeFulfillment.php
index f6169fcd0f8..6b16547de55 100644
--- a/app/Libraries/Fulfillments/UsernameChangeFulfillment.php
+++ b/app/Libraries/Fulfillments/UsernameChangeFulfillment.php
@@ -113,12 +113,12 @@ private function getNewUsername()
//================
// Validatable
//================
- public function validationErrorsTranslationPrefix()
+ public function validationErrorsTranslationPrefix(): string
{
return 'fulfillments.username_change';
}
- public function validationErrorsKeyBase()
+ public function validationErrorsKeyBase(): string
{
return 'model_validation/';
}
diff --git a/app/Libraries/LocaleMeta.php b/app/Libraries/LocaleMeta.php
index 88b8370d40c..1e419d7dae6 100644
--- a/app/Libraries/LocaleMeta.php
+++ b/app/Libraries/LocaleMeta.php
@@ -22,6 +22,10 @@ class LocaleMeta
'flag' => 'BG',
'name' => 'Български',
],
+ 'ca' => [
+ 'flag' => 'AD', // ES-CA in crowdin
+ 'name' => 'català',
+ ],
'cs' => [
'flag' => 'CZ',
'name' => 'Česky',
@@ -51,10 +55,18 @@ class LocaleMeta
'flag' => 'FI',
'name' => 'Suomi',
],
+ 'fil' => [
+ 'flag' => 'PH',
+ 'name' => 'Wikang Filipino',
+ ],
'fr' => [
'flag' => 'FR',
'name' => 'français',
],
+ 'he' => [
+ 'flag' => 'IL',
+ 'name' => 'עִבְרִית',
+ ],
'hu' => [
'flag' => 'HU',
'name' => 'Magyar',
@@ -75,6 +87,10 @@ class LocaleMeta
'flag' => 'KR',
'name' => '한국어',
],
+ 'lt' => [
+ 'flag' => 'LT',
+ 'name' => 'lietuvių kalba',
+ ],
'nl' => [
'flag' => 'NL',
'name' => 'Nederlands',
@@ -110,6 +126,15 @@ class LocaleMeta
'flag' => 'SK',
'name' => 'Slovenčina',
],
+ 'sl' => [
+ 'flag' => 'SI',
+ 'name' => 'slovenščina',
+ ],
+ 'sr' => [
+ 'flag' => 'RS',
+ 'moment' => 'sr-cyrl',
+ 'name' => 'српски',
+ ],
'sv' => [
'flag' => 'SE',
'name' => 'Svenska',
diff --git a/app/Libraries/MorphMap.php b/app/Libraries/MorphMap.php
index 895e5d4edf4..91f41953dae 100644
--- a/app/Libraries/MorphMap.php
+++ b/app/Libraries/MorphMap.php
@@ -10,6 +10,7 @@
use App\Models\Beatmapset;
use App\Models\Build;
use App\Models\Chat\Channel;
+use App\Models\Chat\Message;
use App\Models\Comment;
use App\Models\Forum;
use App\Models\LegacyMatch;
@@ -30,6 +31,7 @@ class MorphMap
Forum\Post::class => 'forum_post',
Forum\Topic::class => 'forum_topic',
LegacyMatch\Score::class => 'legacy_match_score',
+ Message::class => 'message',
NewsPost::class => 'news_post',
Score\Best\Fruits::class => 'score_best_fruits',
Score\Best\Mania::class => 'score_best_mania',
diff --git a/app/Libraries/NewForumTopic.php b/app/Libraries/NewForumTopic.php
index fb5d8e6b26f..5ada3c175b7 100644
--- a/app/Libraries/NewForumTopic.php
+++ b/app/Libraries/NewForumTopic.php
@@ -54,12 +54,12 @@ public function post()
]);
}
- public function titlePlaceholder()
+ public function titlePlaceholder(): ?string
{
- if ($this->forum->isHelpForum()) {
+ return $this->forum->isHelpForum()
// In English language forum, no localization.
- return 'What is your problem (50 characters)';
- }
+ ? 'What is your problem (50 characters)'
+ : null;
}
public function toArray()
diff --git a/app/Libraries/OsuAuthorize.php b/app/Libraries/OsuAuthorize.php
index 4302c1ffd11..9b90e5a5f82 100644
--- a/app/Libraries/OsuAuthorize.php
+++ b/app/Libraries/OsuAuthorize.php
@@ -887,6 +887,17 @@ public function checkBeatmapsetOffsetEdit(): string
return 'unauthorized';
}
+ public function checkBeatmapsetTagsEdit(?User $user): string
+ {
+ $this->ensureLoggedIn($user);
+
+ if ($user->isModerator()) {
+ return 'ok';
+ }
+
+ return 'unauthorized';
+ }
+
/**
* @param User|null $user
* @return string
@@ -1470,20 +1481,22 @@ public function checkForumPostStore(?User $user, Forum $forum): string
$this->ensureLoggedIn($user);
$this->ensureCleanRecord($user);
- $plays = $user->playCount();
- $posts = $user->user_posts;
- $forInitialHelpForum = in_array($forum->forum_id, config('osu.forum.initial_help_forum_ids'), true);
+ if (!$user->isBot()) {
+ $plays = $user->playCount();
+ $posts = $user->user_posts;
+ $forInitialHelpForum = in_array($forum->forum_id, config('osu.forum.initial_help_forum_ids'), true);
- if ($forInitialHelpForum) {
- if ($plays < 10 && $posts > 10) {
- return $prefix.'too_many_help_posts';
- }
- } else {
- if ($plays < config('osu.forum.minimum_plays') && $plays < $posts + 1) {
- return $prefix.'play_more';
- }
+ if ($forInitialHelpForum) {
+ if ($plays < 10 && $posts > 10) {
+ return $prefix.'too_many_help_posts';
+ }
+ } else {
+ if ($plays < config('osu.forum.minimum_plays') && $plays < $posts + 1) {
+ return $prefix.'play_more';
+ }
- $this->ensureHasPlayed($user);
+ $this->ensureHasPlayed($user);
+ }
}
return 'ok';
@@ -1788,6 +1801,19 @@ public function checkIsSpecialScope(?User $user): string
return 'unauthorized';
}
+ public function checkLegacyIrcKeyStore(?User $user): string
+ {
+ $this->ensureLoggedIn($user);
+ $this->ensureCleanRecord($user);
+
+ // isBot checks user primary group
+ if (!$user->isGroup(app('groups')->byIdentifier('bot')) && $user->playCount() < 100) {
+ return 'play_more';
+ }
+
+ return 'ok';
+ }
+
/**
* @param User|null $user
* @return string
@@ -1808,6 +1834,14 @@ public function checkNewsPostUpdate(?User $user): string
return 'unauthorized';
}
+ public function checkLegacyApiKeyStore(?User $user): string
+ {
+ $this->ensureLoggedIn($user);
+ $this->ensureCleanRecord($user);
+
+ return 'ok';
+ }
+
/**
* @param User|null $user
* @return string
diff --git a/app/Libraries/Payments/PaymentProcessor.php b/app/Libraries/Payments/PaymentProcessor.php
index 55dee0b5b14..c33b8fd92cc 100644
--- a/app/Libraries/Payments/PaymentProcessor.php
+++ b/app/Libraries/Payments/PaymentProcessor.php
@@ -354,22 +354,22 @@ protected function throwValidationFailed(Exception $exception)
/**
* implements ArrayAccess.
*/
- public function offsetExists($key)
+ public function offsetExists($key): bool
{
return array_has($this->params, $key);
}
- public function offsetGet($key)
+ public function offsetGet($key): mixed
{
return data_get($this->params, $key);
}
- public function offsetSet($key, $value)
+ public function offsetSet($key, $value): void
{
throw new \BadMethodCallException('not supported');
}
- public function offsetUnset($key)
+ public function offsetUnset($key): void
{
throw new \BadMethodCallException('not supported');
}
@@ -377,12 +377,12 @@ public function offsetUnset($key)
/**
* Validatable.
*/
- public function validationErrorsTranslationPrefix()
+ public function validationErrorsTranslationPrefix(): string
{
return 'payments';
}
- public function validationErrorsKeyBase()
+ public function validationErrorsKeyBase(): string
{
return 'model_validation/';
}
diff --git a/app/Libraries/RouteScopesHelper.php b/app/Libraries/RouteScopesHelper.php
index dc08dde2c24..ad26c2150a3 100644
--- a/app/Libraries/RouteScopesHelper.php
+++ b/app/Libraries/RouteScopesHelper.php
@@ -126,6 +126,6 @@ public function toCsv(string $filename)
public function toJson(string $filename)
{
- file_put_contents($filename, str_replace('\/', '/', json_encode($this->toArray(), JSON_PRETTY_PRINT)."\n"));
+ file_put_contents($filename, json_encode($this->toArray(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)."\n");
}
}
diff --git a/app/Libraries/Search/BeatmapsetSearch.php b/app/Libraries/Search/BeatmapsetSearch.php
index 07a21d32e72..e4bf3056351 100644
--- a/app/Libraries/Search/BeatmapsetSearch.php
+++ b/app/Libraries/Search/BeatmapsetSearch.php
@@ -14,6 +14,7 @@
use App\Models\Beatmapset;
use App\Models\Follow;
use App\Models\Score;
+use App\Models\User;
class BeatmapsetSearch extends RecordSearch
{
@@ -85,8 +86,8 @@ public function getQuery()
$this->addRecommendedFilter($nested);
$this->addSimpleFilters($query, $nested);
+ $this->addCreatorFilter($query, $nested);
$this->addTextFilter($query, 'artist', ['artist', 'artist_unicode']);
- $this->addTextFilter($query, 'creator', ['creator']);
$query->filter([
'nested' => [
@@ -148,6 +149,23 @@ private function addBlockedUsersFilter($query)
$query->mustNot(['terms' => ['user_id' => $this->params->blockedUserIds()]]);
}
+ private function addCreatorFilter(BoolQuery $query, BoolQuery $nested): void
+ {
+ $value = $this->params->creator;
+
+ if (!present($value)) {
+ return;
+ }
+
+ $user = User::lookup($value);
+
+ if ($user === null) {
+ $this->addTextFilter($query, 'creator', ['creator']);
+ } else {
+ $nested->filter(['term' => ['beatmaps.user_id' => $user->getKey()]]);
+ }
+ }
+
private function addExtraFilter($query)
{
foreach ($this->params->extra as $val) {
diff --git a/app/Libraries/Search/BeatmapsetSearchRequestParams.php b/app/Libraries/Search/BeatmapsetSearchRequestParams.php
index a85fd4a2817..c0f8bbfb62e 100644
--- a/app/Libraries/Search/BeatmapsetSearchRequestParams.php
+++ b/app/Libraries/Search/BeatmapsetSearchRequestParams.php
@@ -9,6 +9,7 @@
use App\Libraries\Elasticsearch\Sort;
use App\Libraries\Elasticsearch\Utils\SearchAfterParam;
use App\Models\Beatmap;
+use App\Models\Beatmapset;
use App\Models\Genre;
use App\Models\Language;
use App\Models\User;
@@ -308,5 +309,11 @@ private function setSorts(): void
// generic tie-breaker.
$this->sorts[] = new Sort('id', $sort->order);
+
+ foreach ($this->sorts as $sort) {
+ if ((Beatmapset::CASTS[$sort->field] ?? null) === 'datetime') {
+ $sort->extras['missing'] = 0;
+ }
+ }
}
}
diff --git a/app/Libraries/Search/MultiSearch.php b/app/Libraries/Search/MultiSearch.php
index 6a93d0b3f1b..ea8bd66901c 100644
--- a/app/Libraries/Search/MultiSearch.php
+++ b/app/Libraries/Search/MultiSearch.php
@@ -36,23 +36,24 @@ class MultiSearch
private $options;
private $query;
private $searches;
- private $request;
+ private array $request;
public function __construct(Request $request, array $options = [])
{
- $this->query = trim($request['query']);
+ $this->request = $request->all();
+ $this->query = trim(get_string($this->request['query'] ?? null) ?? '');
$this->options = $options;
- $this->request = $request;
}
public function getMode()
{
- return presence($this->request['mode']) ?? 'all';
+ return presence($this->request['mode'] ?? null) ?? 'all';
}
public function hasQuery()
{
- return present($this->query);
+ return present($this->query)
+ || ($this->getMode() === 'forum_post' && present(get_string($this->request['username'] ?? null)));
}
public function searches()
@@ -70,7 +71,7 @@ public function searches()
$class = $settings['type'];
$paramsClass = $settings['paramsType'];
- $params = new $paramsClass($this->request->all(), $this->options['user']);
+ $params = new $paramsClass($this->request, $this->options['user']);
$search = new $class($params);
if ($search instanceof BeatmapsetSearch) {
$search->source(false);
diff --git a/app/Libraries/User/ForceReactivation.php b/app/Libraries/User/ForceReactivation.php
index 2872bb16ee9..7e6783d9629 100644
--- a/app/Libraries/User/ForceReactivation.php
+++ b/app/Libraries/User/ForceReactivation.php
@@ -49,7 +49,7 @@ public function run()
LegacySession::where('session_user_id', $userId)->delete();
UserClient::where('user_id', $userId)->update(['verified' => false]);
- if (!$waitingActivation && present($this->user->user_email)) {
+ if (!$waitingActivation && is_valid_email_format($this->user->user_email)) {
Mail::to($this->user)->send(new UserForceReactivation([
'user' => $this->user,
'reason' => $this->reason,
diff --git a/app/Libraries/User/UserSignatures.php b/app/Libraries/User/UserSignatures.php
new file mode 100644
index 00000000000..e27ae840a31
--- /dev/null
+++ b/app/Libraries/User/UserSignatures.php
@@ -0,0 +1,30 @@
+. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Libraries\User;
+
+use App\Models\User;
+
+class UserSignatures
+{
+ private array $html = [];
+
+ public function get(User $user): ?string
+ {
+ $userId = $user->getKey();
+
+ if (!array_key_exists($userId, $this->html)) {
+ $sig = $user->user_sig;
+
+ $this->html[$userId] = present($sig)
+ ? bbcode($user->user_sig, $user->user_sig_bbcode_uid)
+ : null;
+ }
+
+ return $this->html[$userId];
+ }
+}
diff --git a/app/Libraries/UserVerification.php b/app/Libraries/UserVerification.php
index db6ee578044..14d370f6666 100644
--- a/app/Libraries/UserVerification.php
+++ b/app/Libraries/UserVerification.php
@@ -96,7 +96,7 @@ public function issue()
{
$user = $this->user;
- if (!present($user->user_email)) {
+ if (!is_valid_email_format($user->user_email)) {
return;
}
diff --git a/app/Listeners/Fulfillments/PaymentSubscribers.php b/app/Listeners/Fulfillments/PaymentSubscribers.php
index 26e1b0d7a77..a9e8c2c6cce 100644
--- a/app/Listeners/Fulfillments/PaymentSubscribers.php
+++ b/app/Listeners/Fulfillments/PaymentSubscribers.php
@@ -126,6 +126,9 @@ private static function sendPaymentCompletedMail(Order $order)
return;
}
- Mail::to($order->user)->queue(new StorePaymentCompleted($order));
+ $user = $order->user;
+ if (is_valid_email_format($user->user_email)) {
+ Mail::to($user)->queue(new StorePaymentCompleted($order));
+ }
}
}
diff --git a/app/Models/ApiKey.php b/app/Models/ApiKey.php
index 7dd67be3871..5f661f094d0 100644
--- a/app/Models/ApiKey.php
+++ b/app/Models/ApiKey.php
@@ -3,8 +3,15 @@
// Copyright (c) ppy Pty Ltd
- {this.data.artist_tracks.length === 0 ? (
+ {this.data.index.artist_tracks.length === 0 ? (
{
<>
{trans('artist.tracks.index.form.empty')}
@@ -79,17 +88,17 @@ export default class Main extends React.Component
- {this.data.artist_tracks.map((t) => (
+ {this.data.index.artist_tracks.map((t) => (
{
@action
private readonly handleShowMore = () => {
- this.loadingXhr = $.getJSON(route('artists.tracks.index'), { ...this.data.search, cursor_string: this.data.cursor_string });
+ this.loadingXhr = $.getJSON(route('artists.tracks.index'), { ...this.data.index.search, cursor_string: this.data.index.cursor_string });
- this.loadingXhr.done((newData) => runInAction(() => {
- const { container, ...prevProps } = this.props;
- newData.artist_tracks = this.data.artist_tracks.concat(newData.artist_tracks);
- this.data = newData;
- this.props.container.dataset.props = JSON.stringify({ ...prevProps, data: this.data });
+ this.loadingXhr.done((newIndex) => runInAction(() => {
+ newIndex.artist_tracks = this.data.index.artist_tracks.concat(newIndex.artist_tracks);
+ this.data.index = newIndex;
})).fail(onError).always(action(() => {
this.loadingXhr = null;
}));
diff --git a/resources/js/beatmap-discussions-history/main.coffee b/resources/js/beatmap-discussions-history/main.coffee
index 8ac0e285cef..240d14d0c93 100644
--- a/resources/js/beatmap-discussions-history/main.coffee
+++ b/resources/js/beatmap-discussions-history/main.coffee
@@ -33,55 +33,10 @@ export class Main extends React.PureComponent
relatedDiscussions: props.relatedDiscussions
- componentDidMount: =>
- $.subscribe "beatmapsetDiscussions:update.#{@eventId}", @discussionUpdate
- $(document).on "ajax:success.#{@eventId}", '.js-beatmapset-discussion-update', @ujsDiscussionUpdate
-
-
componentWillUnmount: =>
- $.unsubscribe ".#{@eventId}"
- $(window).off ".#{@eventId}"
-
$(window).stop()
- discussionUpdate: (_e, options) =>
- {beatmapset} = options
- return unless beatmapset?
-
- discussions = [@state.discussions...]
- users = [@state.users...]
- relatedDiscussions = [@state.relatedDiscussions...]
-
- discussionIds = _.map discussions, 'id'
- userIds = _.map users, 'id'
-
- # Due to the entire hierarchy of discussions being sent back when a post is updated (instead of just the modified post),
- # we need to iterate over each discussion and their posts to extract the updates we want.
- _.each beatmapset.discussions, (newDiscussion) ->
- if discussionIds.includes(newDiscussion.id)
- discussion = _.find discussions, id: newDiscussion.id
- discussions = _.reject discussions, id: newDiscussion.id
- newDiscussion = _.merge(discussion, newDiscussion)
- # The discussion list shows discussions started by the current user, so it can be assumed that the first post is theirs
- newDiscussion.starting_post = newDiscussion.posts[0]
- discussions.push(newDiscussion)
- else
- relatedDiscussions.push(newDiscussion)
-
- _.each beatmapset.related_users, (newUser) ->
- if userIds.includes(newUser.id)
- users = _.reject users, id: newUser.id
-
- users.push(newUser)
-
- @cache.users = @cache.discussions = @cache.beatmaps = @cache.beatmapsets = @state.relatedDiscussions = null
- @setState
- discussions: _.reverse(_.sortBy(discussions, (d) -> Date.parse(d.starting_post.created_at)))
- users: users
- relatedDiscussions: relatedDiscussions
-
-
discussions: =>
# skipped discussions
# - not privileged (deleted discussion)
@@ -136,7 +91,7 @@ export class Main extends React.PureComponent
currentUser: currentUser
beatmapset: beatmapsets[discussion.beatmapset_id]
isTimelineVisible: false
- visible: false
+ readonly: true
showDeleted: true
preview: true
@@ -147,8 +102,3 @@ export class Main extends React.PureComponent
@cache.users[null] = @cache.users[undefined] = deletedUser.toJson()
@cache.users
-
-
- ujsDiscussionUpdate: (_e, data) =>
- # to allow ajax:complete to be run
- Timeout.set 0, => @discussionUpdate(null, beatmapset: data)
diff --git a/resources/js/beatmap-discussions/beatmap-owner-editor.tsx b/resources/js/beatmap-discussions/beatmap-owner-editor.tsx
index a1884019ae0..e8a9c0a3dae 100644
--- a/resources/js/beatmap-discussions/beatmap-owner-editor.tsx
+++ b/resources/js/beatmap-discussions/beatmap-owner-editor.tsx
@@ -3,7 +3,7 @@
import { Spinner } from 'components/spinner';
import UserAvatar from 'components/user-avatar';
-import { UserLink } from 'components/user-link';
+import UserLink from 'components/user-link';
import BeatmapJson from 'interfaces/beatmap-json';
import BeatmapsetExtendedJson from 'interfaces/beatmapset-extended-json';
import UserJson from 'interfaces/user-json';
@@ -20,8 +20,8 @@ import { trans } from 'utils/lang';
type BeatmapsetWithDiscussionJson = BeatmapsetExtendedJson;
interface XhrCollection {
- updateOwner?: JQuery.jqXHR;
- userLookup?: JQuery.jqXHR;
+ updateOwner: JQuery.jqXHR;
+ userLookup: JQuery.jqXHR;
}
interface Props {
@@ -40,7 +40,7 @@ export default class BeatmapOwnerEditor extends React.Component {
private shouldFocusInputOnNextRender = false;
@observable private updatingOwner = false;
private userLookupTimeout?: number;
- private xhr: XhrCollection = {};
+ private xhr: Partial = {};
@computed
private get inputUser() {
diff --git a/resources/js/beatmap-discussions/discussion-message.tsx b/resources/js/beatmap-discussions/discussion-message.tsx
new file mode 100644
index 00000000000..2a00b4b9aef
--- /dev/null
+++ b/resources/js/beatmap-discussions/discussion-message.tsx
@@ -0,0 +1,40 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+import React from 'react';
+import ReactMarkdown from 'react-markdown';
+import remarkBreaks from 'remark-breaks';
+import autolink from 'remark-plugins/autolink';
+import disableConstructs, { DisabledType } from 'remark-plugins/disable-constructs';
+import ImageLink from './image-link';
+import { createRenderer, linkRenderer, transformLinkUri } from './renderers';
+
+const components = Object.freeze({
+ a: linkRenderer,
+ em: createRenderer('em'),
+ img: ImageLink,
+ li: createRenderer('li'),
+ p: createRenderer('p'),
+ strong: createRenderer('strong'),
+});
+
+interface Props {
+ markdown: string;
+ type?: DisabledType;
+}
+
+export default class DiscussionMessage extends React.Component {
+ render() {
+ return (
+
+ {this.props.markdown}
+
+ );
+ }
+}
diff --git a/resources/js/beatmap-discussions/discussion.tsx b/resources/js/beatmap-discussions/discussion.tsx
index 34e5b186dda..06a17b49d19 100644
--- a/resources/js/beatmap-discussions/discussion.tsx
+++ b/resources/js/beatmap-discussions/discussion.tsx
@@ -31,6 +31,7 @@ interface PropsBase {
currentBeatmap: BeatmapExtendedJson | null;
isTimelineVisible: boolean;
parentDiscussion?: BeatmapsetDiscussionJson | null;
+ readonly: boolean;
readPostIds?: Set;
showDeleted: boolean;
users: Partial>;
@@ -66,6 +67,7 @@ export class Discussion extends React.Component {
static contextType = DiscussionsStateContext;
static defaultProps = {
preview: false,
+ readonly: false,
};
declare context: React.ContextType;
@@ -227,6 +229,7 @@ export class Discussion extends React.Component {
discussion={this.props.discussion}
post={post}
read={this.isRead(post)}
+ readonly={this.props.readonly}
resolvedSystemPostId={this.resolvedSystemPostId}
type={type}
user={user}
diff --git a/resources/js/beatmap-discussions/discussions.tsx b/resources/js/beatmap-discussions/discussions.tsx
index 5f55b92db1a..edf76ce5dad 100644
--- a/resources/js/beatmap-discussions/discussions.tsx
+++ b/resources/js/beatmap-discussions/discussions.tsx
@@ -5,7 +5,7 @@ import IconExpand from 'components/icon-expand';
import BeatmapExtendedJson from 'interfaces/beatmap-extended-json';
import BeatmapsetDiscussionJson, { BeatmapsetDiscussionJsonForShow } from 'interfaces/beatmapset-discussion-json';
import BeatmapsetExtendedJson from 'interfaces/beatmapset-extended-json';
-import { BeatmapsetWithDiscussionsJson } from 'interfaces/beatmapset-json';
+import BeatmapsetWithDiscussionsJson from 'interfaces/beatmapset-with-discussions-json';
import UserJson from 'interfaces/user-json';
import { size } from 'lodash';
import { action, computed, makeObservable, observable } from 'mobx';
diff --git a/resources/js/beatmap-discussions/editor-discussion-component.tsx b/resources/js/beatmap-discussions/editor-discussion-component.tsx
index 412f00df1ca..5ea14c126db 100644
--- a/resources/js/beatmap-discussions/editor-discussion-component.tsx
+++ b/resources/js/beatmap-discussions/editor-discussion-component.tsx
@@ -18,8 +18,11 @@ import { linkHtml } from 'utils/url';
import { DraftsContext } from './drafts-context';
import EditorBeatmapSelector from './editor-beatmap-selector';
import EditorIssueTypeSelector from './editor-issue-type-selector';
+import { postEmbedModifiers } from './review-post-embed';
import { SlateContext } from './slate-context';
+const bn = 'beatmap-discussion-review-post-embed-preview';
+
interface Cache {
nearbyDiscussions?: {
beatmap_id: number;
@@ -40,7 +43,6 @@ interface Props extends RenderElementProps {
export default class EditorDiscussionComponent extends React.Component {
static contextType = SlateContext;
- bn = 'beatmap-discussion-review-post-embed-preview';
cache: Cache = {};
declare context: React.ContextType;
tooltipContent = React.createRef();
@@ -235,7 +237,7 @@ export default class EditorDiscussionComponent extends React.Component {
return (
{
const classMods = canEdit ? [] : ['read-only'];
const timestampTooltipType = this.props.element.beatmapId != null ? 'diff' : 'all-diff';
-
const timestampTooltip = trans(`beatmaps.discussions.review.embed.timestamp.${timestampTooltipType}`, {
+ // TODO: remove after translations are updated without the key
type: trans(`beatmaps.discussions.message_type.${this.discussionType()}`),
});
const deleteButton =
(