LogalDeveloper/owncast
0
Fork 0
Code Activity

Merge branch 'develop' into webv2

Browse Source
This commit is contained in:
Gabe Kangas
2022-08-09 14:14:45 -07:00
parent 80742097e6 fa5b3d338e
commit d12f25f556
28 changed files with 199 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/auth/fediverse/fediverse.go
View File

@@ -29,7 +29,12 @@ func RegisterFediverseOTPRequest(u user.User, w http.ResponseWriter, r *http.Req
}
accessToken := r.URL.Query().Get("accessToken")
reg := fediverseauth.RegisterFediverseOTP(accessToken, u.ID, u.DisplayName, req.FediverseAccount)
reg, success := fediverseauth.RegisterFediverseOTP(accessToken, u.ID, u.DisplayName, req.FediverseAccount)
if !success {
controllers.WriteSimpleResponse(w, false, "Could not register auth request. One may already be pending. Try again later.")
return
}
msg := fmt.Sprintf("<p>This is an automated message from %s. If you did not request this message please ignore or block. Your requested one-time code is:</p><p>%s</p>", data.GetServerName(), reg.Code)
if err := activitypub.SendDirectFederatedMessage(msg, reg.Account); err != nil {
controllers.WriteSimpleResponse(w, false, "Could not send code to fediverse: "+err.Error())