Merge branch 'master' into frontend

2 files changed, 16 insertions, 2 deletions

diff --git a/BackEnd/Timeline/Models/Http/HttpTimeline.cs b/BackEnd/Timeline/Models/Http/HttpTimeline.cs
index 87ebf0bb..e3e46bd5 100644
--- a/BackEnd/Timeline/Models/Http/HttpTimeline.cs
+++ b/BackEnd/Timeline/Models/Http/HttpTimeline.cs
@@ -10,7 +10,7 @@ namespace Timeline.Models.Http
     {

         public HttpTimeline() { }

 

-        public HttpTimeline(string uniqueId, string title, string name, DateTime nameLastModifed, string description, HttpUser owner, TimelineVisibility visibility, List<HttpUser> members, string? color, DateTime createTime, DateTime lastModified, bool isHighlight, bool isBookmark, HttpTimelineLinks links)

+        public HttpTimeline(string uniqueId, string title, string name, DateTime nameLastModifed, string description, HttpUser owner, TimelineVisibility visibility, List<HttpUser> members, string? color, DateTime createTime, DateTime lastModified, bool isHighlight, bool isBookmark, bool manageable, bool postable, HttpTimelineLinks links)

         {

             UniqueId = uniqueId;

             Title = title;

@@ -25,6 +25,8 @@ namespace Timeline.Models.Http
             LastModified = lastModified;

             IsHighlight = isHighlight;

             IsBookmark = isBookmark;

+            Manageable = manageable;

+            Postable = postable;

             _links = links;

         }

 

@@ -78,6 +80,8 @@ namespace Timeline.Models.Http
         public bool IsHighlight { get; set; }

 

         public bool IsBookmark { get; set; }

+        public bool Manageable { get; set; }

+        public bool Postable { get; set; }

 

 #pragma warning disable CA1707 // Identifiers should not contain underscores

         /// <summary>

diff --git a/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs b/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs
index 26e1a92d..5e069821 100644
--- a/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs
+++ b/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs
@@ -11,7 +11,7 @@ namespace Timeline.Models.Http
     {

         public HttpTimelinePost() { }

 

-        public HttpTimelinePost(long id, List<HttpTimelinePostDataDigest> dataList, bool deleted, DateTime time, HttpUser? author, string? color, DateTime lastUpdated)

+        public HttpTimelinePost(long id, List<HttpTimelinePostDataDigest> dataList, bool deleted, DateTime time, HttpUser? author, string? color, DateTime lastUpdated, string timelineName, bool editable)

         {

             Id = id;

             DataList = dataList;

@@ -20,6 +20,8 @@ namespace Timeline.Models.Http
             Author = author;

             Color = color;

             LastUpdated = lastUpdated;

+            TimelineName = timelineName;

+            Editable = editable;

         }

 

         /// <summary>

@@ -52,5 +54,13 @@ namespace Timeline.Models.Http
         /// Last updated time.

         /// </summary>

         public DateTime LastUpdated { get; set; } = default!;

+        /// <summary>

+        /// Timeline name.

+        /// </summary>

+        public string TimelineName { get; set; } = default!;

+        /// <summary>

+        /// True if you can edit this post.

+        /// </summary>

+        public bool Editable { get; set; }

     }

 }