Skip to content

Handle absent activity results without an err variable #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
medvednikov merged 1 commit into from
Nov 2, 2026
Merged

Handle absent activity results without an err variable #299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions user/user.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ pub fn (mut app App) register_user(username string, password string, salt string
if matching_emails.len == 0 {
user_email := Email{
user_id: username_user.id
email: candidate_email
email: candidate_email
}
sql tx {
insert user_email into Email
Expand All @@ -223,21 +223,21 @@ pub fn (mut app App) register_user(username string, password string, salt string
}!
tx.commit()!
committed = true
app.add_activity(id, 'joined') or { app.info('could not record joined activity: ${err}') }
app.add_activity(id, 'joined') or { app.info('could not record joined activity') }
app.create_user_dir(account_name)
return true
}

user := User{
username: account_name
password: password
salt: salt
created_at: time.now()
is_registered: true
is_github: github
username: account_name
password: password
salt: salt
created_at: time.now()
is_registered: true
is_github: github
github_username: if github { account_name } else { '' }
avatar: default_avatar_name
is_admin: is_admin
avatar: default_avatar_name
is_admin: is_admin
}

sql tx {
Expand All @@ -259,7 +259,7 @@ pub fn (mut app App) register_user(username string, password string, salt string
for email in clean_emails {
user_email := Email{
user_id: created.id
email: email
email: email
}
sql tx {
insert user_email into Email
Expand Down Expand Up @@ -316,7 +316,7 @@ pub fn (mut app App) add_user(user User) ! {
pub fn (mut app App) add_email(user_id int, email string) ! {
user_email := Email{
user_id: user_id
email: email
email: email
}

sql app.db {
Expand Down Expand Up @@ -470,10 +470,10 @@ fn (mut app App) search_users(query string) []User {
mut users := []User{}
for row in repo_rows {
users << User{
id: row[0].int()
id: row[0].int()
full_name: row[1]
username: row[2]
avatar: row[3]
username: row[2]
avatar: row[3]
}
}
return users
Expand Down Expand Up @@ -627,13 +627,13 @@ pub fn (mut app App) auth_user(mut ctx Context, user User, ip string) ! {
// on cross-site requests, mitigating CSRF. Set `secure: true` as well when
// deploying behind HTTPS.
ctx.set_cookie(
name: 'token'
value: token
expires: expire_date
path: '/'
name: 'token'
value: token
expires: expire_date
path: '/'
http_only: true
same_site: .same_site_lax_mode
secure: app.config.cookie_secure
secure: app.config.cookie_secure
)
}

Expand Down
Loading