github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Migrate ActivityLogEntryPoint.OnUserDeleted to IEventConsumer

Browse source
This commit is contained in:
Patrick Barron 2020-08-13 21:01:35 -04:00
parent 18d34f953b
commit 737a86d0cb
3 changed files with 53 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
View file

@ -64,7 +64,6 @@ namespace Emby.Server.Implementations.Activity
_sessionManager.SessionEnded += OnSessionEnded; _sessionManager.SessionEnded += OnSessionEnded;
_userManager.OnUserPasswordChanged += OnUserPasswordChanged; _userManager.OnUserPasswordChanged += OnUserPasswordChanged;
_userManager.OnUserDeleted += OnUserDeleted;
_userManager.OnUserLockedOut += OnUserLockedOut; _userManager.OnUserLockedOut += OnUserLockedOut;
return Task.CompletedTask; return Task.CompletedTask;
@ -146,18 +145,6 @@ namespace Emby.Server.Implementations.Activity
}).ConfigureAwait(false); }).ConfigureAwait(false);
} }
private async void OnUserDeleted(object sender, GenericEventArgs<User> e)
{
await CreateLogEntry(new ActivityLog(
string.Format(
CultureInfo.InvariantCulture,
_localization.GetLocalizedString("UserDeletedWithName"),
e.Argument.Username),
"UserDeleted",
Guid.Empty))
.ConfigureAwait(false);
}
private async void OnUserPasswordChanged(object sender, GenericEventArgs<User> e) private async void OnUserPasswordChanged(object sender, GenericEventArgs<User> e)
{ {
await CreateLogEntry(new ActivityLog( await CreateLogEntry(new ActivityLog(
@ -279,7 +266,6 @@ namespace Emby.Server.Implementations.Activity
_sessionManager.SessionEnded -= OnSessionEnded; _sessionManager.SessionEnded -= OnSessionEnded;
_userManager.OnUserPasswordChanged -= OnUserPasswordChanged; _userManager.OnUserPasswordChanged -= OnUserPasswordChanged;
_userManager.OnUserDeleted -= OnUserDeleted;
_userManager.OnUserLockedOut -= OnUserLockedOut; _userManager.OnUserLockedOut -= OnUserLockedOut;
} }
} }

18
Jellyfin.Data/Events/Users/UserDeletedEventArgs.cs Normal file
View file

@ -0,0 +1,18 @@
using Jellyfin.Data.Entities;
namespace Jellyfin.Data.Events.Users
{
/// <summary>
/// An event that occurs when a user is deleted.
/// </summary>
public class UserDeletedEventArgs : GenericEventArgs<User>
{
/// <summary>
/// Initializes a new instance of the <see cref="UserDeletedEventArgs"/> class.
/// </summary>
/// <param name="arg">The user.</param>
public UserDeletedEventArgs(User arg) : base(arg)
{
}
}
}

35
Jellyfin.Server.Implementations/Events/Consumers/Users/UserDeletedLogger.cs Normal file
View file

@ -0,0 +1,35 @@
using System;
using System.Globalization;
using System.Threading.Tasks;
using Jellyfin.Data.Entities;
using Jellyfin.Data.Events.Users;
using MediaBrowser.Controller.Events;
using MediaBrowser.Model.Activity;
using MediaBrowser.Model.Globalization;
namespace Jellyfin.Server.Implementations.Events.Consumers.Users
{
public class UserDeletedLogger : IEventConsumer<UserDeletedEventArgs>
{
private readonly ILocalizationManager _localizationManager;
private readonly IActivityManager _activityManager;
public UserDeletedLogger(ILocalizationManager localizationManager, IActivityManager activityManager)
{
_localizationManager = localizationManager;
_activityManager = activityManager;
}
public async Task OnEvent(UserDeletedEventArgs eventArgs)
{
await _activityManager.CreateAsync(new ActivityLog(
string.Format(
CultureInfo.InvariantCulture,
_localizationManager.GetLocalizedString("UserDeletedWithName"),
eventArgs.Argument.Username),
"UserDeleted",
Guid.Empty))
.ConfigureAwait(false);
}
}
}