mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embeds
This commit is contained in:
@@ -14,7 +14,14 @@ export default class PostAttachmentOEmbed extends React.Component {
|
||||
}
|
||||
|
||||
componentWillReceiveProps(nextProps) {
|
||||
this.fetchData(nextProps.link);
|
||||
if (nextProps.link !== this.props.link) {
|
||||
this.isLoading = false;
|
||||
this.fetchData(nextProps.link);
|
||||
}
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.fetchData(this.props.link);
|
||||
}
|
||||
|
||||
fetchData(link) {
|
||||
|
||||
@@ -214,14 +214,14 @@ export default class PostBody extends React.Component {
|
||||
}
|
||||
|
||||
createYoutubeEmbed(link) {
|
||||
const ytRegex = /.*(?:youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|watch\?(?:[a-zA-Z-_]+=[a-zA-Z0-9-_]+&)+v=)([^#\&\?]*).*/;
|
||||
const ytRegex = /(?:http|https):\/\/(?:www\.)?(?:(?:youtube\.com\/(?:(?:v\/)|(\/u\/\w\/)|(?:(?:watch|embed\/watch)(?:\/|.*v=))|(?:embed\/)|(?:user\/[^\/]+\/u\/[0-9]\/)))|(?:youtu\.be\/))([^#\&\?]*)/;
|
||||
|
||||
const match = link.trim().match(ytRegex);
|
||||
if (!match || match[1].length !== 11) {
|
||||
if (!match || match[2].length !== 11) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const youtubeId = match[1];
|
||||
const youtubeId = match[2];
|
||||
const time = this.handleYoutubeTime(link);
|
||||
|
||||
function onClick(e) {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"https?://soundcloud.com/.*/.*"
|
||||
],
|
||||
"name": "SoundCloud",
|
||||
"height": 110
|
||||
"height": 140
|
||||
},
|
||||
{
|
||||
"patterns": [
|
||||
@@ -349,7 +349,7 @@
|
||||
"https?://vine.co/v/[a-zA-Z0-9]+"
|
||||
],
|
||||
"name": "Vine",
|
||||
"height": 110
|
||||
"height": 490
|
||||
},
|
||||
{
|
||||
"patterns": [
|
||||
|
||||
@@ -300,7 +300,7 @@ export function extractLinks(text) {
|
||||
|
||||
Autolinker.link(text, {
|
||||
replaceFn,
|
||||
urls: true,
|
||||
urls: {schemeMatches: true, wwwMatches: true, tldMatches: false},
|
||||
emails: false,
|
||||
twitter: false,
|
||||
phone: false,
|
||||
@@ -1253,4 +1253,4 @@ export function isFeatureEnabled(feature) {
|
||||
|
||||
export function isSystemMessage(post) {
|
||||
return post.type && (post.type.lastIndexOf(Constants.SYSTEM_MESSAGE_PREFIX) === 0);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user