From d9bd6cd531936db37b7f5381cbf501da2442b585 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 7 Aug 2017 14:35:02 +0100
Subject: [PATCH 1/3] fix
diff --git a/src/github.com/t3chguy/matrix-static/templates/room-memberinfo.qtpl b/src/github.com/t3chguy/matrix-static/templates/room-memberinfo.qtpl
index 98f7493..3d3fdcd 100644
--- a/src/github.com/t3chguy/matrix-static/templates/room-memberinfo.qtpl
+++ b/src/github.com/t3chguy/matrix-static/templates/room-memberinfo.qtpl
@@ -10,8 +10,9 @@
+{% stripspace %}
{% func (p *RoomMemberInfoPage) Title() %}
- Public Room Member Info ({%s p.MemberInfo.MXID %}) - {%s p.RoomInfo.Name %} - Riot Static
+ Matrix Static - Public Room Member Info - {% space %}{%s p.RoomInfo.Name %}{% space %} - {% space %}{%s p.MemberInfo.MXID %}
{% endfunc %}
{% func (p *RoomMemberInfoPage) Head() %}
@@ -21,7 +22,6 @@
{%= PrintRoomHeader(p.RoomInfo) %}
{% endfunc %}
-{% stripspace %}
{% func (p *RoomMemberInfoPage) body() %}
MemberInfo of {% space %}{%s p.MemberInfo.GetName() %}{% space %} ({%s p.MemberInfo.MXID %})
diff --git a/src/github.com/t3chguy/matrix-static/templates/room-members.qtpl b/src/github.com/t3chguy/matrix-static/templates/room-members.qtpl
index 8af365c..ea31831 100644
--- a/src/github.com/t3chguy/matrix-static/templates/room-members.qtpl
+++ b/src/github.com/t3chguy/matrix-static/templates/room-members.qtpl
@@ -10,7 +10,7 @@
} %}
-
+{% stripspace %}
{% func (p *RoomMembersPage) printMemberRow(Member *mxclient.MemberInfo) %}
{%s Member.MXID %} |
@@ -29,7 +29,7 @@
{% func (p *RoomMembersPage) Title() %}
- Public Room Members - {%s p.RoomInfo.Name %} - Riot Static
+ Matrix Static - Public Room Members - {% space %}{%s p.RoomInfo.Name %}{% space %} - {% space %}{%d p.RoomInfo.NumMembers %}{% space %} members
{% endfunc %}
{% func (p *RoomMembersPage) Head() %}
@@ -39,7 +39,6 @@
{%= PrintRoomHeader(p.RoomInfo) %}
{% endfunc %}
-{% stripspace %}
{% func (p *RoomMembersPage) Body() %}
{%d p.RoomInfo.NumMemberEvents %}{% space %} users have interacted with this room.
@@ -78,7 +77,7 @@
return len(p.Members) == p.PageSize
}
func (p *RoomMembersPage) BaseUrl() string {
- return RoomBaseUrl(p.RoomInfo.RoomID) + "/members/"
+ return RoomBaseUrl(p.RoomInfo.RoomID) + "/members"
}
%}
\ No newline at end of file
diff --git a/src/github.com/t3chguy/matrix-static/templates/room-powerlevels.qtpl b/src/github.com/t3chguy/matrix-static/templates/room-powerlevels.qtpl
index 25993f1..97c1c69 100644
--- a/src/github.com/t3chguy/matrix-static/templates/room-powerlevels.qtpl
+++ b/src/github.com/t3chguy/matrix-static/templates/room-powerlevels.qtpl
@@ -8,7 +8,7 @@
} %}
-
+{% stripspace %}
{% func printPLRow(name string, pl mxclient.PowerLevel) %}
{%s name %} |
@@ -19,7 +19,7 @@
{% func (p *RoomPowerLevelsPage) Title() %}
- Public Room Servers - {%s p.RoomInfo.Name %} - Riot Static
+ Matrix Static - Public Room Powerlevels - {% space %}{%s p.RoomInfo.Name %}
{% endfunc %}
{% func (p *RoomPowerLevelsPage) Head() %}
@@ -29,7 +29,6 @@
{%= PrintRoomHeader(p.RoomInfo) %}
{% endfunc %}
-{% stripspace %}
{% func (p *RoomPowerLevelsPage) Body() %}
Room Power Level Requirements
diff --git a/src/github.com/t3chguy/matrix-static/templates/room-servers.qtpl b/src/github.com/t3chguy/matrix-static/templates/room-servers.qtpl
index 08bc4d9..82fae80 100644
--- a/src/github.com/t3chguy/matrix-static/templates/room-servers.qtpl
+++ b/src/github.com/t3chguy/matrix-static/templates/room-servers.qtpl
@@ -11,6 +11,7 @@
+{% stripspace %}
{% func (p *RoomServersPage) printServer(server mxclient.ServerUserCount) %}
{%s server.ServerName %} |
@@ -21,7 +22,7 @@
{% func (p *RoomServersPage) Title() %}
- Public Room Servers - {%s p.RoomInfo.Name %} - Riot Static
+ Matrix Static - Public Room Servers - {% space %}{%s p.RoomInfo.Name %}{% space %} - {% space %}{%d p.RoomInfo.NumServers %}{% space %} servers
{% endfunc %}
{% func (p *RoomServersPage) Head() %}
@@ -31,7 +32,6 @@
{%= PrintRoomHeader(p.RoomInfo) %}
{% endfunc %}
-{% stripspace %}
{% func (p *RoomServersPage) Body() %}
{%= PaginatorCurPage(p) %}
@@ -66,7 +66,7 @@
return len(p.Servers) == p.PageSize
}
func (p *RoomServersPage) BaseUrl() string {
- return RoomBaseUrl(p.RoomInfo.RoomID) + "/servers/"
+ return RoomBaseUrl(p.RoomInfo.RoomID) + "/servers"
}
%}
\ No newline at end of file
diff --git a/src/github.com/t3chguy/matrix-static/templates/rooms.qtpl b/src/github.com/t3chguy/matrix-static/templates/rooms.qtpl
index 1a082f3..296365c 100644
--- a/src/github.com/t3chguy/matrix-static/templates/rooms.qtpl
+++ b/src/github.com/t3chguy/matrix-static/templates/rooms.qtpl
@@ -14,6 +14,9 @@
%}
{% stripspace %}
+{% func (p *RoomsPage) Title() %}
+ Matrix Static - Public Rooms
+{% endfunc %}
{% func (p *RoomsPage) Head() %}
{%= PaginatorHeadLinks(p) %}
{% endfunc %}
From 57664be866c0dc6bf131c99d98578b6767542bc2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 7 Aug 2017 14:53:52 +0100
Subject: [PATCH 2/3] prom seconds->microseconds
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../src/github.com/t3chguy/go-gin-prometheus/middleware.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/vendor/src/github.com/t3chguy/go-gin-prometheus/middleware.go b/vendor/src/github.com/t3chguy/go-gin-prometheus/middleware.go
index 11cbab9..818fb57 100644
--- a/vendor/src/github.com/t3chguy/go-gin-prometheus/middleware.go
+++ b/vendor/src/github.com/t3chguy/go-gin-prometheus/middleware.go
@@ -47,8 +47,8 @@ func (p *Prometheus) registerMetrics(subsystem string) {
p.reqDur = prometheus.NewSummary(
prometheus.SummaryOpts{
Subsystem: subsystem,
- Name: "request_duration_seconds",
- Help: "The HTTP request latencies in seconds.",
+ Name: "request_duration_microseconds",
+ Help: "The HTTP request latencies in microseconds.",
},
)
prometheus.MustRegister(p.reqDur)
@@ -106,7 +106,7 @@ func (p *Prometheus) HandlerFunc() gin.HandlerFunc {
c.Next()
status := strconv.Itoa(c.Writer.Status())
- elapsed := float64(time.Since(start)) / float64(time.Second)
+ elapsed := float64(time.Since(start)) / float64(time.Microsecond)
resSz := float64(c.Writer.Size())
p.reqDur.Observe(elapsed)
From 88f8e3d59d4fc7b4606ae9ebd7f692d1d0acecde Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 7 Aug 2017 14:54:10 +0100
Subject: [PATCH 3/3] disable trailing slash redirects and change prom
subsystem gin->http
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/github.com/t3chguy/matrix-static/matrix-static.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/github.com/t3chguy/matrix-static/matrix-static.go b/src/github.com/t3chguy/matrix-static/matrix-static.go
index fc6220d..e4a0638 100644
--- a/src/github.com/t3chguy/matrix-static/matrix-static.go
+++ b/src/github.com/t3chguy/matrix-static/matrix-static.go
@@ -64,6 +64,7 @@ func main() {
sanitizerFn := sanitizer.InitSanitizer()
router := gin.New()
+ router.RedirectTrailingSlash = false
if *enablePprof {
pprof.Register(router, nil)
@@ -108,7 +109,7 @@ func main() {
publicRouter.Use(gin.Logger(), gin.Recovery())
if *enablePrometheusMetrics {
- ginProm := ginprometheus.NewPrometheus("gin")
+ ginProm := ginprometheus.NewPrometheus("http")
publicRouter.Use(ginProm.HandlerFunc())
router.GET(ginProm.MetricsPath, ginprometheus.PrometheusHandler())
}