char/dendrite
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow multiple regexes per as namespace (#528)

Browse source 
Signed-off-by: Andrew Morgan <andrewm@matrix.org>
This commit is contained in:
Andrew Morgan 2018-07-06 02:46:12 -07:00 committed by GitHub
parent 8da54352e5
commit 20af8a6786
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/github.com/matrix-org/dendrite/common/config/appservice.go
View file

@ -207,18 +207,6 @@ func checkErrors(config *Dendrite) (err error) {
idMap[appservice.ID] = true
tokenMap[appservice.ASToken] = true
// Check if more than one regex exists per namespace
for _, namespace := range appservice.NamespaceMap {
if len(namespace) > 1 {
// It's quite easy to accidentally make multiple regex objects per
// namespace, which often ends up in an application service receiving events
// it doesn't want, as an empty regex will match all events.
return configErrors([]string{fmt.Sprintf(
"Application service namespace can only contain a single regex tuple. Check your YAML.",
)})
}
}
// TODO: Remove once rate_limited is implemented
if appservice.RateLimited {
log.Warn("WARNING: Application service option rate_limited is currently unimplemented")