Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Show their own videos to muted accounts

Chocobozzzd867eb367bac
diff --git a/packages/tests/src/api/moderation/blocklist.ts b/packages/tests/src/api/moderation/blocklist.ts
index a845152417..526ed4016d 100644
--- a/packages/tests/src/api/moderation/blocklist.ts
+++ b/packages/tests/src/api/moderation/blocklist.ts
@@ -143,7 +143,6 @@ describe('Test blocklist', function () {
})
describe('User blocklist', function () {
-
describe('When managing account blocklist', function () {
it('Should list all videos', function () {
return checkAllVideos(servers[0], servers[0].accessToken)
@@ -409,7 +408,6 @@ describe('Test blocklist', function () {
})
describe('When managing server blocklist', function () {
-
it('Should list all videos', function () {
return checkAllVideos(servers[0], servers[0].accessToken)
})
@@ -547,7 +545,6 @@ describe('Test blocklist', function () {
})
describe('Server blocklist', function () {
-
describe('When managing account blocklist', function () {
it('Should list all videos', async function () {
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
@@ -591,6 +588,15 @@ describe('Test blocklist', function () {
}
})
+ it('Should display owned videos of blocked account to this account', async function () {
+ const { data } = await servers[0].videos.listMyVideos({ token: userToken1 })
+
+ expect(data).to.have.lengthOf(1)
+
+ const v = data.find(v => v.name === 'video user 1')
+ expect(v).not.to.be.undefined
+ })
+
it('Should hide its comments', async function () {
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
const { data } = await commentsCommand[0].listThreads({ videoId: videoUUID1, count: 20, sort: '-createdAt', token })
@@ -727,7 +733,6 @@ describe('Test blocklist', function () {
})
describe('When managing server blocklist', function () {
-
it('Should list all videos', async function () {
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
await checkAllVideos(servers[0], token)
diff --git a/server/core/controllers/api/users/me.ts b/server/core/controllers/api/users/me.ts
index 4493e0cd10..5cd494617d 100644
--- a/server/core/controllers/api/users/me.ts
+++ b/server/core/controllers/api/users/me.ts
@@ -136,7 +136,8 @@ async function listUserVideos (req: express.Request, res: express.Response) {
const countVideos = getCountVideos(req)
const query = pickCommonVideoQuery(req.query)
- const include = (query.include || VideoInclude.NONE) | VideoInclude.BLACKLISTED | VideoInclude.NOT_PUBLISHED_STATE
+ const include = (query.include || VideoInclude.NONE) | VideoInclude.BLACKLISTED | VideoInclude.NOT_PUBLISHED_STATE |
+ VideoInclude.BLOCKED_OWNER
const apiOptions = await Hooks.wrapObject({
privacyOneOf: getAllPrivacies(),