aboutsummaryrefslogtreecommitdiff
path: root/BackEnd/Timeline/Models/Mapper
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2021-02-04 21:39:03 +0800
committerGitHub <noreply@github.com>2021-02-04 21:39:03 +0800
commit76d8616a6ba18f2bf86c46d865a9426e5accf55f (patch)
treeae0a8eb5f5a2d35114247f44a35e35e20aa2dee7 /BackEnd/Timeline/Models/Mapper
parent85247119bb82189baf100cd369e2f5993ee9d296 (diff)
parentc09ec62c64fe2d7cd09f7a2d9989ad96b43606a3 (diff)
downloadtimeline-76d8616a6ba18f2bf86c46d865a9426e5accf55f.tar.gz
timeline-76d8616a6ba18f2bf86c46d865a9426e5accf55f.tar.bz2
timeline-76d8616a6ba18f2bf86c46d865a9426e5accf55f.zip
Merge pull request #244 from crupest/color
Backend: Color
Diffstat (limited to 'BackEnd/Timeline/Models/Mapper')
-rw-r--r--BackEnd/Timeline/Models/Mapper/TimelineMapper.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/BackEnd/Timeline/Models/Mapper/TimelineMapper.cs b/BackEnd/Timeline/Models/Mapper/TimelineMapper.cs
index 79a6fa1d..94e55237 100644
--- a/BackEnd/Timeline/Models/Mapper/TimelineMapper.cs
+++ b/BackEnd/Timeline/Models/Mapper/TimelineMapper.cs
@@ -42,6 +42,7 @@ namespace Timeline.Models.Mapper
owner: await _userMapper.MapToHttp(entity.Owner, urlHelper),
visibility: entity.Visibility,
members: await _userMapper.MapToHttp(entity.Members.Select(m => m.User).ToList(), urlHelper),
+ color: entity.Color,
createTime: entity.CreateTime,
lastModified: entity.LastModified,
isHighlight: await _highlightTimelineService.IsHighlightTimeline(entity.Id),
@@ -105,6 +106,7 @@ namespace Timeline.Models.Mapper
deleted: content is null,
time: entity.Time,
author: author,
+ color: entity.Color,
lastUpdated: entity.LastUpdated
);
}