-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
Reader Manage Following: present a follow button if user appears to have entered a URL #13715
Merged
Merged
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
6deef81
Present a follow button if user appears to have entered a URL
bluefuton 15915c4
Basic styling
bluefuton 95930d4
Prepend protocol for actual follow, and strip for label
bluefuton a370dee
Add following label
bluefuton 49cdb44
Move URL detection into lib/url and reuse existing functions for addi…
bluefuton 5dc0c75
Fix call to addSchemeIfMissing
bluefuton e1aa849
Added some additional test cases
bluefuton 849bf8f
Fix padding
jancavan 86f14aa
Add Follow text in <660px
jancavan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/** | ||
* External Dependencies | ||
*/ | ||
import url from 'url'; | ||
import { startsWith, replace } from 'lodash'; | ||
|
||
export function isUrl( query ) { | ||
let parsedUrl = url.parse( query ); | ||
|
||
// Make sure the query has a protocol - hostname ends up blank otherwise | ||
if ( ! parsedUrl.protocol ) { | ||
parsedUrl = url.parse( 'http://' + query ); | ||
} | ||
|
||
if ( ! parsedUrl.hostname || parsedUrl.hostname.indexOf( '.' ) === -1 ) { | ||
return false; | ||
} | ||
|
||
// Check for a valid-looking TLD | ||
if ( parsedUrl.hostname.lastIndexOf( '.' ) > ( parsedUrl.hostname.length - 3 ) ) { | ||
return false; | ||
} | ||
|
||
// Make sure the hostname has at least two parts separated by a dot | ||
const hostnameParts = parsedUrl.hostname.split( '.' ).filter( Boolean ); | ||
if ( hostnameParts.length < 2 ) { | ||
return false; | ||
} | ||
|
||
return true; | ||
} | ||
|
||
export function prependUrlProtocol( query ) { | ||
if ( startsWith( 'http://', query ) || startsWith( 'https://', query ) ) { | ||
return query; | ||
} | ||
|
||
return 'http://' + query; | ||
} | ||
|
||
export function stripUrlProtocol( query ) { | ||
return replace( query, /http(s?):\/\//g, '' ); | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should squint at this file a bit and try to merge it with
/lib/url/index.js
isUrl is brand new, but the others looks like they may exist with a different name