diff options
Diffstat (limited to 'fedauth.go')
| -rw-r--r-- | fedauth.go | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -15,20 +15,20 @@ import ( "github.com/jackc/pgx/v5" ) -func check_and_update_federated_user_status(ctx context.Context, user_id int, service, remote_username, pubkey string) (bool, error) { +func fedauth(ctx context.Context, userID int, service, remoteUsername, pubkey string) (bool, error) { var err error var resp *http.Response matched := false - username_escaped := url.PathEscape(remote_username) + usernameEscaped := url.PathEscape(remoteUsername) switch service { case "sr.ht": - resp, err = http.Get("https://meta.sr.ht/~" + username_escaped + ".keys") + resp, err = http.Get("https://meta.sr.ht/~" + usernameEscaped + ".keys") case "github": - resp, err = http.Get("https://github.com/" + username_escaped + ".keys") + resp, err = http.Get("https://github.com/" + usernameEscaped + ".keys") case "codeberg": - resp, err = http.Get("https://codeberg.org/" + username_escaped + ".keys") + resp, err = http.Get("https://codeberg.org/" + usernameEscaped + ".keys") case "tangled": - resp, err = http.Get("https://tangled.sh/keys/" + username_escaped) + resp, err = http.Get("https://tangled.sh/keys/" + usernameEscaped) // TODO: Don't rely on one webview default: return false, errors.New("unknown federated service") @@ -51,11 +51,11 @@ func check_and_update_federated_user_status(ctx context.Context, user_id int, se return false, err } - line_split := strings.Split(line, " ") - if len(line_split) < 2 { + lineSplit := strings.Split(line, " ") + if len(lineSplit) < 2 { continue } - line = strings.Join(line_split[:2], " ") + line = strings.Join(lineSplit[:2], " ") if line == pubkey { matched = true @@ -74,10 +74,10 @@ func check_and_update_federated_user_status(ctx context.Context, user_id int, se defer func() { _ = tx.Rollback(ctx) }() - if _, err = tx.Exec(ctx, `UPDATE users SET type = 'federated' WHERE id = $1 AND type = 'pubkey_only'`, user_id); err != nil { + if _, err = tx.Exec(ctx, `UPDATE users SET type = 'federated' WHERE id = $1 AND type = 'pubkey_only'`, userID); err != nil { return false, err } - if _, err = tx.Exec(ctx, `INSERT INTO federated_identities (user_id, service, remote_username) VALUES ($1, $2, $3)`, user_id, service, remote_username); err != nil { + if _, err = tx.Exec(ctx, `INSERT INTO federated_identities (user_id, service, remote_username) VALUES ($1, $2, $3)`, userID, service, remoteUsername); err != nil { return false, err } if err = tx.Commit(ctx); err != nil { |