aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/extra-utils
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-05-22 17:06:26 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-05-29 09:32:20 +0200
commit696d83fd1377486dd03cc1bd02a21d9b6ddd9fcd (patch)
treee1b88451c4357add80721f530993e2b48d197feb /shared/extra-utils
parent72c33e716fecd1826dcf645957f8669821f91ff3 (diff)
downloadPeerTube-696d83fd1377486dd03cc1bd02a21d9b6ddd9fcd.tar.gz
PeerTube-696d83fd1377486dd03cc1bd02a21d9b6ddd9fcd.tar.zst
PeerTube-696d83fd1377486dd03cc1bd02a21d9b6ddd9fcd.zip
Block comments from muted accounts/servers
Add better control for users of comments displayed on their videos: * Do not forward comments from muted remote accounts/servers (muted by the current server or by the video owner) * Do not list threads and hide replies (with their children) of accounts/servers muted by the video owner * Hide from RSS comments of muted accounts/servers by video owners Use case: * Try to limit spam propagation in the federation * Add ability for users to automatically hide comments on their videos from undesirable accounts/servers (the comment section belongs to videomakers, so they choose what's posted there)
Diffstat (limited to 'shared/extra-utils')
-rw-r--r--shared/extra-utils/videos/video-comments.ts7
-rw-r--r--shared/extra-utils/videos/videos.ts9
2 files changed, 15 insertions, 1 deletions
diff --git a/shared/extra-utils/videos/video-comments.ts b/shared/extra-utils/videos/video-comments.ts
index 81c48412d..831e5e7d4 100644
--- a/shared/extra-utils/videos/video-comments.ts
+++ b/shared/extra-utils/videos/video-comments.ts
@@ -61,6 +61,12 @@ function addVideoCommentReply (
61 .expect(expectedStatus) 61 .expect(expectedStatus)
62} 62}
63 63
64async function findCommentId (url: string, videoId: number | string, text: string) {
65 const res = await getVideoCommentThreads(url, videoId, 0, 25, '-createdAt')
66
67 return res.body.data.find(c => c.text === text).id as number
68}
69
64function deleteVideoComment ( 70function deleteVideoComment (
65 url: string, 71 url: string,
66 token: string, 72 token: string,
@@ -85,5 +91,6 @@ export {
85 getVideoThreadComments, 91 getVideoThreadComments,
86 addVideoCommentThread, 92 addVideoCommentThread,
87 addVideoCommentReply, 93 addVideoCommentReply,
94 findCommentId,
88 deleteVideoComment 95 deleteVideoComment
89} 96}
diff --git a/shared/extra-utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts
index 0d36a38a2..99e591cb2 100644
--- a/shared/extra-utils/videos/videos.ts
+++ b/shared/extra-utils/videos/videos.ts
@@ -95,6 +95,12 @@ function getVideo (url: string, id: number | string, expectedStatus = 200) {
95 .expect(expectedStatus) 95 .expect(expectedStatus)
96} 96}
97 97
98async function getVideoIdFromUUID (url: string, uuid: string) {
99 const res = await getVideo(url, uuid)
100
101 return res.body.id
102}
103
98function getVideoFileMetadataUrl (url: string) { 104function getVideoFileMetadataUrl (url: string) {
99 return request(url) 105 return request(url)
100 .get('/') 106 .get('/')
@@ -669,5 +675,6 @@ export {
669 checkVideoFilesWereRemoved, 675 checkVideoFilesWereRemoved,
670 getPlaylistVideos, 676 getPlaylistVideos,
671 uploadVideoAndGetId, 677 uploadVideoAndGetId,
672 getLocalIdByUUID 678 getLocalIdByUUID,
679 getVideoIdFromUUID
673} 680}