Ensure there is no duplicate trailing slash in url, remove server/dist

mattermost-community · May 6, 2019 · e2c78d9 · e2c78d9
1 parent d30d99d
commit e2c78d9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,13 +15,13 @@
 
 # Build
 /coverage.txt
-/plugin.exe
 /mattermost-jitsi-plugin*.tar.gz
 /dist
 server/vendor
 node_modules
 .npminstall
 webapp/dist
+server/dist
 
 # Mac
 *.swp

diff --git a/README.md b/README.md
@@ -10,9 +10,7 @@ Go to the [releases page of this Github repository](https://github.com/seansacko
 
 This plugin contains both a server and web app portion.
 
-Use `make dist` to build distributions of the plugin that you can upload to a Mattermost server for testing.
-
-Use `make check-style` to check the style for the whole plugin.
+Use `make` to check the quality of your code, as well as build distributions of the plugin that you can upload to a Mattermost server for testing.
 
 ### Server
 

diff --git a/server/dist/plugin-darwin-amd64 b/server/dist/plugin-darwin-amd64
diff --git a/server/dist/plugin-linux-amd64 b/server/dist/plugin-linux-amd64
diff --git a/server/plugin.go b/server/plugin.go
@@ -98,6 +98,7 @@ func (p *Plugin) handleStartMeeting(w http.ResponseWriter, r *http.Request) {
 		meetingID = generateRoomWithoutSeparator()
 	}
 	jitsiURL := strings.TrimSpace(p.getConfiguration().JitsiURL)
+	jitsiURL = strings.TrimRight(jitsiURL, "/")
 	meetingURL := jitsiURL + "/" + meetingID
 
 	post := &model.Post{