Merge pull request #347 from crupest/markdown

Markdown post auto translate data url.

1 files changed, 13 insertions, 2 deletions

diff --git a/BackEnd/Timeline/Controllers/TimelinePostController.cs b/BackEnd/Timeline/Controllers/TimelinePostController.cs
index 4026d551..86c5c8cf 100644
--- a/BackEnd/Timeline/Controllers/TimelinePostController.cs
+++ b/BackEnd/Timeline/Controllers/TimelinePostController.cs
@@ -32,14 +32,17 @@ namespace Timeline.Controllers
 

         private readonly TimelineMapper _timelineMapper;

 

+        private readonly MarkdownProcessor _markdownProcessor;

+

         /// <summary>

         /// 

         /// </summary>

-        public TimelinePostController(ITimelineService timelineService, ITimelinePostService timelinePostService, TimelineMapper timelineMapper)

+        public TimelinePostController(ITimelineService timelineService, ITimelinePostService timelinePostService, TimelineMapper timelineMapper, MarkdownProcessor markdownProcessor)

         {

             _timelineService = timelineService;

             _postService = timelinePostService;

             _timelineMapper = timelineMapper;

+            _markdownProcessor = markdownProcessor;

         }

 

         private bool UserHasAllTimelineManagementPermission => this.UserHasPermission(UserPermission.AllTimelineManagement);

@@ -147,7 +150,15 @@ namespace Timeline.Controllers
 

             return await DataCacheHelper.GenerateActionResult(this,

                 () => _postService.GetPostDataDigest(timelineId, post, dataIndex),

-                () => _postService.GetPostData(timelineId, post, dataIndex)

+                async () =>

+                {

+                    var data = await _postService.GetPostData(timelineId, post, dataIndex);

+                    if (data.ContentType == MimeTypes.TextMarkdown)

+                    {

+                        return new ByteData(_markdownProcessor.Process(data.Data, Url, timeline, post), data.ContentType);

+                    }

+                    return data;

+                }

             );

         }