aboutsummaryrefslogtreecommitdiff
path: root/BackEnd/Timeline/Services/User/UserAvatarService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'BackEnd/Timeline/Services/User/UserAvatarService.cs')
-rw-r--r--BackEnd/Timeline/Services/User/UserAvatarService.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/BackEnd/Timeline/Services/User/UserAvatarService.cs b/BackEnd/Timeline/Services/User/UserAvatarService.cs
index 0a4b7438..e18a0560 100644
--- a/BackEnd/Timeline/Services/User/UserAvatarService.cs
+++ b/BackEnd/Timeline/Services/User/UserAvatarService.cs
@@ -95,7 +95,7 @@ namespace Timeline.Services.User
if (_cacheData == null || File.GetLastWriteTime(path) > _cacheDigest!.LastModified)
{
var data = await File.ReadAllBytesAsync(path);
- _cacheDigest = new CacheableDataDigest(await _eTagGenerator.Generate(data), File.GetLastWriteTime(path));
+ _cacheDigest = new CacheableDataDigest(await _eTagGenerator.GenerateETagAsync(data), File.GetLastWriteTime(path));
Image.Identify(data, out var format);
_cacheData = new ByteData(data, format.DefaultMimeType);
}
@@ -120,7 +120,7 @@ namespace Timeline.Services.User
private readonly DatabaseContext _database;
private readonly IBasicUserService _basicUserService;
private readonly IDefaultUserAvatarProvider _defaultUserAvatarProvider;
- private readonly IImageValidator _imageValidator;
+ private readonly IImageService _imageValidator;
private readonly IDataManager _dataManager;
private readonly IClock _clock;
@@ -129,7 +129,7 @@ namespace Timeline.Services.User
DatabaseContext database,
IBasicUserService basicUserService,
IDefaultUserAvatarProvider defaultUserAvatarProvider,
- IImageValidator imageValidator,
+ IImageService imageValidator,
IDataManager dataManager,
IClock clock)
{
@@ -192,7 +192,7 @@ namespace Timeline.Services.User
if (avatar is null)
throw new ArgumentNullException(nameof(avatar));
- await _imageValidator.Validate(avatar.Data, avatar.ContentType, true);
+ await _imageValidator.ValidateAsync(avatar.Data, avatar.ContentType, true);
await _basicUserService.ThrowIfUserNotExist(userId);
@@ -200,7 +200,7 @@ namespace Timeline.Services.User
await using var transaction = await _database.Database.BeginTransactionAsync();
- var tag = await _dataManager.RetainEntry(avatar.Data);
+ var tag = await _dataManager.RetainEntryAsync(avatar.Data);
var now = _clock.GetCurrentTime();
@@ -218,7 +218,7 @@ namespace Timeline.Services.User
else
{
if (entity.DataTag is not null)
- await _dataManager.FreeEntry(entity.DataTag);
+ await _dataManager.FreeEntryAsync(entity.DataTag);
entity.DataTag = tag;
entity.Type = avatar.ContentType;
@@ -243,7 +243,7 @@ namespace Timeline.Services.User
await using var transaction = await _database.Database.BeginTransactionAsync();
- await _dataManager.FreeEntry(entity.DataTag);
+ await _dataManager.FreeEntryAsync(entity.DataTag);
entity.DataTag = null;
entity.Type = null;