gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-07-15 16:58:14 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

fix: OIDC account creation fails for long display names (#34639)

Browse Source
This commit is contained in:
Marcel Hellkamp 2025-05-12 17:51:53 +02:00 committed by diondiondion
parent 2c4e9b5479
commit 067db66a03
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/concerns/user/omniauthable.rb
View File

@ -99,7 +99,7 @@ module User::Omniauthable
external: true, external: true,
account_attributes: { account_attributes: {
username: ensure_unique_username(ensure_valid_username(auth.uid)), username: ensure_unique_username(ensure_valid_username(auth.uid)),
display_name: auth.info.full_name || auth.info.name || [auth.info.first_name, auth.info.last_name].join(' '), display_name: display_name_from_auth(auth),
}, },
} }
end end
@ -121,5 +121,10 @@ module User::Omniauthable
temp_username = starting_username.gsub(/[^a-z0-9_]+/i, '') temp_username = starting_username.gsub(/[^a-z0-9_]+/i, '')
temp_username.truncate(30, omission: '') temp_username.truncate(30, omission: '')
end end
def display_name_from_auth(auth)
display_name = auth.info.full_name || auth.info.name || [auth.info.first_name, auth.info.last_name].join(' ')
display_name.truncate(Account::DISPLAY_NAME_LENGTH_LIMIT, omission: '')
end
end end
end end