Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upAdd Discord field to user profiles #3033
Conversation
nekodex
added some commits
Apr 13, 2018
nekodex
added
the
resolves issue
label
Apr 18, 2018
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)) { |
This comment has been minimized.
This comment has been minimized.
| onClick: @click | ||
| title: osu.trans('common.buttons.click_to_copy') | ||
| 'data-tooltip-pin-position': true | ||
| a |
This comment has been minimized.
This comment has been minimized.
| click: (e) => | ||
| e.preventDefault() | ||
| el = e.currentTarget | ||
| api = @state.api || $(el).qtip('api') |
This comment has been minimized.
This comment has been minimized.
nanaya
Apr 18, 2018
Collaborator
or maybe just @api ?= $(...? Doesn't seem useful storing it in @state?
| @setState | ||
| qtip: api | ||
| title: el.getAttribute('title') || el.dataset.origTitle |
This comment has been minimized.
This comment has been minimized.
| api.set 'content.text', osu.trans('common.buttons.click_to_copy_copied') | ||
| # set timer to reset tooltip text | ||
| if @state.timer? |
This comment has been minimized.
This comment has been minimized.
nekodex
added some commits
Apr 18, 2018
nanaya
merged commit 4238996
into
ppy:master
Apr 18, 2018
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.
nekodex commentedApr 18, 2018
•
edited
(reuses the existing
user_jabberfield for now until we can rename the database column)fixes #1286 (but doesn't nuke skype)