Add Discord field to user profiles #3033
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nanaya
requested changes
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 was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| onClick: @click | ||
| title: osu.trans('common.buttons.click_to_copy') | ||
| 'data-tooltip-pin-position': true | ||
| a |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| click: (e) => | ||
| e.preventDefault() | ||
| el = e.currentTarget | ||
| api = @state.api || $(el).qtip('api') |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
|
||
| @setState | ||
| qtip: api | ||
| title: el.getAttribute('title') || el.dataset.origTitle |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| api.set 'content.text', osu.trans('common.buttons.click_to_copy_copied') | ||
|
|
||
| # set timer to reset tooltip text | ||
| if @state.timer? |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
nekodex
force-pushed
the
discord-profile
branch
from
e21ff86
to
9aec398
Compare
nanaya
approved these changes
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.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(reuses the existing
user_jabberfield for now until we can rename the database column)fixes #1286 (but doesn't nuke skype)