Skip to content

Commit fc63446

Browse files
authored
Merge pull request #748 from matrix-org/hs/as-crypto-support
Add SendEphemeral and EnableEncryption to appservice configuration fo…
2 parents 9e9f6d3 + e1b98b6 commit fc63446

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

b/blueprints.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,14 @@ type Room struct {
7979
}
8080

8181
type ApplicationService struct {
82-
ID string
83-
HSToken string
84-
ASToken string
85-
URL string
86-
SenderLocalpart string
87-
RateLimited bool
82+
ID string
83+
HSToken string
84+
ASToken string
85+
URL string
86+
SenderLocalpart string
87+
RateLimited bool
88+
SendEphemeral bool
89+
EnableEncryption bool
8890
}
8991

9092
type Event struct {

internal/docker/builder.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,9 @@ func generateASRegistrationYaml(as b.ApplicationService) string {
423423
fmt.Sprintf("url: '%s'\\n", as.URL) +
424424
fmt.Sprintf("sender_localpart: %s\\n", as.SenderLocalpart) +
425425
fmt.Sprintf("rate_limited: %v\\n", as.RateLimited) +
426+
fmt.Sprintf("de.sorunome.msc2409.push_ephemeral: %v\\n", as.SendEphemeral) +
427+
fmt.Sprintf("push_ephemeral: %v\\n", as.SendEphemeral) +
428+
fmt.Sprintf("org.matrix.msc3202: %v\\n", as.EnableEncryption) +
426429
"namespaces:\\n" +
427430
" users:\\n" +
428431
" - exclusive: false\\n" +

0 commit comments

Comments
 (0)