RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-18 04:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually use the fact that ChannelManager is now a component

Browse Source
This commit is contained in:
miterosan 2018-04-11 20:37:51 +02:00
parent 2056258def
commit c2020742b2
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Online/Chat/ChannelManager.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
@ -19,24 +20,28 @@ namespace osu.Game.Online.Chat
/// <summary>
/// Manages everything channel related
/// </summary>
public class ChannelManager : Component, IOnlineComponent
public class ChannelManager : Component, IOnlineComponent,
{
/// <summary>
/// The channels the player joins on startup
/// </summary>
private readonly string[] defaultChannels =
{
@"#lazer", @"#osu", @"#lobby"
@"#lazer",
@"#osu",
@"#lobby"
};
/// <summary>
/// The currently opened channel
/// </summary>
public Bindable<Channel> CurrentChannel { get; } = new Bindable<Channel>();
/// <summary>
/// The Channels the player has joined
/// </summary>
public ObservableCollection<Channel> JoinedChannels { get; } = new ObservableCollection<Channel>();
/// <summary>
/// The channels available for the player to join
/// </summary>
@ -56,7 +61,7 @@ namespace osu.Game.Online.Chat
throw new ArgumentNullException(nameof(name));
CurrentChannel.Value = AvailableChannels.FirstOrDefault(c => c.Name == name)
?? throw new ArgumentException($"Channel {name} was not found.");
?? throw new ArgumentException($"Channel {name} was not found.");
}
public void OpenUserChannel(User user)
@ -65,12 +70,11 @@ namespace osu.Game.Online.Chat
throw new ArgumentNullException(nameof(user));
CurrentChannel.Value = JoinedChannels.FirstOrDefault(c => c.Target == TargetType.User && c.Id == user.Id)
?? new Channel(user);
?? new Channel(user);
}
public ChannelManager(Scheduler scheduler)
public ChannelManager()
{
this.scheduler = scheduler ?? throw new ArgumentNullException(nameof(scheduler));
CurrentChannel.ValueChanged += currentChannelChanged;
}
@ -131,6 +135,7 @@ namespace osu.Game.Online.Chat
CurrentChannel.Value.AddNewMessages(new ErrorMessage("Usage: /me [action]"));
break;
}
PostMessage(content, true);
break;
@ -253,7 +258,7 @@ namespace osu.Game.Online.Chat
{
JoinedChannels.Add(channel);
var fetchInitialMsgReq = new GetChannelMessagesRequest(new[] {channel}, null);
var fetchInitialMsgReq = new GetChannelMessagesRequest(new[] { channel }, null);
fetchInitialMsgReq.Success += handleChannelMessages;
fetchInitialMsgReq.Failure += exception => Logger.Error(exception, "Failed to fetch inital messages.");
api.Queue(fetchInitialMsgReq);
@ -268,8 +273,6 @@ namespace osu.Game.Online.Chat
public void APIStateChanged(APIAccess api, APIState state)
{
this.api = api ?? throw new ArgumentNullException(nameof(api));
switch (state)
{
case APIState.Online:
@ -285,5 +288,12 @@ namespace osu.Game.Online.Chat
break;
}
}
[BackgroundDependencyLoader]
private void load(IAPIProvider api)
{
this.api = this.api;
api.Register(this);
}
}
}

5
osu.Game/OsuGameBase.cs
View File

@ -113,10 +113,7 @@ namespace osu.Game
dependencies.Cache(api);
dependencies.CacheAs<IAPIProvider>(api);
var chatManager = new ChannelManager(Scheduler);
api.Register(chatManager);
dependencies.Cache(chatManager);
dependencies.Cache(new ChannelManager());
dependencies.Cache(RulesetStore = new RulesetStore(contextFactory));
dependencies.Cache(FileStore = new FileStore(contextFactory, Host.Storage));