diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-06-07 09:59:10 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-06-07 09:59:15 +0200 |
| commit | 6d9ed0b6cb439f53e6df2aa1e751369bdc0f76ab (patch) | |
| tree | 0538eca6cc4020cf2f3a6e5bad8e8b231c1e710c /server | |
| parent | e815f566f37ccc3f115fd7f0a8c3ffcbe8766c01 (diff) | |
| parent | 462a833e4c14b84224182adbe9e963535c165ad1 (diff) | |
| download | PeerTube-6d9ed0b6cb439f53e6df2aa1e751369bdc0f76ab.tar.gz PeerTube-6d9ed0b6cb439f53e6df2aa1e751369bdc0f76ab.tar.zst PeerTube-6d9ed0b6cb439f53e6df2aa1e751369bdc0f76ab.zip | |
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'server')
| -rw-r--r-- | server/lib/activitypub/context.ts | 2 | ||||
| -rw-r--r-- | server/tests/api/activitypub/helpers.ts | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/server/lib/activitypub/context.ts b/server/lib/activitypub/context.ts index b452cf9b3..5d6aee315 100644 --- a/server/lib/activitypub/context.ts +++ b/server/lib/activitypub/context.ts | |||
| @@ -179,7 +179,7 @@ function buildContext (contextValue?: ContextValue) { | |||
| 179 | 179 | ||
| 180 | { | 180 | { |
| 181 | pt: 'https://joinpeertube.org/ns#', | 181 | pt: 'https://joinpeertube.org/ns#', |
| 182 | sc: 'http://schema.org#', | 182 | sc: 'http://schema.org/', |
| 183 | 183 | ||
| 184 | ...contextValue | 184 | ...contextValue |
| 185 | } | 185 | } |
diff --git a/server/tests/api/activitypub/helpers.ts b/server/tests/api/activitypub/helpers.ts index bc1de35d1..56de7a879 100644 --- a/server/tests/api/activitypub/helpers.ts +++ b/server/tests/api/activitypub/helpers.ts | |||
| @@ -9,6 +9,7 @@ import { buildAbsoluteFixturePath } from '@shared/core-utils' | |||
| 9 | import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto' | 9 | import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto' |
| 10 | 10 | ||
| 11 | describe('Test activity pub helpers', function () { | 11 | describe('Test activity pub helpers', function () { |
| 12 | |||
| 12 | describe('When checking the Linked Signature', function () { | 13 | describe('When checking the Linked Signature', function () { |
| 13 | 14 | ||
| 14 | it('Should fail with an invalid Mastodon signature', async function () { | 15 | it('Should fail with an invalid Mastodon signature', async function () { |