diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue index fa5bdd940..c0bb7558c 100644 --- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue +++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue @@ -23,5 +23,25 @@ export default { }, }, }, + data() { + return { + pattern: + // eslint-disable-next-line no-useless-escape + /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))/gi, + messageObject: this.message, + } + }, + methods: { + linkify(inputText) { + // console.log(inputText.match(this.pattern)) + this.messageObject.message = inputText.replace( + this.pattern, + "$1", + ) + }, + }, + created() { + this.linkify(this.messageObject.message) + }, } diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue index 0224e042f..6363e4aa2 100644 --- a/admin/src/components/ContributionMessages/slots/IsModerator.vue +++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue @@ -5,7 +5,7 @@ {{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} {{ $t('moderator') }} -
{{ message.message }}
+
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue index 64946c557..f45d4f890 100644 --- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue +++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue @@ -4,7 +4,7 @@ {{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} -
{{ message.message }}
+
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue index 5fde8f825..9e0b49313 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue @@ -1,6 +1,6 @@ @@ -25,6 +25,9 @@ export default { }, data() { return { + // eslint-disable-next-line no-useless-escape + pattern: /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))/gi, + messageObject: this.message, storeName: `${this.$store.state.firstName} ${this.$store.state.lastName}`, moderationName: `${this.message.userFirstName} ${this.message.userLastName}`, } @@ -34,5 +37,17 @@ export default { return this.storeName === this.moderationName }, }, + methods: { + linkify(inputText) { + // console.log(inputText.match(this.pattern)) + this.messageObject.message = inputText.replace( + this.pattern, + "$1", + ) + }, + }, + created() { + this.linkify(this.messageObject.message) + }, } diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue index 343b92d97..d0810d9fb 100644 --- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue +++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue @@ -4,7 +4,7 @@ {{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} {{ $t('community.moderator') }} -
{{ message.message }}
+