Merge remote-tracking branch 'origin/develop' into develop

Author: t3chguy

assets/css/main.css

@@ -96,4 +96,7 @@ h2 {
 }
 span.redacted {
     color: red;
+}
+tr.evHighlight {
+    background-color: yellow;
 }

src/github.com/t3chguy/matrix-static/matrix-static.go

@@ -177,6 +177,13 @@ func main() {
 
 	roomRouter := publicRouter.Group("/room/:roomID/")
 	{
+		roomRouter.GET("/$:eventID", func(c *gin.Context) {
+			eventID := c.Param("eventID")
+			roomID := c.Param("roomID")
+
+			c.Redirect(http.StatusTemporaryRedirect, "/room/"+roomID+"/?anchor=$"+eventID+"&highlight")
+		})
+
 		// Load room worker into request object so that we can do any clean up etc here
 		roomRouter.Use(func(c *gin.Context) {
 			roomID := c.Param("roomID")
@@ -245,6 +252,7 @@ func main() {
 			}
 
 			events := mxclient.ReverseEventsCopy(jobResult.Events)
+			_, highlight := c.GetQuery("highlight")
 
 			templates.WritePageTemplate(c.Writer, &templates.RoomChatPage{
 				RoomInfo:      jobResult.RoomInfo,
@@ -259,6 +267,7 @@ func main() {
 
 				Sanitizer:         sanitizerFn,
 				HomeserverBaseURL: client.HomeserverURL.String(),
+				Highlight:         highlight,
 			})
 		})
 

src/github.com/t3chguy/matrix-static/templates/room-chat.qtpl

@@ -57,8 +57,9 @@
         AtTopEnd    bool
         AtBottomEnd bool
 
-        Sanitizer *sanitizer.Sanitizer
+        Sanitizer         *sanitizer.Sanitizer
         HomeserverBaseURL string
+        Highlight         bool
     }
 %}
 
@@ -233,14 +234,18 @@
     }
 %}
 
-{% func (p *RoomChatPage) printEvent(ev, prevEv *gomatrix.Event) %}
+{% func (p *RoomChatPage) printEvent(ev, prevEv *gomatrix.Event, highlight bool) %}
     {% if needsDateSeparator(ev, prevEv) %}
         <tr class="timestamp dateSep">
             <td colspan="3">{%s parseEventTimestamp(ev.Timestamp).Format("2 Jan 2006") %}</td>
         </tr>
     {% endif %}
 
+    {% if highlight %}
+    <tr class="evHighlight">
+    {% else %}
     <tr>
+    {% endif %}
         <td class="timestamp nowrap">
             {% code
                 time := parseEventTimestamp(ev.Timestamp)
@@ -348,9 +353,12 @@
                 </tr>
             </thead>
             <tbody>
-                {% code var prevEv gomatrix.Event %}
-                {% for _, event := range p.Events %}
-                    {%= p.printEvent(&event, &prevEv) %}
+                {% code
+                    var prevEv gomatrix.Event
+                    numEvents := len(p.Events)
+                %}
+                {% for i, event := range p.Events %}
+                    {%= p.printEvent(&event, &prevEv, i == numEvents - 1) %}
                     {% code prevEv = event %}
                 {% endfor %}
             </tbody>