Merge pull request #57 from t3chguy/develop

0.2.4

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/job-room-aliases.go

@@ -44,4 +44,5 @@ func (job RoomAliasesJob) Work(w *Worker) {
 		job.pageSize,
 		job.page,
 	}
+	room.Access()
 }

src/github.com/t3chguy/matrix-static/job-room-events.go

@@ -52,4 +52,5 @@ func (job RoomEventsJob) Work(w *Worker) {
 		atBottomEnd,
 		err,
 	}
+	room.Access()
 }

src/github.com/t3chguy/matrix-static/job-room-forwardpaginate.go

@@ -14,12 +14,33 @@
 
 package main
 
+import (
+	log "github.com/Sirupsen/logrus"
+	"sync"
+	"time"
+)
+
 // This Job has no Resp.
 
-type RoomForwardPaginateJob struct{}
+type RoomForwardPaginateJob struct {
+	wg *sync.WaitGroup
+}
+
+const LastAccessDiscardDuration = 30 * time.Minute
 
 func (job RoomForwardPaginateJob) Work(w *Worker) {
+	// discard old rooms first
+	numRoomsBefore := len(w.rooms)
+	for id, room := range w.rooms {
+		if room.LastAccess.Before(time.Now().Add(-LastAccessDiscardDuration)) {
+			delete(w.rooms, id)
+		}
+	}
+	numRoomsAfter := len(w.rooms)
+	log.WithField("worker", w.ID).WithField("numRooms", numRoomsAfter).Infof("Removed %d rooms", numRoomsBefore-numRoomsAfter)
+
 	for _, room := range w.rooms {
 		room.ForwardPaginateRoom()
 	}
+	job.wg.Done()
 }

src/github.com/t3chguy/matrix-static/job-room-memberinfo.go

@@ -59,4 +59,5 @@ func (job RoomMemberInfoJob) Work(w *Worker) {
 		memberInfo,
 		err,
 	}
+	room.Access()
 }

src/github.com/t3chguy/matrix-static/job-room-members.go

@@ -50,4 +50,5 @@ func (job RoomMembersJob) Work(w *Worker) {
 		job.pageSize,
 		job.page,
 	}
+	room.Access()
 }

src/github.com/t3chguy/matrix-static/job-room-powerlevels.go

@@ -35,4 +35,5 @@ func (job RoomPowerLevelsJob) Work(w *Worker) {
 		room.RoomInfo(),
 		powerLevels,
 	}
+	room.Access()
 }

src/github.com/t3chguy/matrix-static/job-room-servers.go

@@ -44,4 +44,5 @@ func (job RoomServersJob) Work(w *Worker) {
 		job.pageSize,
 		job.page,
 	}
+	room.Access()
 }

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

@@ -34,6 +34,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"sync"
 	"time"
 	"unicode"
 	"unicode/utf8"
@@ -176,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")
@@ -244,6 +252,7 @@ func main() {
 			}
 
 			events := mxclient.ReverseEventsCopy(jobResult.Events)
+			_, highlight := c.GetQuery("highlight")
 
 			templates.WritePageTemplate(c.Writer, &templates.RoomChatPage{
 				RoomInfo:      jobResult.RoomInfo,
@@ -258,6 +267,7 @@ func main() {
 
 				Sanitizer:         sanitizerFn,
 				HomeserverBaseURL: client.HomeserverURL.String(),
+				Highlight:         highlight,
 			})
 		})
 
@@ -362,13 +372,17 @@ func startPublicRoomListTimer(worldReadableRooms *mxclient.WorldReadableRooms) {
 	}
 }
 
-const LazyForwardPaginateRooms = time.Minute
+const LazyForwardPaginateRooms = 2 * time.Minute
 
 func startForwardPaginator(workers *Workers) {
-	t := time.NewTicker(LazyForwardPaginateRooms)
+	//t := time.NewTicker(LazyForwardPaginateRooms)
+	wg := sync.WaitGroup{}
 	for {
-		<-t.C
+		//<-t.C
+		time.Sleep(LazyForwardPaginateRooms)
+		wg.Add(int(workers.numWorkers))
 		log.Info("Forward paginating all loaded rooms")
-		workers.JobForAllWorkers(RoomForwardPaginateJob{})
+		workers.JobForAllWorkers(RoomForwardPaginateJob{&wg})
+		wg.Wait()
 	}
 }

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

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"github.com/matrix-org/gomatrix"
 	"github.com/t3chguy/matrix-static/utils"
+	"time"
 )
 
 type RoomInfo struct {
@@ -46,6 +47,12 @@ type Room struct {
 	latestRoomState RoomState
 
 	HasReachedHistoricEndOfTimeline bool
+
+	LastAccess time.Time
+}
+
+func (r *Room) Access() {
+	r.LastAccess = time.Now()
 }
 
 // ForwardPaginateRoom queries the API for any events newer than the latest one currently in the timeline and appends them.
@@ -197,6 +204,7 @@ func (m *Client) NewRoom(roomID string) (*Room, error) {
 		backPaginationToken:    resp.Messages.Start,
 		eventList:              filteredEventList,
 		latestRoomState:        *NewRoomState(m),
+		LastAccess:             time.Now(),
 	}
 
 	for _, event := range resp.State {

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

@@ -68,19 +68,26 @@ func ShouldHideEvent(ev gomatrix.Event) bool {
 	// m.room.aliases
 	// m.room.canonical_alias
 
-	if ev.Type == "m.room.history_visibility" ||
-		ev.Type == "m.room.join_rules" ||
-		ev.Type == "m.room.member" ||
-		ev.Type == "m.room.power_levels" ||
-		ev.Type == "m.room.message" ||
-		ev.Type == "m.room.name" ||
-		ev.Type == "m.room.topic" ||
-		ev.Type == "m.room.avatar" {
-		return false
-	}
+	if ev.StateKey == nil {
+		// Message Event
+		if ev.Type == "m.room.message" {
+			return false
+		}
+	} else {
+		// State Event
+		if ev.Type == "m.room.history_visibility" ||
+			ev.Type == "m.room.join_rules" ||
+			ev.Type == "m.room.member" ||
+			ev.Type == "m.room.power_levels" ||
+			ev.Type == "m.room.name" ||
+			ev.Type == "m.room.topic" ||
+			ev.Type == "m.room.avatar" {
+			return false
+		}
 
-	if ev.Type == "im.vector.modular.widgets" {
-		return false
+		if ev.Type == "im.vector.modular.widgets" {
+			return false
+		}
 	}
 
 	return true

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>