sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Update logging

Browse source
This commit is contained in:
Till Faelligen 2022-02-21 14:44:16 +01:00
parent 6622fda08c
commit c0845ea1ad
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
clientapi/routing/consent_tracking.go
View file

@ -117,7 +117,6 @@ func sendServerNoticeForConsent(userAPI userapi.UserInternalAPI, rsAPI api.Rooms
accountsDB userdb.Database,
asAPI appserviceAPI.AppServiceQueryAPI,
) {
logrus.Infof("Sending server notice to users who have not yet accepted the policy")
res := &userapi.QueryOutdatedPolicyUsersResponse{}
if err := userAPI.GetOutdatedPolicy(context.Background(), &userapi.QueryOutdatedPolicyUsersRequest{
PolicyVersion: cfgClient.Matrix.UserConsentOptions.Version,
@ -126,10 +125,17 @@ func sendServerNoticeForConsent(userAPI userapi.UserInternalAPI, rsAPI api.Rooms
return
}
consentOpts := cfgClient.Matrix.UserConsentOptions
data := make(map[string]string)
var err error
sentMessages := 0
var (
consentOpts = cfgClient.Matrix.UserConsentOptions
data = make(map[string]string)
err error
sentMessages int
)
if len(res.OutdatedUsers) > 0 {
logrus.WithField("count", len(res.OutdatedUsers)).Infof("Sending server notice to users who have not yet accepted the policy")
}
for _, userID := range res.OutdatedUsers {
if userID == cfgClient.Matrix.ServerNotices.LocalPart {
continue
@ -140,7 +146,6 @@ func sendServerNoticeForConsent(userAPI userapi.UserInternalAPI, rsAPI api.Rooms
logrus.WithError(err).WithField("userID", userID).Error("unable to construct consentURI")
continue
}
logrus.Debugf("sending message to %s", userID)
msgBody := &bytes.Buffer{}
if err = consentOpts.TextTemplates.ExecuteTemplate(msgBody, "serverNoticeTemplate", data); err != nil {
@ -174,7 +179,9 @@ func sendServerNoticeForConsent(userAPI userapi.UserInternalAPI, rsAPI api.Rooms
continue
}
}
logrus.Infof("Send messages to %d users", sentMessages)
if sentMessages > 0 {
logrus.Infof("Sent messages to %d users", sentMessages)
}
}
func buildConsentURI(cfgClient *config.ClientAPI, userID string) (string, error) {