From 4834b181710efb0cdb96545de0b6b1caf69745d6 Mon Sep 17 00:00:00 2001
From: Justin Britton <jebritto@andrew.cmu.edu>
Date: Thu, 11 Mar 2021 14:34:57 -0500
Subject: [PATCH 1/4] backend signalr changes for collab editor

---
 src/TopoMojo.Abstractions/Models/Document.cs  | 13 ++++++++
 .../Controllers/DocumentController.cs         | 30 +++++++++++++++++--
 src/TopoMojo.Web/Controllers/Hubs/TopoHub.cs  | 19 +++++++++++-
 3 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 src/TopoMojo.Abstractions/Models/Document.cs

diff --git a/src/TopoMojo.Abstractions/Models/Document.cs b/src/TopoMojo.Abstractions/Models/Document.cs
new file mode 100644
index 00000000..a5f7d549
--- /dev/null
+++ b/src/TopoMojo.Abstractions/Models/Document.cs
@@ -0,0 +1,13 @@
+// Copyright 2020 Carnegie Mellon University. All Rights Reserved.
+// Released under a 3 Clause BSD-style license. See LICENSE.md in the project root for license information.
+
+using System;
+
+namespace TopoMojo.Models
+{
+    public class Document
+    {
+        public string Text { get; set; }
+        public string WhenSaved { get; set; }
+    }
+}
diff --git a/src/TopoMojo.Web/Controllers/DocumentController.cs b/src/TopoMojo.Web/Controllers/DocumentController.cs
index 904084ed..43a87779 100644
--- a/src/TopoMojo.Web/Controllers/DocumentController.cs
+++ b/src/TopoMojo.Web/Controllers/DocumentController.cs
@@ -8,9 +8,11 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
 using TopoMojo.Abstractions;
 using TopoMojo.Extensions;
+using TopoMojo.Models;
 using TopoMojo.Services;
 using TopoMojo.Web.Models;
 
@@ -24,24 +26,28 @@ public DocumentController(
             ILogger<AdminController> logger,
             IIdentityResolver identityResolver,
             WorkspaceService workspaceService,
-            FileUploadOptions uploadOptions
+            FileUploadOptions uploadOptions,
+            IHubContext<TopologyHub, ITopoEvent> hub
         ) : base(logger, identityResolver)
         {
             _uploadOptions = uploadOptions;
             _workspaceService = workspaceService;
+            _hub = hub;
         }
 
         private readonly WorkspaceService _workspaceService;
         private readonly FileUploadOptions _uploadOptions;
+        private readonly IHubContext<TopologyHub, ITopoEvent> _hub;
 
         /// <summary>
         /// Save markdown as document.
         /// </summary>
         /// <param name="id">Workspace Id</param>
         /// <param name="text">Markdown text</param>
+        /// <param name="fromTyping">Cause of save was automatic from user typing</param>
         /// <returns></returns>
         [HttpPut("api/document/{id}")]
-        public async Task<ActionResult> Save(string id, [FromBody]string text)
+        public async Task<ActionResult> Save(string id, [FromBody]string text, bool fromTyping = false)
         {
             if (!await _workspaceService.CanEdit(id))
                 return Forbid();
@@ -49,8 +55,10 @@ public async Task<ActionResult> Save(string id, [FromBody]string text)
             string path = BuildPath();
 
             path = System.IO.Path.Combine(path, id + ".md");
-
             System.IO.File.WriteAllText(path, text);
+            
+            if (fromTyping)
+                SendBroadcast(id, "saved", text);
 
             return Ok();
         }
@@ -139,6 +147,22 @@ private string BuildPath(params string[] segments)
             return path;
         }
 
+        private void SendBroadcast(string roomId, string action, string text)
+        {
+            _hub.Clients
+                .Group(roomId)
+                .DocumentEvent(
+                    new BroadcastEvent<Document>(
+                        User,
+                        "DOCUMENT." + action.ToUpper(),
+                        new Document {
+                            Text = text,
+                            WhenSaved = DateTime.UtcNow.ToString("u")
+                        }
+                    )
+                );
+        }
+
     }
 
 }
diff --git a/src/TopoMojo.Web/Controllers/Hubs/TopoHub.cs b/src/TopoMojo.Web/Controllers/Hubs/TopoHub.cs
index c5548bd2..e6f8cb4b 100644
--- a/src/TopoMojo.Web/Controllers/Hubs/TopoHub.cs
+++ b/src/TopoMojo.Web/Controllers/Hubs/TopoHub.cs
@@ -84,6 +84,21 @@ public Task TemplateMessage(string action, Template model){
             return Clients.OthersInGroup(model.WorkspaceGlobalId).TemplateEvent(new BroadcastEvent<Template>(Context.User, action, model));
         }
 
+        public Task Edited(string channelId, object textDiff)
+        {
+            return Clients.OthersInGroup(channelId).DocumentEvent(new BroadcastEvent<object>(Context.User, "DOCUMENT.UPDATED", textDiff));
+        }
+
+        public Task CursorChanged(string channelId, object positions)
+        {
+            return Clients.OthersInGroup(channelId).DocumentEvent(new BroadcastEvent<object>(Context.User, "DOCUMENT.CURSOR", positions));
+        }
+
+        public Task Editing(string channelId, bool val)
+        {
+            return Clients.OthersInGroup(channelId).DocumentEvent(new BroadcastEvent<Document>(Context.User, (val) ? "DOCUMENT.TYPING" : "DOCUMENT.IDLE", null));
+        }
+
     }
 
     public interface ITopoEvent
@@ -92,6 +107,8 @@ public interface ITopoEvent
         Task TopoEvent(BroadcastEvent<Workspace> broadcastEvent);
         Task TemplateEvent(BroadcastEvent<Template> broadcastEvent);
         Task ChatEvent(BroadcastEvent<Message> broadcastEvent);
+        Task DocumentEvent(BroadcastEvent<object> broadcastEvent);
+        Task DocumentEvent(BroadcastEvent<Document> broadcastEvent);
         Task VmEvent(BroadcastEvent<VmState> broadcastEvent);
         Task PresenceEvent(BroadcastEvent broadcastEvent);
         Task GameEvent(BroadcastEvent<GameState> broadcastEvent);
@@ -138,7 +155,7 @@ public static Actor AsActor(this System.Security.Principal.IPrincipal user)
             return new Actor
             {
                 Id = ((ClaimsPrincipal)user).FindFirstValue(JwtRegisteredClaimNames.Sub),
-                Name = user.Identity.Name
+                Name = ((ClaimsPrincipal)user).FindFirstValue("name")
             };
         }
     }

From f898bc5a043568a32e9a2baac43b7c0d3b3c4837 Mon Sep 17 00:00:00 2001
From: Justin Britton <jebritto@andrew.cmu.edu>
Date: Tue, 16 Mar 2021 14:36:07 -0400
Subject: [PATCH 2/4] change broadcast room id

---
 src/TopoMojo.Web/Controllers/DocumentController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TopoMojo.Web/Controllers/DocumentController.cs b/src/TopoMojo.Web/Controllers/DocumentController.cs
index 43a87779..fb15be63 100644
--- a/src/TopoMojo.Web/Controllers/DocumentController.cs
+++ b/src/TopoMojo.Web/Controllers/DocumentController.cs
@@ -58,7 +58,7 @@ public async Task<ActionResult> Save(string id, [FromBody]string text, bool from
             System.IO.File.WriteAllText(path, text);
             
             if (fromTyping)
-                SendBroadcast(id, "saved", text);
+                SendBroadcast($"{id}-doc", "saved", text);
 
             return Ok();
         }

From 1b9f799a98ff93500ada779f1f9b05288de0977a Mon Sep 17 00:00:00 2001
From: Justin Britton <jebritto@andrew.cmu.edu>
Date: Thu, 18 Mar 2021 13:24:43 -0400
Subject: [PATCH 3/4] precise timestamp for comparing versions

---
 src/TopoMojo.Abstractions/Models/Document.cs       | 1 +
 src/TopoMojo.Web/Controllers/DocumentController.cs | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/TopoMojo.Abstractions/Models/Document.cs b/src/TopoMojo.Abstractions/Models/Document.cs
index a5f7d549..be6bc69d 100644
--- a/src/TopoMojo.Abstractions/Models/Document.cs
+++ b/src/TopoMojo.Abstractions/Models/Document.cs
@@ -9,5 +9,6 @@ public class Document
     {
         public string Text { get; set; }
         public string WhenSaved { get; set; }
+        public string Timestamp { get; set; }
     }
 }
diff --git a/src/TopoMojo.Web/Controllers/DocumentController.cs b/src/TopoMojo.Web/Controllers/DocumentController.cs
index fb15be63..f63298d8 100644
--- a/src/TopoMojo.Web/Controllers/DocumentController.cs
+++ b/src/TopoMojo.Web/Controllers/DocumentController.cs
@@ -149,6 +149,7 @@ private string BuildPath(params string[] segments)
 
         private void SendBroadcast(string roomId, string action, string text)
         {
+            DateTime currentDatetime = DateTime.UtcNow;
             _hub.Clients
                 .Group(roomId)
                 .DocumentEvent(
@@ -157,7 +158,8 @@ private void SendBroadcast(string roomId, string action, string text)
                         "DOCUMENT." + action.ToUpper(),
                         new Document {
                             Text = text,
-                            WhenSaved = DateTime.UtcNow.ToString("u")
+                            WhenSaved = currentDatetime.ToString("u"),
+                            Timestamp = currentDatetime.ToString("ss.ffff")
                         }
                     )
                 );

From 8ceeaafe3dcc60e0182b9bc846a4659ad9829d2c Mon Sep 17 00:00:00 2001
From: Justin Britton <jebritto@andrew.cmu.edu>
Date: Tue, 23 Mar 2021 11:29:38 -0400
Subject: [PATCH 4/4] remove param for saving api

---
 src/TopoMojo.Web/Controllers/DocumentController.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/TopoMojo.Web/Controllers/DocumentController.cs b/src/TopoMojo.Web/Controllers/DocumentController.cs
index f63298d8..e212fb24 100644
--- a/src/TopoMojo.Web/Controllers/DocumentController.cs
+++ b/src/TopoMojo.Web/Controllers/DocumentController.cs
@@ -44,10 +44,9 @@ IHubContext<TopologyHub, ITopoEvent> hub
         /// </summary>
         /// <param name="id">Workspace Id</param>
         /// <param name="text">Markdown text</param>
-        /// <param name="fromTyping">Cause of save was automatic from user typing</param>
         /// <returns></returns>
         [HttpPut("api/document/{id}")]
-        public async Task<ActionResult> Save(string id, [FromBody]string text, bool fromTyping = false)
+        public async Task<ActionResult> Save(string id, [FromBody]string text)
         {
             if (!await _workspaceService.CanEdit(id))
                 return Forbid();
@@ -57,7 +56,6 @@ public async Task<ActionResult> Save(string id, [FromBody]string text, bool from
             path = System.IO.Path.Combine(path, id + ".md");
             System.IO.File.WriteAllText(path, text);
             
-            if (fromTyping)
                 SendBroadcast($"{id}-doc", "saved", text);
 
             return Ok();