Merge branch 'master' into less-hp-drain

osu.Game.Tests/Visual/TestCaseUserProfileRecentSection.cs

@@ -0,0 +1,161 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.Profile.Sections;
+using osu.Game.Overlays.Profile.Sections.Recent;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace osu.Game.Tests.Visual
+{
+    [TestFixture]
+    public class TestCaseUserProfileRecentSection : OsuTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(RecentSection),
+            typeof(DrawableRecentActivity),
+            typeof(PaginatedRecentActivityContainer),
+            typeof(MedalIcon)
+        };
+
+        public TestCaseUserProfileRecentSection()
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = OsuColour.Gray(0.2f)
+                },
+                new ScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new FillFlowContainer<DrawableRecentActivity>
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        ChildrenEnumerable = createDummyActivities().Select(a => new DrawableRecentActivity(a))
+                    },
+                }
+            };
+        }
+
+        private IEnumerable<RecentActivity> createDummyActivities()
+        {
+            var dummyBeatmap = new RecentActivity.RecentActivityBeatmap
+            {
+                Title = @"Dummy beatmap",
+                Url = "/b/1337",
+            };
+
+            var dummyUser = new RecentActivity.RecentActivityUser
+            {
+                Username = "DummyReborn",
+                Url = "/u/666",
+                PreviousUsername = "Dummy",
+            };
+
+            return new[]
+            {
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.Achievement,
+                    Achievement = new RecentActivity.RecentActivityAchievement
+                    {
+                        Name = @"Feelin' It",
+                        Slug = @"all-secret-feelinit",
+                    },
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.BeatmapPlaycount,
+                    Count = 1337,
+                    Beatmap = dummyBeatmap,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.BeatmapsetApprove,
+                    Approval = BeatmapApproval.Qualified,
+                    Beatmapset = dummyBeatmap,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.BeatmapsetDelete,
+                    Beatmapset = dummyBeatmap,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.BeatmapsetRevive,
+                    Beatmapset = dummyBeatmap,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.BeatmapsetRevive,
+                    Beatmapset = dummyBeatmap,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.BeatmapsetUpdate,
+                    Beatmapset = dummyBeatmap,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.BeatmapsetUpload,
+                    Beatmapset = dummyBeatmap,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.Rank,
+                    Rank = 1,
+                    Mode = "osu!",
+                    Beatmap = dummyBeatmap,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.RankLost,
+                    Mode = "osu!",
+                    Beatmap = dummyBeatmap,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.UsernameChange,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.UserSupportAgain,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.UserSupportFirst,
+                },
+                new RecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.UserSupportGift,
+                },
+            };
+        }
+    }
+}

osu.Game.Tests/osu.Game.Tests.csproj

@@ -173,6 +173,7 @@
     <Compile Include="Visual\TestCaseTwoLayerButton.cs" />
     <Compile Include="Visual\TestCaseUserPanel.cs" />
     <Compile Include="Visual\TestCaseUserProfile.cs" />
+    <Compile Include="Visual\TestCaseUserProfileRecentSection.cs" />
     <Compile Include="Visual\TestCaseUserRanks.cs" />
     <Compile Include="Visual\TestCaseVolumePieces.cs" />
     <Compile Include="Visual\TestCaseWaveform.cs" />

osu.Game/Graphics/Containers/LinkFlowContainer.cs

@@ -90,6 +90,10 @@ namespace osu.Game.Graphics.Containers
                         case LinkAction.External:
                             Process.Start(url);
                             break;
+                        case LinkAction.OpenUserProfile:
+                            if (long.TryParse(linkArgument, out long userId))
+                                game?.ShowUser(userId);
+                            break;
                         default:
                             throw new NotImplementedException($"This {nameof(LinkAction)} ({linkType.ToString()}) is missing an associated action.");
                     }

osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs

@@ -0,0 +1,130 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using Newtonsoft.Json;
+using osu.Game.Rulesets.Scoring;
+using Humanizer;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetUserRecentActivitiesRequest : APIRequest<List<RecentActivity>>
+    {
+        private readonly long userId;
+        private readonly int offset;
+
+        public GetUserRecentActivitiesRequest(long userId, int offset = 0)
+        {
+            this.userId = userId;
+            this.offset = offset;
+        }
+
+        protected override string Target => $"users/{userId}/recent_activity?offset={offset}";
+    }
+
+    public class RecentActivity
+    {
+        [JsonProperty("id")]
+        public int ID;
+
+        [JsonProperty("createdAt")]
+        public DateTimeOffset CreatedAt;
+
+        [JsonProperty]
+        private string type
+        {
+            set => Type = (RecentActivityType)Enum.Parse(typeof(RecentActivityType), value.Pascalize());
+        }
+
+        public RecentActivityType Type;
+
+        [JsonProperty]
+        private string scoreRank
+        {
+            set => ScoreRank = (ScoreRank)Enum.Parse(typeof(ScoreRank), value);
+        }
+
+        public ScoreRank ScoreRank;
+
+        [JsonProperty("rank")]
+        public int Rank;
+
+        [JsonProperty("approval")]
+        public BeatmapApproval Approval;
+
+        [JsonProperty("count")]
+        public int Count;
+
+        [JsonProperty("mode")]
+        public string Mode;
+
+        [JsonProperty("beatmap")]
+        public RecentActivityBeatmap Beatmap;
+
+        [JsonProperty("beatmapset")]
+        public RecentActivityBeatmap Beatmapset;
+
+        [JsonProperty("user")]
+        public RecentActivityUser User;
+
+        [JsonProperty("achievement")]
+        public RecentActivityAchievement Achievement;
+
+        public class RecentActivityBeatmap
+        {
+            [JsonProperty("title")]
+            public string Title;
+
+            [JsonProperty("url")]
+            public string Url;
+        }
+
+        public class RecentActivityUser
+        {
+            [JsonProperty("username")]
+            public string Username;
+
+            [JsonProperty("url")]
+            public string Url;
+
+            [JsonProperty("previousUsername")]
+            public string PreviousUsername;
+        }
+
+        public class RecentActivityAchievement
+        {
+            [JsonProperty("slug")]
+            public string Slug;
+
+            [JsonProperty("name")]
+            public string Name;
+        }
+
+    }
+
+    public enum RecentActivityType
+    {
+        Achievement,
+        BeatmapPlaycount,
+        BeatmapsetApprove,
+        BeatmapsetDelete,
+        BeatmapsetRevive,
+        BeatmapsetUpdate,
+        BeatmapsetUpload,
+        Medal,
+        Rank,
+        RankLost,
+        UserSupportAgain,
+        UserSupportFirst,
+        UserSupportGift,
+        UsernameChange,
+    }
+
+    public enum BeatmapApproval
+    {
+        Ranked,
+        Approved,
+        Qualified,
+    }
+}

osu.Game/Online/Chat/MessageFormatter.cs

@@ -118,6 +118,8 @@ namespace osu.Game.Online.Chat
                             case "beatmapsets":
                             case "d":
                                 return new LinkDetails(LinkAction.OpenBeatmapSet, args[3]);
+                            case "u":
+                                return new LinkDetails(LinkAction.OpenUserProfile, args[3]);
                         }
                     }
 
@@ -146,6 +148,9 @@ namespace osu.Game.Online.Chat
                         case "spectate":
                             linkType = LinkAction.Spectate;
                             break;
+                        case "u":
+                            linkType = LinkAction.OpenUserProfile;
+                            break;
                         default:
                             linkType = LinkAction.External;
                             break;
@@ -205,6 +210,15 @@ namespace osu.Game.Online.Chat
             return inputMessage;
         }
 
+        public static MessageFormatterResult FormatText(string text)
+        {
+            var result = format(text);
+
+            result.Links.Sort();
+
+            return result;
+        }
+
         public class MessageFormatterResult
         {
             public List<Link> Links = new List<Link>();
@@ -239,6 +253,7 @@ namespace osu.Game.Online.Chat
         OpenEditorTimestamp,
         JoinMultiplayerMatch,
         Spectate,
+        OpenUserProfile,
     }
 
     public class Link : IComparable<Link>

osu.Game/OsuGame.cs

@@ -155,6 +155,12 @@ namespace osu.Game
         /// <param name="setId">The set to display.</param>
         public void ShowBeatmapSet(int setId) => beatmapSetOverlay.ShowBeatmapSet(setId);
 
+        /// <summary>
+        /// Show a user's profile as an overlay.
+        /// </summary>
+        /// <param name="userId">The user to display.</param>
+        public void ShowUser(long userId) => userProfile.ShowUser(userId);
+
         protected void LoadScore(Score s)
         {
             scoreLoad?.Cancel();

osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs

@@ -0,0 +1,165 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Chat;
+using osu.Game.Screens.Select.Leaderboards;
+
+namespace osu.Game.Overlays.Profile.Sections.Recent
+{
+    public class DrawableRecentActivity : DrawableProfileRow
+    {
+        private APIAccess api;
+
+        private readonly RecentActivity activity;
+
+        private LinkFlowContainer content;
+
+        public DrawableRecentActivity(RecentActivity activity)
+        {
+            this.activity = activity;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(APIAccess api)
+        {
+            this.api = api;
+
+            LeftFlowContainer.Padding = new MarginPadding { Left = 10, Right = 160 };
+
+            LeftFlowContainer.Add(content = new LinkFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+            });
+
+            RightFlowContainer.Add(new OsuSpriteText
+            {
+                Text = activity.CreatedAt.LocalDateTime.ToShortDateString(),
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                Font = "Exo2.0-RegularItalic",
+                TextSize = 12,
+                Colour = OsuColour.Gray(0xAA),
+            });
+
+            var formatted = createMessage();
+
+            content.AddLinks(formatted.Text, formatted.Links);
+        }
+
+        protected override Drawable CreateLeftVisual()
+        {
+            switch (activity.Type)
+            {
+                case RecentActivityType.Rank:
+                    return new DrawableRank(activity.ScoreRank)
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 60,
+                        FillMode = FillMode.Fit,
+                    };
+
+                case RecentActivityType.Achievement:
+                    return new MedalIcon(activity.Achievement.Slug)
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 60,
+                        FillMode = FillMode.Fit,
+                    };
+
+                default:
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 60,
+                        FillMode = FillMode.Fit,
+                    };
+            }
+        }
+
+        private string toAbsoluteUrl(string url) => $"{api.Endpoint}{url}";
+
+        private MessageFormatter.MessageFormatterResult createMessage()
+        {
+            string userLinkTemplate() => $"[{toAbsoluteUrl(activity.User?.Url)} {activity.User?.Username}]";
+            string beatmapLinkTemplate() => $"[{toAbsoluteUrl(activity.Beatmap?.Url)} {activity.Beatmap?.Title}]";
+            string beatmapsetLinkTemplate() => $"[{toAbsoluteUrl(activity.Beatmapset?.Url)} {activity.Beatmapset?.Title}]";
+
+            string message;
+
+            switch (activity.Type)
+            {
+                case RecentActivityType.Achievement:
+                    message = $"{userLinkTemplate()} unlocked the {activity.Achievement.Name} medal!";
+                    break;
+
+                case RecentActivityType.BeatmapPlaycount:
+                    message = $"{beatmapLinkTemplate()} has been played {activity.Count} times!";
+                    break;
+
+                case RecentActivityType.BeatmapsetApprove:
+                    message = $"{beatmapsetLinkTemplate()} has been {activity.Approval.ToString().ToLowerInvariant()}!";
+                    break;
+
+                case RecentActivityType.BeatmapsetDelete:
+                    message = $"{beatmapsetLinkTemplate()} has been deleted.";
+                    break;
+
+                case RecentActivityType.BeatmapsetRevive:
+                    message = $"{beatmapsetLinkTemplate()} has been revived from eternal slumber by {userLinkTemplate()}.";
+                    break;
+
+                case RecentActivityType.BeatmapsetUpdate:
+                    message = $"{userLinkTemplate()} has updated the beatmap {beatmapsetLinkTemplate()}!";
+                    break;
+
+                case RecentActivityType.BeatmapsetUpload:
+                    message = $"{userLinkTemplate()} has submitted a new beatmap {beatmapsetLinkTemplate()}!";
+                    break;
+
+                case RecentActivityType.Medal:
+                    // apparently this shouldn't exist look at achievement instead (https://github.com/ppy/osu-web/blob/master/resources/assets/coffee/react/profile-page/recent-activity.coffee#L111)
+                    message = string.Empty;
+                    break;
+
+                case RecentActivityType.Rank:
+                    message = $"{userLinkTemplate()} achieved rank #{activity.Rank} on {beatmapLinkTemplate()} ({activity.Mode}!)";
+                    break;
+
+                case RecentActivityType.RankLost:
+                    message = $"{userLinkTemplate()} has lost first place on {beatmapLinkTemplate()} ({activity.Mode}!)";
+                    break;
+
+                case RecentActivityType.UserSupportAgain:
+                    message = $"{userLinkTemplate()} has once again chosen to support osu! - thanks for your generosity!";
+                    break;
+
+                case RecentActivityType.UserSupportFirst:
+                    message = $"{userLinkTemplate()} has become an osu! supporter - thanks for your generosity!";
+                    break;
+
+                case RecentActivityType.UserSupportGift:
+                    message = $"{userLinkTemplate()} has received the gift of osu! supporter!";
+                    break;
+
+                case RecentActivityType.UsernameChange:
+                    message = $"{activity.User?.PreviousUsername} has changed their username to {userLinkTemplate()}!";
+                    break;
+
+                default:
+                    message = string.Empty;
+                    break;
+            }
+
+            return MessageFormatter.FormatText(message);
+        }
+    }
+}

osu.Game/Overlays/Profile/Sections/Recent/MedalIcon.cs

@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Overlays.Profile.Sections.Recent
+{
+    public class MedalIcon : Container
+    {
+        private readonly string slug;
+        private readonly Sprite sprite;
+
+        private string url => $@"https://s.ppy.sh/images/medals-client/{slug}@2x.png";
+
+        public MedalIcon(string slug)
+        {
+            this.slug = slug;
+
+            Child = sprite = new Sprite
+            {
+                Height = 40,
+                Width = 40,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            sprite.Texture = textures.Get(url);
+        }
+    }
+}

osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs

@@ -0,0 +1,48 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests;
+using osu.Game.Users;
+using System.Linq;
+
+namespace osu.Game.Overlays.Profile.Sections.Recent
+{
+    public class PaginatedRecentActivityContainer : PaginatedContainer
+    {
+        public PaginatedRecentActivityContainer(Bindable<User> user, string header, string missing)
+            : base(user, header, missing)
+        {
+            ItemsPerPage = 5;
+        }
+
+        protected override void ShowMore()
+        {
+            base.ShowMore();
+
+            var req = new GetUserRecentActivitiesRequest(User.Value.Id, VisiblePages++ * ItemsPerPage);
+
+            req.Success += activities =>
+            {
+                ShowMoreButton.FadeTo(activities.Count == ItemsPerPage ? 1 : 0);
+                ShowMoreLoading.Hide();
+
+                if (!activities.Any() && VisiblePages == 1)
+                {
+                    MissingText.Show();
+                    return;
+                }
+
+                MissingText.Hide();
+
+                foreach (RecentActivity activity in activities)
+                {
+                    ItemsContainer.Add(new DrawableRecentActivity(activity));
+                }
+            };
+
+            Api.Queue(req);
+        }
+    }
+}

osu.Game/Overlays/Profile/Sections/RecentSection.cs

@@ -1,12 +1,22 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Overlays.Profile.Sections.Recent;
+
 namespace osu.Game.Overlays.Profile.Sections
 {
     public class RecentSection : ProfileSection
     {
         public override string Title => "Recent";
 
-        public override string Identifier => "recent_activities";
+        public override string Identifier => "recent_activity";
+
+        public RecentSection()
+        {
+            Children = new[]
+            {
+                new PaginatedRecentActivityContainer(User, null, @"This user hasn't done anything notable recently!"),
+            };
+        }
     }
 }

osu.Game/Overlays/UserProfileOverlay.cs

@@ -73,6 +73,14 @@ namespace osu.Game.Overlays
             FadeEdgeEffectTo(0, DISAPPEAR_DURATION, Easing.Out);
         }
 
+        public void ShowUser(long userId)
+        {
+            if (userId == Header.User.Id)
+                return;
+
+            ShowUser(new User { Id = userId });
+        }
+
         public void ShowUser(User user, bool fetchOnline = true)
         {
             userReq?.Cancel();
@@ -82,7 +90,7 @@ namespace osu.Game.Overlays
             sections = new ProfileSection[]
             {
                 //new AboutSection(),
-                //new RecentSection(),
+                new RecentSection(),
                 new RanksSection(),
                 //new MedalsSection(),
                 new HistoricalSection(),

osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs

@@ -15,7 +15,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
         private readonly PlayerSliderBar<double> dimSliderBar;
         private readonly PlayerSliderBar<double> blurSliderBar;
         private readonly PlayerCheckbox showStoryboardToggle;
-        private readonly PlayerCheckbox mouseWheelDisabledToggle;
 
         public VisualSettings()
         {
@@ -35,8 +34,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
                 {
                     Text = "Toggles:"
                 },
-                showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" },
-                mouseWheelDisabledToggle = new PlayerCheckbox { LabelText = "Disable mouse wheel" }
+                showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" }
             };
         }
 
@@ -46,7 +44,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
             dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel);
             blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel);
             showStoryboardToggle.Bindable = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
-            mouseWheelDisabledToggle.Bindable = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
         }
     }
 }

osu.Game/osu.Game.csproj

@@ -294,12 +294,16 @@
     <Compile Include="Online\API\DummyAPIAccess.cs" />
     <Compile Include="Online\API\IAPIProvider.cs" />
     <Compile Include="Online\API\APIDownloadRequest.cs" />
+    <Compile Include="Online\API\Requests\GetUserRecentActivitiesRequest.cs" />
     <Compile Include="Online\API\Requests\GetUserRequest.cs" />
     <Compile Include="Migrations\20180125143340_Settings.cs" />
     <Compile Include="Migrations\20180125143340_Settings.Designer.cs">
       <DependentUpon>20180125143340_Settings.cs</DependentUpon>
     </Compile>
     <Compile Include="Migrations\20180131154205_AddMuteBinding.cs" />
+    <Compile Include="Overlays\Profile\Sections\Recent\DrawableRecentActivity.cs" />
+    <Compile Include="Overlays\Profile\Sections\Recent\MedalIcon.cs" />
+    <Compile Include="Overlays\Profile\Sections\Recent\PaginatedRecentActivityContainer.cs" />
     <Compile Include="Overlays\Profile\SupporterIcon.cs" />
     <Compile Include="Online\API\Requests\GetFriendsRequest.cs" />
     <Compile Include="Overlays\Settings\DangerousSettingsButton.cs" />