Merge pull request #3499 from peppy/update-framework

Update framework

osu.Desktop/Overlays/VersionManager.cs

@@ -27,8 +27,8 @@ public class VersionManager : OverlayContainer
         private NotificationOverlay notificationOverlay;
         private GameHost host;
 
-        public override bool HandleKeyboardInput => false;
-        public override bool HandleMouseInput => false;
+        public override bool HandleNonPositionalInput => false;
+        public override bool HandlePositionalInput => false;
 
         [BackgroundDependencyLoader]
         private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config, GameHost host)

osu.Game.Rulesets.Mania/Edit/Layers/Selection/Overlays/HoldNoteMask.cs

@@ -78,7 +78,7 @@ protected override void Update()
             }
 
             // Todo: This is temporary, since the note masks don't do anything special yet. In the future they will handle input.
-            public override bool HandleMouseInput => false;
+            public override bool HandlePositionalInput => false;
         }
     }
 }

osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderCircleMask.cs

@@ -56,6 +56,6 @@ protected override void Update()
         }
 
         // Todo: This is temporary, since the slider circle masks don't do anything special yet. In the future they will handle input.
-        public override bool HandleMouseInput => false;
+        public override bool HandlePositionalInput => false;
     }
 }

osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs

@@ -59,7 +59,7 @@ protected override void Update()
             body.UpdateProgress(0);
         }
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => body.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => body.ReceivePositionalInputAt(screenSpacePos);
 
         public override Vector2 SelectionPoint => ToScreenSpace(OriginPosition);
         public override Quad SelectionQuad => body.PathDrawQuad;

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

@@ -184,6 +184,6 @@ protected override void UpdateCurrentState(ArmedState state)
 
         public Drawable ProxiedLayer => HeadCircle.ApproachCircle;
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => Body.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Body.ReceivePositionalInputAt(screenSpacePos);
     }
 }

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs

@@ -153,10 +153,10 @@ protected override void Update()
 
             if (Time.Current < slider.EndTime)
             {
-                // Make sure to use the base version of ReceiveMouseInputAt so that we correctly check the position.
+                // Make sure to use the base version of ReceivePositionalInputAt so that we correctly check the position.
                 Tracking = canCurrentlyTrack
                            && lastState != null
-                           && ReceiveMouseInputAt(lastState.Mouse.NativeState.Position)
+                           && ReceivePositionalInputAt(lastState.Mouse.NativeState.Position)
                            && (drawableSlider?.OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
             }
         }

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBody.cs

@@ -112,7 +112,7 @@ public SliderBody(Slider s)
             container.Attach(RenderbufferInternalFormat.DepthComponent16);
         }
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => path.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => path.ReceivePositionalInputAt(screenSpacePos);
 
         public void SetRange(double p0, double p1)
         {

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs

@@ -11,8 +11,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
     public class SpinnerBackground : CircularContainer, IHasAccentColour
     {
-        public override bool HandleKeyboardInput => false;
-        public override bool HandleMouseInput => false;
+        public override bool HandleNonPositionalInput => false;
+        public override bool HandlePositionalInput => false;
 
         protected Box Disc;
 

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs

@@ -40,7 +40,7 @@ public SpinnerDisc(Spinner s)
             };
         }
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         private bool tracking;
         public bool Tracking

osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs

@@ -76,7 +76,7 @@ public CursorTrail()
             }
         }
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         [BackgroundDependencyLoader]
         private void load(ShaderManager shaders, TextureStore textures)

osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs

@@ -72,7 +72,7 @@ public bool OnReleased(OsuAction action)
             return false;
         }
 
-        public override bool HandleMouseInput => true; // OverlayContainer will set this false when we go hidden, but we always want to receive input.
+        public override bool HandlePositionalInput => true; // OverlayContainer will set this false when we go hidden, but we always want to receive input.
 
         protected override void PopIn()
         {

osu.Game.Tests/Visual/TestCaseCursors.cs

@@ -193,7 +193,7 @@ private class CustomCursorBox : Container, IProvideCursor
             public CursorContainer Cursor { get; }
             public bool ProvidingUserCursor { get; }
 
-            public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => base.ReceiveMouseInputAt(screenSpacePos) || SmoothTransition && !ProvidingUserCursor;
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) || SmoothTransition && !ProvidingUserCursor;
 
             private readonly Box background;
 

osu.Game/Graphics/Backgrounds/Triangles.cs

@@ -30,8 +30,8 @@ public class Triangles : Drawable
         /// </summary>
         private const float edge_smoothness = 1;
 
-        public override bool HandleKeyboardInput => false;
-        public override bool HandleMouseInput => false;
+        public override bool HandleNonPositionalInput => false;
+        public override bool HandlePositionalInput => false;
 
 
         public Color4 ColourLight = Color4.White;

osu.Game/Graphics/Containers/LinkFlowContainer.cs

@@ -20,7 +20,7 @@ public LinkFlowContainer(Action<SpriteText> defaultCreationParameters = null)
         {
         }
 
-        public override bool HandleMouseInput => true;
+        public override bool HandlePositionalInput => true;
 
         private OsuGame game;
 

osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs

@@ -22,7 +22,7 @@ public class OsuFocusedOverlayContainer : FocusedOverlayContainer, IPreviewTrack
 
         protected virtual bool PlaySamplesOnStateChange => true;
 
-        protected override bool BlockPassThroughKeyboard => true;
+        protected override bool BlockNonPositionalInput => true;
 
         private PreviewTrackManager previewTrackManager;
 
@@ -54,14 +54,14 @@ private void load(OsuGame osuGame, AudioManager audio, PreviewTrackManager previ
         /// Whether mouse input should be blocked screen-wide while this overlay is visible.
         /// Performing mouse actions outside of the valid extents will hide the overlay.
         /// </summary>
-        public virtual bool BlockScreenWideMouse => BlockPassThroughMouse;
+        public virtual bool BlockScreenWideMouse => BlockPositionalInput;
 
         // receive input outside our bounds so we can trigger a close event on ourselves.
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => BlockScreenWideMouse || base.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => BlockScreenWideMouse || base.ReceivePositionalInputAt(screenSpacePos);
 
         protected override bool OnClick(InputState state)
         {
-            if (!base.ReceiveMouseInputAt(state.Mouse.NativeState.Position))
+            if (!base.ReceivePositionalInputAt(state.Mouse.NativeState.Position))
             {
                 State = Visibility.Hidden;
                 return true;

osu.Game/Graphics/DrawableDate.cs

@@ -54,7 +54,7 @@ private void updateTimeWithReschedule()
             Scheduler.AddDelayed(updateTimeWithReschedule, timeUntilNextUpdate);
         }
 
-        public override bool HandleMouseInput => true;
+        public override bool HandlePositionalInput => true;
 
         protected virtual string Format() => Date.Humanize();
 

osu.Game/Graphics/UserInterface/BreadcrumbControl.cs

@@ -47,10 +47,10 @@ private class BreadcrumbTabItem : OsuTabItem, IStateful<Visibility>
             public readonly SpriteIcon Chevron;
 
             //don't allow clicking between transitions and don't make the chevron clickable
-            public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => Alpha == 1f && Text.ReceiveMouseInputAt(screenSpacePos);
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Alpha == 1f && Text.ReceivePositionalInputAt(screenSpacePos);
 
-            public override bool HandleKeyboardInput => State == Visibility.Visible;
-            public override bool HandleMouseInput => State == Visibility.Visible;
+            public override bool HandleNonPositionalInput => State == Visibility.Visible;
+            public override bool HandlePositionalInput => State == Visibility.Visible;
             public override bool IsRemovable => true;
 
             private Visibility state;

osu.Game/Graphics/UserInterface/DialogButton.cs

@@ -211,7 +211,7 @@ public float TextSize
             }
         }
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => backgroundContainer.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => backgroundContainer.ReceivePositionalInputAt(screenSpacePos);
 
         protected override bool OnClick(InputState state)
         {

osu.Game/Graphics/UserInterface/FocusedTextBox.cs

@@ -34,7 +34,7 @@ public bool HoldFocus
         }
 
         // We may not be focused yet, but we need to handle keyboard input to be able to request focus
-        public override bool HandleKeyboardInput => HoldFocus || base.HandleKeyboardInput;
+        public override bool HandleNonPositionalInput => HoldFocus || base.HandleNonPositionalInput;
 
         protected override void OnFocus(InputState state)
         {

osu.Game/Graphics/UserInterface/TwoLayerButton.cs

@@ -170,7 +170,7 @@ public string Text
             }
         }
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => IconLayer.ReceiveMouseInputAt(screenSpacePos) || TextLayer.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => IconLayer.ReceivePositionalInputAt(screenSpacePos) || TextLayer.ReceivePositionalInputAt(screenSpacePos);
 
         protected override bool OnHover(InputState state)
         {

osu.Game/Online/API/OAuth.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Diagnostics;
+using System.Net.Http;
 using osu.Framework.Configuration;
 using osu.Framework.IO.Network;
 
@@ -40,7 +41,7 @@ internal bool AuthenticateWithLogin(string username, string password)
             using (var req = new AccessTokenRequestPassword(username, password)
             {
                 Url = $@"{endpoint}/oauth/token",
-                Method = HttpMethod.POST,
+                Method = HttpMethod.Post,
                 ClientId = clientId,
                 ClientSecret = clientSecret
             })
@@ -66,7 +67,7 @@ internal bool AuthenticateWithRefresh(string refresh)
                 using (var req = new AccessTokenRequestRefresh(refresh)
                 {
                     Url = $@"{endpoint}/oauth/token",
-                    Method = HttpMethod.POST,
+                    Method = HttpMethod.Post,
                     ClientId = clientId,
                     ClientSecret = clientSecret
                 })

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

@@ -2,34 +2,19 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using System.Linq;
-using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
 
 namespace osu.Game.Online.API.Requests
 {
     public class GetMessagesRequest : APIRequest<List<Message>>
     {
-        private readonly List<Channel> channels;
-        private readonly long? since;
+        private readonly Channel channel;
 
-        public GetMessagesRequest(List<Channel> channels, long? sinceId)
+        public GetMessagesRequest(Channel channel)
         {
-            this.channels = channels;
-            since = sinceId;
+            this.channel = channel;
         }
 
-        protected override WebRequest CreateWebRequest()
-        {
-            string channelString = string.Join(",", channels.Select(x => x.Id));
-
-            var req = base.CreateWebRequest();
-            req.AddParameter(@"channels", channelString);
-            if (since.HasValue) req.AddParameter(@"since", since.Value.ToString());
-
-            return req;
-        }
-
-        protected override string Target => @"chat/messages";
+        protected override string Target => $@"chat/channels/{channel.Id}/messages";
     }
 }

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using JetBrains.Annotations;
+using osu.Framework.IO.Network;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetUpdatesRequest : APIRequest<GetUpdatesResponse>
+    {
+        private readonly long since;
+        private readonly Channel channel;
+
+        public GetUpdatesRequest(long sinceId, [CanBeNull] Channel channel = null)
+        {
+            this.channel = channel;
+            since = sinceId;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            if (channel != null) req.AddParameter(@"channel", channel.Id.ToString());
+            req.AddParameter(@"since", since.ToString());
+
+            return req;
+        }
+
+        protected override string Target => @"chat/updates";
+    }
+}

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

@@ -0,0 +1,18 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetUpdatesResponse
+    {
+        [JsonProperty]
+        public List<Channel> Presence;
+
+        [JsonProperty]
+        public List<Message> Messages;
+    }
+}

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

@@ -0,0 +1,31 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Net.Http;
+using osu.Framework.IO.Network;
+using osu.Game.Online.Chat;
+using osu.Game.Users;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class JoinChannelRequest : APIRequest
+    {
+        private readonly Channel channel;
+        private readonly User user;
+
+        public JoinChannelRequest(Channel channel, User user)
+        {
+            this.channel = channel;
+            this.user = user;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.Method = HttpMethod.Put;
+            return req;
+        }
+
+        protected override string Target => $@"chat/channels/{channel.Id}/users/{user.Id}";
+    }
+}

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

@@ -0,0 +1,31 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Net.Http;
+using osu.Framework.IO.Network;
+using osu.Game.Online.Chat;
+using osu.Game.Users;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class LeaveChannelRequest : APIRequest
+    {
+        private readonly Channel channel;
+        private readonly User user;
+
+        public LeaveChannelRequest(Channel channel, User user)
+        {
+            this.channel = channel;
+            this.user = user;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.Method = HttpMethod.Delete;
+            return req;
+        }
+
+        protected override string Target => $@"chat/channels/{channel.Id}/users/{user.Id}";
+    }
+}

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

@@ -1,7 +1,7 @@
 // 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.Extensions;
+using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
 
@@ -20,15 +20,13 @@ protected override WebRequest CreateWebRequest()
         {
             var req = base.CreateWebRequest();
 
-            req.Method = HttpMethod.POST;
-            req.AddParameter(@"target_type", message.TargetType.GetDescription());
-            req.AddParameter(@"target_id", message.TargetId.ToString());
+            req.Method = HttpMethod.Post;
             req.AddParameter(@"is_action", message.IsAction.ToString().ToLowerInvariant());
             req.AddParameter(@"message", message.Content);
 
             return req;
         }
 
-        protected override string Target => @"chat/messages";
+        protected override string Target => $@"chat/channels/{message.ChannelId}/messages";
     }
 }

osu.Game/Online/Chat/Channel.cs

@@ -19,11 +19,14 @@ public class Channel
         public string Topic;
 
         [JsonProperty(@"type")]
-        public string Type;
+        public ChannelType Type;
 
         [JsonProperty(@"channel_id")]
         public int Id;
 
+        [JsonProperty(@"last_message_id")]
+        public long? LastMessageId;
+
         public readonly SortedList<Message> Messages = new SortedList<Message>(Comparer<Message>.Default);
 
         private readonly List<LocalEchoMessage> pendingMessages = new List<LocalEchoMessage>();
@@ -51,11 +54,20 @@ public void AddLocalEcho(LocalEchoMessage message)
             NewMessagesArrived?.Invoke(new[] { message });
         }
 
+        public bool MessagesLoaded { get; private set; }
+
         public void AddNewMessages(params Message[] messages)
         {
             messages = messages.Except(Messages).ToArray();
 
+            if (messages.Length == 0) return;
+
             Messages.AddRange(messages);
+            MessagesLoaded = true;
+
+            var maxMessageId = messages.Max(m => m.Id);
+            if (maxMessageId > LastMessageId)
+                LastMessageId = maxMessageId;
 
             purgeOldMessages();
 

osu.Game/Online/Chat/ChannelType.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Online.Chat
+{
+    public enum ChannelType
+    {
+        PM,
+        Public
+    }
+}

osu.Game/Online/Chat/DrawableLinkCompiler.cs

@@ -24,7 +24,7 @@ public class DrawableLinkCompiler : OsuHoverContainer, IHasTooltip
         /// </summary>
         public List<SpriteText> Parts;
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => Parts.Any(d => d.ReceiveMouseInputAt(screenSpacePos));
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parts.Any(d => d.ReceivePositionalInputAt(screenSpacePos));
 
         protected override HoverClickSounds CreateHoverClickSounds(HoverSampleSet sampleSet) => new LinkHoverSounds(sampleSet, Parts);
 
@@ -53,7 +53,7 @@ public LinkHoverSounds(HoverSampleSet sampleSet, List<SpriteText> parts)
                 this.parts = parts;
             }
 
-            public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => parts.Any(d => d.ReceiveMouseInputAt(screenSpacePos));
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => parts.Any(d => d.ReceivePositionalInputAt(screenSpacePos));
         }
     }
 }

osu.Game/Online/Chat/Message.cs

@@ -18,11 +18,8 @@ public class Message : IComparable<Message>, IEquatable<Message>
         [JsonProperty(@"sender_id")]
         public int UserId;
 
-        [JsonProperty(@"target_type")]
-        public TargetType TargetType;
-
-        [JsonProperty(@"target_id")]
-        public int TargetId;
+        [JsonProperty(@"channel_id")]
+        public int ChannelId;
 
         [JsonProperty(@"is_action")]
         public bool IsAction;

osu.Game/Overlays/BeatmapSetOverlay.cs

@@ -51,7 +51,7 @@ public BeatmapSetInfo BeatmapSet
         }
 
         // receive input outside our bounds so we can trigger a close event on ourselves.
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         public BeatmapSetOverlay()
         {

osu.Game/Overlays/ChatOverlay.cs

@@ -47,7 +47,7 @@ public class ChatOverlay : OsuFocusedOverlayContainer, IOnlineComponent
 
         public const float TAB_AREA_HEIGHT = 50;
 
-        private GetMessagesRequest fetchReq;
+        private GetUpdatesRequest fetchReq;
 
         private readonly ChatTabControl channelTabs;
 
@@ -62,7 +62,7 @@ public class ChatOverlay : OsuFocusedOverlayContainer, IOnlineComponent
         private readonly Container channelSelectionContainer;
         private readonly ChannelSelectionOverlay channelSelection;
 
-        public override bool Contains(Vector2 screenSpacePos) => chatContainer.ReceiveMouseInputAt(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.ReceiveMouseInputAt(screenSpacePos);
+        public override bool Contains(Vector2 screenSpacePos) => chatContainer.ReceivePositionalInputAt(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.ReceivePositionalInputAt(screenSpacePos);
 
         public ChatOverlay()
         {
@@ -285,7 +285,7 @@ private void load(APIAccess api, OsuConfigManager config, OsuColour colours)
             chatBackground.Colour = colours.ChatBlue;
         }
 
-        private long? lastMessageId;
+        private long lastMessageId;
 
         private readonly List<Channel> careChannels = new List<Channel>();
 
@@ -304,9 +304,9 @@ private void initializeChannels()
 
                 Scheduler.Add(delegate
                 {
+                    //todo: decide how to handle default channels for a user now that they are saved server-side.
                     addChannel(channels.Find(c => c.Name == @"#lazer"));
                     addChannel(channels.Find(c => c.Name == @"#osu"));
-                    addChannel(channels.Find(c => c.Name == @"#lobby"));
 
                     channelSelection.OnRequestJoin = addChannel;
                     channelSelection.OnRequestLeave = removeChannel;
@@ -320,7 +320,7 @@ private void initializeChannels()
                     };
                 });
 
-                messageRequest = Scheduler.AddDelayed(fetchNewMessages, 1000, true);
+                messageRequest = Scheduler.AddDelayed(fetchUpdates, 1000, true);
             };
 
             api.Queue(req);
@@ -362,7 +362,7 @@ protected Channel CurrentChannel
                     loadedChannels.Add(loaded);
                     LoadComponentAsync(loaded, l =>
                     {
-                        if (currentChannel.Messages.Any())
+                        if (currentChannel.MessagesLoaded)
                             loading.Hide();
 
                         currentChannelContainer.Clear(false);
@@ -394,6 +394,15 @@ private void addChannel(Channel channel)
             {
                 careChannels.Add(channel);
                 channelTabs.AddItem(channel);
+
+                if (channel.Type == ChannelType.Public && !channel.Joined)
+                {
+                    var req = new JoinChannelRequest(channel, api.LocalUser);
+                    req.Success += () => addChannel(channel);
+                    req.Failure += ex => removeChannel(channel);
+                    api.Queue(req);
+                    return;
+                }
             }
 
             // let's fetch a small number of messages to bring us up-to-date with the backlog.
@@ -415,47 +424,53 @@ private void removeChannel(Channel channel)
             loadedChannels.Remove(loadedChannels.Find(c => c.Channel == channel));
             channelTabs.RemoveItem(channel);
 
+            api.Queue(new LeaveChannelRequest(channel, api.LocalUser));
             channel.Joined.Value = false;
         }
 
         private void fetchInitialMessages(Channel channel)
         {
-            var req = new GetMessagesRequest(new List<Channel> { channel }, null);
-
-            req.Success += delegate (List<Message> messages)
+            var req = new GetMessagesRequest(channel);
+            req.Success += messages =>
             {
-                loading.Hide();
                 channel.AddNewMessages(messages.ToArray());
-                Debug.Write("success!");
-            };
-            req.Failure += delegate
-            {
-                Debug.Write("failure!");
+                if (channel == currentChannel)
+                    loading.Hide();
             };
 
             api.Queue(req);
         }
 
-        private void fetchNewMessages()
+        private void fetchUpdates()
         {
             if (fetchReq != null) return;
 
-            fetchReq = new GetMessagesRequest(careChannels, lastMessageId);
+            fetchReq = new GetUpdatesRequest(lastMessageId);
 
-            fetchReq.Success += delegate (List<Message> messages)
+            fetchReq.Success += updates =>
             {
-                foreach (var group in messages.Where(m => m.TargetType == TargetType.Channel).GroupBy(m => m.TargetId))
-                    careChannels.Find(c => c.Id == group.Key)?.AddNewMessages(group.ToArray());
+                if (updates?.Presence != null)
+                {
+                    foreach (var channel in updates.Presence)
+                    {
+                        if (careChannels.Find(c => c.Id == channel.Id) == null)
+                        {
+                            channel.Joined.Value = true;
+                            addChannel(channel);
+                        }
+                    }
 
-                lastMessageId = messages.LastOrDefault()?.Id ?? lastMessageId;
+                    foreach (var group in updates.Messages.GroupBy(m => m.ChannelId))
+                        careChannels.Find(c => c.Id == group.Key)?.AddNewMessages(group.ToArray());
+
+                    lastMessageId = updates.Messages.LastOrDefault()?.Id ?? lastMessageId;
+                }
 
-                Debug.Write("success!");
                 fetchReq = null;
             };
 
             fetchReq.Failure += delegate
             {
-                Debug.Write("failure!");
                 fetchReq = null;
             };
 
@@ -517,8 +532,7 @@ private void postMessage(TextBox textbox, bool newText)
             {
                 Sender = api.LocalUser.Value,
                 Timestamp = DateTimeOffset.Now,
-                TargetType = TargetType.Channel, //TODO: read this from channel
-                TargetId = target.Id,
+                ChannelId = target.Id,
                 IsAction = isAction,
                 Content = postText
             };

osu.Game/Overlays/Dialog/PopupDialog.cs

@@ -26,7 +26,7 @@ public class PopupDialog : OsuFocusedOverlayContainer
         public static readonly float ENTER_DURATION = 500;
         public static readonly float EXIT_DURATION = 200;
 
-        protected override bool BlockPassThroughMouse => false;
+        protected override bool BlockPositionalInput => false;
 
         private readonly Vector2 ringSize = new Vector2(100f);
         private readonly Vector2 ringMinifiedSize = new Vector2(20f);

osu.Game/Overlays/DialogOverlay.cs

@@ -43,7 +43,7 @@ public void Push(PopupDialog dialog)
 
         protected override bool PlaySamplesOnStateChange => false;
 
-        protected override bool BlockPassThroughKeyboard => true;
+        protected override bool BlockNonPositionalInput => true;
 
         private void onDialogOnStateChanged(VisibilityContainer dialog, Visibility v)
         {

osu.Game/Overlays/Direct/FilterControl.cs

@@ -73,8 +73,8 @@ private void Bindable_ValueChanged(RulesetInfo obj)
                 iconContainer.FadeTo(Ruleset.ID == obj?.ID ? 1f : 0.5f, 100);
             }
 
-            public override bool HandleKeyboardInput => !bindable.Disabled && base.HandleKeyboardInput;
-            public override bool HandleMouseInput => !bindable.Disabled && base.HandleMouseInput;
+            public override bool HandleNonPositionalInput => !bindable.Disabled && base.HandleNonPositionalInput;
+            public override bool HandlePositionalInput => !bindable.Disabled && base.HandlePositionalInput;
 
             public RulesetToggleButton(Bindable<RulesetInfo> bindable, RulesetInfo ruleset)
             {

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -40,7 +40,7 @@ public class ModSelectOverlay : WaveOverlayContainer
         protected readonly OsuSpriteText MultiplierLabel, UnrankedLabel;
         private readonly FillFlowContainer footerContainer;
 
-        protected override bool BlockPassThroughKeyboard => false;
+        protected override bool BlockNonPositionalInput => false;
 
         protected readonly FillFlowContainer<ModSection> ModSectionsContainer;
 

osu.Game/Overlays/OnScreenDisplay.cs

@@ -25,8 +25,8 @@ public class OnScreenDisplay : Container
     {
         private readonly Container box;
 
-        public override bool HandleKeyboardInput => false;
-        public override bool HandleMouseInput => false;
+        public override bool HandleNonPositionalInput => false;
+        public override bool HandlePositionalInput => false;
 
         private readonly SpriteText textLine1;
         private readonly SpriteText textLine2;

osu.Game/Overlays/Toolbar/Toolbar.cs

@@ -24,7 +24,7 @@ public class Toolbar : OverlayContainer
 
         private readonly ToolbarUserArea userArea;
 
-        protected override bool BlockPassThroughMouse => false;
+        protected override bool BlockPositionalInput => false;
 
         private const double transition_time = 500;
 

osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs

@@ -103,8 +103,8 @@ protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
             return false;
         }
 
-        public override bool HandleKeyboardInput => !ruleset.Disabled && base.HandleKeyboardInput;
-        public override bool HandleMouseInput => !ruleset.Disabled && base.HandleMouseInput;
+        public override bool HandleNonPositionalInput => !ruleset.Disabled && base.HandleNonPositionalInput;
+        public override bool HandlePositionalInput => !ruleset.Disabled && base.HandlePositionalInput;
 
         private void disabledChanged(bool isDisabled) => this.FadeColour(isDisabled ? Color4.Gray : Color4.White, 300);
 

osu.Game/Overlays/VolumeOverlay.cs

@@ -28,7 +28,7 @@ public class VolumeOverlay : OverlayContainer
         private VolumeMeter volumeMeterMusic;
         private MuteButton muteButton;
 
-        protected override bool BlockPassThroughMouse => false;
+        protected override bool BlockPositionalInput => false;
 
         private readonly BindableDouble muteAdjustment = new BindableDouble();
 

osu.Game/Overlays/WaveOverlayContainer.cs

@@ -11,7 +11,7 @@ public abstract class WaveOverlayContainer : OsuFocusedOverlayContainer
     {
         protected readonly WaveContainer Waves;
 
-        protected override bool BlockPassThroughKeyboard => true;
+        protected override bool BlockNonPositionalInput => true;
         protected override Container<Drawable> Content => Waves;
 
         protected WaveOverlayContainer()

osu.Game/Rulesets/Edit/HitObjectMask.cs

@@ -45,7 +45,7 @@ public class HitObjectMask : CompositeDrawable, IStateful<SelectionState>
         public readonly DrawableHitObject HitObject;
 
         protected override bool ShouldBeAlive => HitObject.IsAlive && HitObject.IsPresent || State == SelectionState.Selected;
-        public override bool HandleMouseInput => ShouldBeAlive;
+        public override bool HandlePositionalInput => ShouldBeAlive;
         public override bool RemoveWhenNotAlive => false;
 
         public HitObjectMask(DrawableHitObject hitObject)

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -78,8 +78,8 @@ public abstract class DrawableHitObject : SkinReloadableDrawable, IHasAccentColo
         private bool judgementOccurred;
 
         public bool Interactive = true;
-        public override bool HandleKeyboardInput => Interactive;
-        public override bool HandleMouseInput => Interactive;
+        public override bool HandleNonPositionalInput => Interactive;
+        public override bool HandlePositionalInput => Interactive;
 
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;

osu.Game/Rulesets/Scoring/Score.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Users;
@@ -32,6 +33,7 @@ public class Score
 
         public User User;
 
+        [JsonIgnore]
         public Replay Replay;
 
         public BeatmapInfo Beatmap;

osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs

@@ -231,7 +231,7 @@ protected override void UpdateValue(float value)
             {
             }
 
-            public override bool HandleKeyboardInput => IsHovered && !CurrentNumber.Disabled;
+            public override bool HandleNonPositionalInput => IsHovered && !CurrentNumber.Disabled;
 
             protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
             {

osu.Game/Screens/Menu/Button.cs

@@ -47,7 +47,7 @@ public class Button : BeatSyncedContainer, IStateful<ButtonState>
         private SampleChannel sampleClick;
         private SampleChannel sampleHover;
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => box.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
         public Button(string text, string sampleName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
         {
@@ -229,8 +229,8 @@ private void trigger()
             boxHoverLayer.FadeOut(800, Easing.OutExpo);
         }
 
-        public override bool HandleKeyboardInput => state == ButtonState.Expanded;
-        public override bool HandleMouseInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
+        public override bool HandleNonPositionalInput => state == ButtonState.Expanded;
+        public override bool HandlePositionalInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
 
         protected override void Update()
         {

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -160,8 +160,8 @@ private bool onOsuLogo()
 
         private ButtonSystemState state = ButtonSystemState.Initial;
 
-        public override bool HandleKeyboardInput => state != ButtonSystemState.Exit;
-        public override bool HandleMouseInput => state != ButtonSystemState.Exit;
+        public override bool HandleNonPositionalInput => state != ButtonSystemState.Exit;
+        public override bool HandlePositionalInput => state != ButtonSystemState.Exit;
 
         public ButtonSystemState State
         {

osu.Game/Screens/Menu/LogoVisualisation.cs

@@ -64,8 +64,8 @@ public class LogoVisualisation : Drawable, IHasAccentColour
 
         private readonly float[] frequencyAmplitudes = new float[256];
 
-        public override bool HandleKeyboardInput => false;
-        public override bool HandleMouseInput => false;
+        public override bool HandleNonPositionalInput => false;
+        public override bool HandlePositionalInput => false;
 
         private Shader shader;
         private readonly Texture texture;

osu.Game/Screens/Menu/MenuSideFlashes.cs

@@ -19,8 +19,8 @@ namespace osu.Game.Screens.Menu
 {
     public class MenuSideFlashes : BeatSyncedContainer
     {
-        public override bool HandleKeyboardInput => false;
-        public override bool HandleMouseInput => false;
+        public override bool HandleNonPositionalInput => false;
+        public override bool HandlePositionalInput => false;
 
         private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 

osu.Game/Screens/Menu/OsuLogo.cs

@@ -68,7 +68,7 @@ public bool Triangles
 
         public bool BeatMatching = true;
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => logoContainer.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => logoContainer.ReceivePositionalInputAt(screenSpacePos);
 
         public bool Ripple
         {
@@ -342,7 +342,7 @@ protected override void Update()
             }
         }
 
-        public override bool HandleMouseInput => base.HandleMouseInput && Action != null && Alpha > 0.2f;
+        public override bool HandlePositionalInput => base.HandlePositionalInput && Action != null && Alpha > 0.2f;
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {

osu.Game/Screens/Play/GameplayMenuOverlay.cs

@@ -28,9 +28,9 @@ public abstract class GameplayMenuOverlay : OverlayContainer, IKeyBindingHandler
         private const int button_height = 70;
         private const float background_alpha = 0.75f;
 
-        protected override bool BlockPassThroughKeyboard => true;
+        protected override bool BlockNonPositionalInput => true;
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         public Action OnRetry;
         public Action OnQuit;

osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs

@@ -51,7 +51,7 @@ public PlayerSettingsOverlay()
         protected override void PopOut() => this.FadeOut(fade_duration);
 
         //We want to handle keyboard inputs all the time in order to trigger ToggleVisibility() when not visible
-        public override bool HandleKeyboardInput => true;
+        public override bool HandleNonPositionalInput => true;
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {

osu.Game/Screens/Play/HUD/QuitButton.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class QuitButton : FillFlowContainer
     {
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         private readonly Button button;
 

osu.Game/Screens/Play/KeyCounterCollection.cs

@@ -118,8 +118,8 @@ public Color4 KeyUpTextColor
 
         private void updateVisibility() => this.FadeTo(Visible.Value || configVisibility.Value ? 1 : 0, duration);
 
-        public override bool HandleKeyboardInput => receptor == null;
-        public override bool HandleMouseInput => receptor == null;
+        public override bool HandleNonPositionalInput => receptor == null;
+        public override bool HandlePositionalInput => receptor == null;
 
         public IFrameBasedClock AudioClock { get; set; }
 
@@ -149,7 +149,7 @@ public Receptor(KeyCounterCollection target)
                 Target = target;
             }
 
-            public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
             protected override bool Handle(UIEvent e)
             {

osu.Game/Screens/Play/KeyCounterMouse.cs

@@ -17,7 +17,7 @@ public KeyCounterMouse(MouseButton button) : base(getStringRepresentation(button
             Button = button;
         }
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         private static string getStringRepresentation(MouseButton button)
         {

osu.Game/Screens/Play/SkipOverlay.cs

@@ -37,8 +37,8 @@ public class SkipOverlay : OverlayContainer, IKeyBindingHandler<GlobalAction>
         private FadeContainer fadeContainer;
         private double displayTime;
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
-        protected override bool BlockPassThroughMouse => false;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+        protected override bool BlockPositionalInput => false;
 
         public SkipOverlay(double startTime)
         {

osu.Game/Screens/Play/SongProgress.cs

@@ -31,8 +31,8 @@ public class SongProgress : OverlayContainer
 
         public Action<double> OnSeek;
 
-        public override bool HandleKeyboardInput => AllowSeeking;
-        public override bool HandleMouseInput => AllowSeeking;
+        public override bool HandleNonPositionalInput => AllowSeeking;
+        public override bool HandlePositionalInput => AllowSeeking;
 
         private IClock audioClock;
         public IClock AudioClock { set { audioClock = info.AudioClock = value; } }

osu.Game/Screens/Play/SquareGraph.cs

@@ -21,8 +21,8 @@ public class SquareGraph : BufferedContainer
 
         public int ColumnCount => columns.Length;
 
-        public override bool HandleKeyboardInput => false;
-        public override bool HandleMouseInput => false;
+        public override bool HandleNonPositionalInput => false;
+        public override bool HandlePositionalInput => false;
 
         private int progress;
         public int Progress

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -52,8 +52,8 @@ public class BeatmapCarousel : OsuScrollContainer
         /// </summary>
         public Action<BeatmapInfo> SelectionChanged;
 
-        public override bool HandleKeyboardInput => AllowSelection;
-        public override bool HandleMouseInput => AllowSelection;
+        public override bool HandleNonPositionalInput => AllowSelection;
+        public override bool HandlePositionalInput => AllowSelection;
 
         /// <summary>
         /// Used to avoid firing null selections before the initial beatmaps have been loaded via <see cref="BeatmapSets"/>.

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -59,7 +59,7 @@ private void load([CanBeNull] Bindable<RulesetInfo> parentRuleset)
             ruleset.ValueChanged += _ => updateDisplay();
         }
 
-        protected override bool BlockPassThroughMouse => false;
+        protected override bool BlockPositionalInput => false;
 
         protected override void PopIn()
         {
@@ -89,6 +89,8 @@ public WorkingBeatmap Beatmap
             }
         }
 
+        public override bool IsPresent => base.IsPresent || Info == null; // Visibility is updated in the LoadComponentAsync callback
+
         private BufferedWedgeInfo loadingInfo;
 
         private void updateDisplay()
@@ -154,7 +156,7 @@ private void load(LocalisationManager localisation)
                 RelativeSizeAxes = Axes.Both;
 
                 titleBinding = localisation.GetLocalisedString(new LocalisedString((metadata.TitleUnicode, metadata.Title)));
-                artistBinding  = localisation.GetLocalisedString(new LocalisedString((metadata.ArtistUnicode, metadata.Artist)));
+                artistBinding = localisation.GetLocalisedString(new LocalisedString((metadata.ArtistUnicode, metadata.Artist)));
 
                 Children = new Drawable[]
                 {

osu.Game/Screens/Select/FilterControl.cs

@@ -72,8 +72,8 @@ public GroupMode Group
 
         private readonly SearchTextBox searchTextBox;
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) =>
-            base.ReceiveMouseInputAt(screenSpacePos) || groupTabs.ReceiveMouseInputAt(screenSpacePos) || sortTabs.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            base.ReceivePositionalInputAt(screenSpacePos) || groupTabs.ReceivePositionalInputAt(screenSpacePos) || sortTabs.ReceivePositionalInputAt(screenSpacePos);
 
         public FilterControl()
         {

osu.Game/Screens/Select/FooterButton.cs

@@ -56,7 +56,7 @@ public Color4 SelectedColour
         private readonly Box box;
         private readonly Box light;
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => box.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
         public FooterButton()
         {

osu.Game/Screens/Select/Leaderboards/Placeholder.cs

@@ -11,7 +11,7 @@ public abstract class Placeholder : OsuTextFlowContainer, IEquatable<Placeholder
     {
         protected const float TEXT_SIZE = 22;
 
-        public override bool HandleMouseInput => true;
+        public override bool HandlePositionalInput => true;
 
         protected Placeholder()
             : base(cp => cp.TextSize = TEXT_SIZE)

osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs

@@ -85,7 +85,7 @@ protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
             return false;
         }
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => box.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
         public BeatmapOptionsButton()
         {

osu.Game/Storyboards/Drawables/DrawableStoryboard.cs

@@ -18,8 +18,8 @@ public class DrawableStoryboard : Container<DrawableStoryboardLayer>
         protected override Container<DrawableStoryboardLayer> Content => content;
 
         protected override Vector2 DrawScale => new Vector2(Parent.DrawHeight / 480);
-        public override bool HandleKeyboardInput => false;
-        public override bool HandleMouseInput => false;
+        public override bool HandleNonPositionalInput => false;
+        public override bool HandlePositionalInput => false;
 
         private bool passing = true;
         public bool Passing

osu.Game/osu.Game.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.3" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2018.920.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2018.928.0" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.10.1" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.sln.DotSettings

@@ -218,6 +218,7 @@
   <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
   <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
   <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;