sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-04-29 02:37:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename DrawableUsername to DrawableChatUsername and only pass message ID

Browse Source
This commit is contained in:
Dean Herbert 2023-05-03 18:53:22 +09:00
parent b28d7b1a92
commit b932e4d986
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
View File

@ -616,7 +616,7 @@ namespace osu.Game.Tests.Visual.Online
}; };
}); });
AddStep("Show report popover", () => this.ChildrenOfType<DrawableUsername>().First().ShowPopover()); AddStep("Show report popover", () => this.ChildrenOfType<DrawableChatUsername>().First().ShowPopover());
AddStep("Set report reason to other", () => AddStep("Set report reason to other", () =>
{ {

4
osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Chat
private readonly OsuSpriteText drawableTimestamp; private readonly OsuSpriteText drawableTimestamp;
private readonly DrawableUsername drawableUsername; private readonly DrawableChatUsername drawableUsername;
private readonly LinkFlowContainer drawableContentFlow; private readonly LinkFlowContainer drawableContentFlow;
@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Chat
Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true), Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
AlwaysPresent = true, AlwaysPresent = true,
}, },
drawableUsername = new DrawableUsername(message) drawableUsername = new DrawableChatUsername(message.Sender, message.Id)
{ {
Width = UsernameWidth, Width = UsernameWidth,
FontSize = FontSize, FontSize = FontSize,

12
osu.Game/Overlays/Chat/DrawableUsername.cs → osu.Game/Overlays/Chat/DrawableChatUsername.cs
View File

@ -31,7 +31,7 @@ using ChatStrings = osu.Game.Localisation.ChatStrings;
namespace osu.Game.Overlays.Chat namespace osu.Game.Overlays.Chat
{ {
public partial class DrawableUsername : OsuClickableContainer, IHasContextMenu, IHasPopover public partial class DrawableChatUsername : OsuClickableContainer, IHasContextMenu, IHasPopover
{ {
public Color4 AccentColour { get; } public Color4 AccentColour { get; }
@ -73,15 +73,15 @@ namespace osu.Game.Overlays.Chat
private Bindable<Channel?>? currentChannel { get; set; } private Bindable<Channel?>? currentChannel { get; set; }
private readonly APIUser user; private readonly APIUser user;
private readonly Message message; private readonly long? messageId;
private readonly OsuSpriteText drawableText; private readonly OsuSpriteText drawableText;
private readonly Drawable colouredDrawable; private readonly Drawable colouredDrawable;
public DrawableUsername(Message message) public DrawableChatUsername(APIUser user, long? messageId)
{ {
this.message = message; this.user = user;
user = message.Sender; this.messageId = messageId;
Action = openUserProfile; Action = openUserProfile;
@ -182,7 +182,7 @@ namespace osu.Game.Overlays.Chat
private void report(ChatReportReason reason, string comments) private void report(ChatReportReason reason, string comments)
{ {
var request = new ChatReportRequest(message.Id, reason, comments); var request = new ChatReportRequest(messageId, reason, comments);
request.Failure += _ => Schedule(() => request.Failure += _ => Schedule(() =>
{ {