Add Discord field to user profiles #3033
Merged
Conversation
app/Models/User.php
Outdated
| // This is a basic check and not 100% compliant to Discord's spec, only validates that input: | ||
| // - is a 2-32 char username (excluding chars @#:) | ||
| // - ends with a # and 4-digit discriminator (number being greater than 0000) | ||
| if (!preg_match('/^[^@#:]{2,32}#\d{3}[1-9]$/i', $this->user_discord)) { |
nanaya
Apr 18, 2018
Collaborator
discriminator can't end with 0?
discriminator can't end with 0?
| onClick: @click | ||
| title: osu.trans('common.buttons.click_to_copy') | ||
| 'data-tooltip-pin-position': true | ||
| a |
nanaya
Apr 18, 2018
Collaborator
Shouldn't this one be the span and the parent the a...?
Shouldn't this one be the span and the parent the a...?
| click: (e) => | ||
| e.preventDefault() | ||
| el = e.currentTarget | ||
| api = @state.api || $(el).qtip('api') |
nanaya
Apr 18, 2018
Collaborator
or maybe just @api ?= $(...? Doesn't seem useful storing it in @state?
or maybe just @api ?= $(...? Doesn't seem useful storing it in @state?
|
|
||
| @setState | ||
| qtip: api | ||
| title: el.getAttribute('title') || el.dataset.origTitle |
nanaya
Apr 18, 2018
Collaborator
same with @api (and timer).
same with @api (and timer).
| api.set 'content.text', osu.trans('common.buttons.click_to_copy_copied') | ||
|
|
||
| # set timer to reset tooltip text | ||
| if @state.timer? |
nanaya
Apr 18, 2018
Collaborator
Timeout.clear undefined is fine. So is clearing cleared timeout.
Timeout.clear undefined is fine. So is clearing cleared timeout.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
(reuses the existing
user_jabberfield for now until we can rename the database column)fixes #1286 (but doesn't nuke skype)