tesses50
/
freetube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #611 from GilgusMaximus/development 

Comment full text & comment link display
This commit is contained in:
Luca Hohmann 2020-10-07 18:04:27 +02:00 committed by GitHub
parent 7e36e1d57c 70fae4dcfc
commit 9a3334a855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -20577,9 +20577,9 @@
} }
}, },
"yt-comment-scraper": { "yt-comment-scraper": {
"version": "1.3.3", "version": "1.3.4",
"resolved": "https://registry.npmjs.org/yt-comment-scraper/-/yt-comment-scraper-1.3.3.tgz", "resolved": "https://registry.npmjs.org/yt-comment-scraper/-/yt-comment-scraper-1.3.4.tgz",
"integrity": "sha512-t0mIJOxsXriJTVIzQpRYz7BcAo2SbhhgY8YR2HJjxEq5zBYsu6mVujs8xzrCo1431hri1mDTanvLluS/WWCgjg==", "integrity": "sha512-/sf4hmjHBNtGItrZiHWetWwp3Q66G0Ur1HGKsP0Enfpxsq4/1otrie11dPCINl4oBmt5qQ0jVJt5j44zvom4Xg==",
"requires": { "requires": {
"axios": "^0.19.2", "axios": "^0.19.2",
"html2json": "^1.0.2" "html2json": "^1.0.2"

2
package.json
View File

@ -42,7 +42,7 @@
"youtube-chat": "^1.1.0", "youtube-chat": "^1.1.0",
"youtube-suggest": "^1.1.0", "youtube-suggest": "^1.1.0",
"yt-channel-info": "^1.1.3", "yt-channel-info": "^1.1.3",
"yt-comment-scraper": "^1.3.3", "yt-comment-scraper": "^1.3.4",
"yt-dash-manifest-generator": "^1.1.0", "yt-dash-manifest-generator": "^1.1.0",
"yt-trending-scraper": "^1.0.3", "yt-trending-scraper": "^1.0.3",
"yt-xml2vtt": "^1.1.2", "yt-xml2vtt": "^1.1.2",

8
src/renderer/components/watch-video-comments/watch-video-comments.js
View File

@ -4,7 +4,7 @@ import FtCard from '../ft-card/ft-card.vue'
import FtLoader from '../../components/ft-loader/ft-loader.vue' import FtLoader from '../../components/ft-loader/ft-loader.vue'
import FtSelect from '../../components/ft-select/ft-select.vue' import FtSelect from '../../components/ft-select/ft-select.vue'
import FtTimestampCatcher from '../../components/ft-timestamp-catcher/ft-timestamp-catcher.vue' import FtTimestampCatcher from '../../components/ft-timestamp-catcher/ft-timestamp-catcher.vue'
import autolinker from 'autolinker'
import CommentScraper from 'yt-comment-scraper' import CommentScraper from 'yt-comment-scraper'
export default Vue.extend({ export default Vue.extend({
@ -121,7 +121,7 @@ export default Vue.extend({
this.commentScraper.scrape_next_page_youtube_comments(this.id).then((response) => { this.commentScraper.scrape_next_page_youtube_comments(this.id).then((response) => {
if (response === null) { if (response === null) {
this.showToast({ this.showToast({
message: this.$t('No more comments available'), message: this.$t('Comments.No more comments available'),
time: 7000, time: 7000,
action: () => { action: () => {
} }
@ -150,6 +150,10 @@ export default Vue.extend({
if (this.hideCommentLikes) { if (this.hideCommentLikes) {
comment.likes = null comment.likes = null
} }
comment.text = autolinker.link(comment.text)
comment.replies.forEach((reply) => {
reply.text = autolinker.link(reply.text)
})
return comment return comment
}) })
this.commentData = this.commentData.concat(commentData) this.commentData = this.commentData.concat(commentData)

8
src/renderer/components/watch-video-comments/watch-video-comments.vue
View File

@ -96,9 +96,11 @@
{{ reply.time }} {{ reply.time }}
</span> </span>
</p> </p>
<p class="commentText"> <ft-timestamp-catcher
{{ reply.text }} class="commentText"
</p> :input-html="reply.text"
@timestamp-event="onTimestamp"
/>
<p class="commentLikeCount"> <p class="commentLikeCount">
<font-awesome-icon <font-awesome-icon
icon="thumbs-up" icon="thumbs-up"