sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ArrangeMod

Browse Source
This commit is contained in:
Dean Herbert
2018-09-14 18:58:00 +09:00
committed by GitHub
parent 14c2aec53e ccabad60fb
commit 328de07615
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Online/Chat/InfoMessage.cs
View File

@ -15,11 +15,7 @@ namespace osu.Game.Online.Chat
Timestamp = DateTimeOffset.Now; Timestamp = DateTimeOffset.Now;
Content = message; Content = message;
Sender = new User Sender = User.SYSTEM_USER;
{
Username = @"system",
Colour = @"0000ff",
};
} }
} }
} }

4
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -77,9 +77,11 @@ namespace osu.Game.Overlays
public void ShowUser(User user, bool fetchOnline = true) public void ShowUser(User user, bool fetchOnline = true)
{ {
if (user == User.SYSTEM_USER) return;
Show(); Show();
if (user.Id == Header?.User.Id) if (user.Id == Header?.User?.Id)
return; return;
userReq?.Cancel(); userReq?.Cancel();

9
osu.Game/Users/User.cs
View File

@ -144,5 +144,14 @@ namespace osu.Game.Users
public Badge[] Badges; public Badge[] Badges;
public override string ToString() => Username; public override string ToString() => Username;
/// <summary>
/// A user instance for displaying locally created system messages.
/// </summary>
public static readonly User SYSTEM_USER = new User
{
Username = "system",
Id = 0
};
} }
} }