mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into user_state_key_equals

Browse source
This commit is contained in:
oliverpool 2020-08-25 17:03:36 +02:00 committed by GitHub
parent 2675be8dc0 48850d9995
commit 563ebd054e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clientapi/routing/routing.go
View file

@ -75,6 +75,9 @@ func Setup(
"r0.1.0", "r0.1.0",
"r0.2.0", "r0.2.0",
"r0.3.0", "r0.3.0",
"r0.4.0",
"r0.5.0",
"r0.6.1",
}}, }},
} }
}), }),

4
roomserver/storage/shared/storage.go
View file

@ -22,9 +22,7 @@ import (
// will be necessary for compliance with the law. Note that downstream components (syncapi) WILL delete information // will be necessary for compliance with the law. Note that downstream components (syncapi) WILL delete information
// in their database on receipt of a redaction. Also note that we still modify the event JSON to set the field // in their database on receipt of a redaction. Also note that we still modify the event JSON to set the field
// unsigned.redacted_because - we just don't clear out the content fields yet. // unsigned.redacted_because - we just don't clear out the content fields yet.
// const redactionsArePermanent = true
// If this hasn't been done by 09/2020 this should be flipped to true.
const redactionsArePermanent = false
type Database struct { type Database struct {
DB *sql.DB DB *sql.DB