|
63 | 63 |
|
64 | 64 | <div v-else-if="!message.file">
|
65 | 65 | <span v-for="(message, i) in linkifiedMessage" :key="i">
|
66 |
| - <span v-if="message.url" v-html="message.content"></span> |
| 66 | + <span v-if="message.bind" v-html="message.content"></span> |
67 | 67 | <span v-else>{{ message.content }}</span>
|
68 | 68 | </span>
|
69 | 69 | </div>
|
|
102 | 102 | </transition>
|
103 | 103 | </div>
|
104 | 104 | <span v-for="(message, i) in linkifiedMessage" :key="i">
|
105 |
| - <span v-if="message.url" v-html="message.content"></span> |
| 105 | + <span v-if="message.bind" v-html="message.content"></span> |
106 | 106 | <span v-else>{{ message.content }}</span>
|
107 | 107 | </span>
|
108 | 108 | </div>
|
|
224 | 224 | </template>
|
225 | 225 |
|
226 | 226 | <script>
|
227 |
| -const linkify = require('linkifyjs') |
228 |
| -import linkifyHtml from 'linkifyjs/html' |
229 | 227 | import vClickOutside from 'v-click-outside'
|
230 | 228 |
|
231 | 229 | import SvgIcon from './SvgIcon'
|
232 | 230 | import Loader from './Loader'
|
233 | 231 | import EmojiPicker from './EmojiPicker'
|
234 | 232 |
|
| 233 | +import formatString from '../utils/formatString' |
| 234 | +
|
235 | 235 | export default {
|
236 | 236 | name: 'message',
|
237 | 237 | components: { SvgIcon, Loader, EmojiPicker },
|
@@ -311,29 +311,7 @@ export default {
|
311 | 311 |
|
312 | 312 | computed: {
|
313 | 313 | linkifiedMessage() {
|
314 |
| - const strings = this.message.content.split(' ') |
315 |
| -
|
316 |
| - const formattedStrings = strings.map((string, i) => { |
317 |
| - const links = linkify.find(string) |
318 |
| -
|
319 |
| - let result = { content: string } |
320 |
| -
|
321 |
| - if (links.length && string === links[0].value) { |
322 |
| - result = { |
323 |
| - url: true, |
324 |
| - content: linkifyHtml(links[0].value, { |
325 |
| - defaultProtocol: 'https' |
326 |
| - }) |
327 |
| - } |
328 |
| - } |
329 |
| -
|
330 |
| - const space = i !== strings.length - 1 ? ' ' : '' |
331 |
| - result.content = result.content + space |
332 |
| -
|
333 |
| - return result |
334 |
| - }) |
335 |
| -
|
336 |
| - return formattedStrings |
| 314 | + return formatString(this.message.content) |
337 | 315 | },
|
338 | 316 | showDate() {
|
339 | 317 | return (
|
|
0 commit comments