From 4ea535d93753826ec900879560d876cec4d58c38 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 10 Feb 2021 02:03:06 +0800
Subject: ...

---
 BackEnd/Timeline/Controllers/UserAvatarController.cs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'BackEnd/Timeline/Controllers/UserAvatarController.cs')

diff --git a/BackEnd/Timeline/Controllers/UserAvatarController.cs b/BackEnd/Timeline/Controllers/UserAvatarController.cs
index f3b7fff8..8ac2d21a 100644
--- a/BackEnd/Timeline/Controllers/UserAvatarController.cs
+++ b/BackEnd/Timeline/Controllers/UserAvatarController.cs
@@ -7,6 +7,7 @@ using System;
 using System.Threading.Tasks;
 using Timeline.Filters;
 using Timeline.Helpers;
+using Timeline.Helpers.Cache;
 using Timeline.Models;
 using Timeline.Models.Http;
 using Timeline.Models.Validation;
@@ -63,11 +64,7 @@ namespace Timeline.Controllers
                 return NotFound(ErrorResponse.UserCommon.NotExist());
             }
 
-            return await DataCacheHelper.GenerateActionResult(this, () => _service.GetAvatarETag(id), async () =>
-            {
-                var avatar = await _service.GetAvatar(id);
-                return avatar.ToCacheableData();
-            });
+            return await DataCacheHelper.GenerateActionResult(this, () => _service.GetAvatarDigest(id), () => _service.GetAvatar(id));
         }
 
         /// <summary>
@@ -105,11 +102,7 @@ namespace Timeline.Controllers
 
             try
             {
-                var etag = await _service.SetAvatar(id, new Avatar
-                {
-                    Data = body.Data,
-                    Type = body.ContentType
-                });
+                var etag = await _service.SetAvatar(id, body);
 
                 _logger.LogInformation(Log.Format(LogPutSuccess,
                     ("Username", username), ("Mime Type", Request.ContentType)));
@@ -166,7 +159,7 @@ namespace Timeline.Controllers
                 return BadRequest(ErrorResponse.UserCommon.NotExist());
             }
 
-            await _service.SetAvatar(id, null);
+            await _service.DeleteAvatar(id);
             return Ok();
         }
     }
-- 
cgit v1.2.3