Skip to content

Fix user modding post listing error on deleted beatmapset #13034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nanaya wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −1
Draft

Fix user modding post listing error on deleted beatmapset #13034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions app/Models/DeletedBeatmapset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

// 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.

declare(strict_types=1);

namespace App\Models;

class DeletedBeatmapset extends Beatmapset
{
public int $beatmapset_id = 0;
public $title = '[deleted beatmap]';

public function getKey(): int
{
return $this->beatmapset_id;
}

public function trashed()
{
return true;
}
}
8 changes: 7 additions & 1 deletion resources/views/beatmap_discussion_posts/_item.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,19 @@

@php
$beatmapset = $post->beatmapDiscussion->beatmapset;
if ($beatmapset === null) {
$beatmapset = new App\Models\DeletedBeatmapset();
$beatmapset->beatmapset_id = $post->beatmapDiscussion->beatmapset_id;
}
$discussionUrl = route('beatmapsets.discussion', ['beatmapset' => $beatmapset->getKey()]);
$discussionUrl .= "#/{$post->beatmap_discussion_id}";
@endphp

<div class="beatmapset-activities__discussion-post">
<div class="beatmap-discussion beatmap-discussion--single beatmapset-activities__post-grow">
<div class="beatmap-discussion-timestamp__icons-container">
<div class="beatmap-discussion-timestamp__icons">
<a class="link link--no-underline" href="{{ route('beatmapsets.discussion', $beatmapset) }}#/{{ $post->beatmap_discussion_id }}">
<a class="link link--no-underline" href="{{ $discussionUrl }}">
@include('objects._beatmapset_cover', [
'beatmapset' => $beatmapset,
'modifiers' => null,
Expand Down