diff --git a/.env b/.env new file mode 100644 index 00000000..59cf76d1 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +NODE_OPTIONS="--experimental_modules" \ No newline at end of file diff --git a/packages/activitypub-core-express-jsx/package-lock.json b/packages/activitypub-core-express-jsx/package-lock.json index e16706e7..d13533d2 100644 --- a/packages/activitypub-core-express-jsx/package-lock.json +++ b/packages/activitypub-core-express-jsx/package-lock.json @@ -9,9 +9,9 @@ "version": "0.0.35", "license": "MIT", "dependencies": { - "activitypub-core-express-middleware": "^0.0.5", - "activitypub-core-jsx-components": "^0.0.1", - "activitypub-core-types": "^0.0.35", + "activitypub-core-express-middleware": "^0.0.36", + "activitypub-core-jsx-components": "^0.0.36", + "activitypub-core-types": "^0.0.36", "firebase-admin": "^11.1.0", "react": "^16.14.0", "react-server": "^0.8.1" @@ -840,11 +840,12 @@ } }, "node_modules/activitypub-core-express-middleware": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/activitypub-core-express-middleware/-/activitypub-core-express-middleware-0.0.5.tgz", - "integrity": "sha512-zO5qkFlPA/BxgYymfNbVf1lblj7ojtPFuGTJSisRdvdZwc8HRPNyzMdbLQ9k0zhTjhERhP4FIL9o/6P84x2wFg==", + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/activitypub-core-express-middleware/-/activitypub-core-express-middleware-0.0.36.tgz", + "integrity": "sha512-mFoQ3pIw6j/peIjY1/DzEnkWSknlVRdxQ5SPvJIvECfJ1DnhMy2gyOeiz9DypdubdrIV/FTSvh7WmBDUiB2A5g==", "dependencies": { "activitypub-core": "^0.0.28", + "activitypub-core-types": "^0.0.36", "express": "^4.18.2", "firebase-admin": "^11.1.0", "http": "^0.0.1-security" @@ -892,6 +893,31 @@ "superjson": "^1.10.1" } }, + "node_modules/activitypub-core-express-middleware/node_modules/activitypub-core-jsx-components": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/activitypub-core-jsx-components/-/activitypub-core-jsx-components-0.0.1.tgz", + "integrity": "sha512-cRar55cVR3hFmg2HSWsoM3o9lRomHT8+BsKx3OkmIhHF0qaj+3IINo3DmpWa+ZURCmH3+xmDDr5ck3Mypy8H2Q==", + "dependencies": { + "activitypub-core": "^0.0.24", + "activitypub-core-express-middleware": "^0.0.0", + "react": "^18.2.0" + } + }, + "node_modules/activitypub-core-express-middleware/node_modules/activitypub-core-jsx-components/node_modules/activitypub-core": { + "version": "0.0.24", + "resolved": "https://registry.npmjs.org/activitypub-core/-/activitypub-core-0.0.24.tgz", + "integrity": "sha512-rpyYApqgnKTWHUKdeyT3fRcPt8FpJonUNWgUmF1Ub/FiFkJyd3XTUS/SghmG++gJCI64ZJtdtu1Z4twZ8rDZ3A==", + "dependencies": { + "cookie": "^0.5.0", + "firebase-admin": "^11.1.0", + "http": "^0.0.1-security", + "isomorphic-fetch": "^3.0.0", + "jsonld": "^8.1.0", + "mongodb": "^4.10.0", + "next": "^12.3.1", + "superjson": "^1.10.1" + } + }, "node_modules/activitypub-core-express-middleware/node_modules/cookie": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", @@ -956,7 +982,6 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", - "peer": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -987,12 +1012,12 @@ } }, "node_modules/activitypub-core-jsx-components": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/activitypub-core-jsx-components/-/activitypub-core-jsx-components-0.0.1.tgz", - "integrity": "sha512-cRar55cVR3hFmg2HSWsoM3o9lRomHT8+BsKx3OkmIhHF0qaj+3IINo3DmpWa+ZURCmH3+xmDDr5ck3Mypy8H2Q==", + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/activitypub-core-jsx-components/-/activitypub-core-jsx-components-0.0.36.tgz", + "integrity": "sha512-oGO4vun+hsbT6Ts8JGyFpXwESamBuhWf8QmF7h+chx9CjOFykuKlfFTtwbAHz5MaxRVJi5gBpXeetjARRhTtZg==", "dependencies": { - "activitypub-core": "^0.0.24", "activitypub-core-express-middleware": "^0.0.0", + "activitypub-core-types": "^0.0.36", "react": "^18.2.0" } }, @@ -1018,9 +1043,9 @@ } }, "node_modules/activitypub-core-types": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.1.tgz", - "integrity": "sha512-ILbRangWIutnlf612xREVq42o363zTe8tf5O1UuegmsZ8Xs57BBcwG0xODg6gDYI/p7uMyt1hl6lmc40RWqdNg==" + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.36.tgz", + "integrity": "sha512-hb7FZymbEf6uN/FvTCHO+nzyaB2WcFs0Gg76ovC9VJpA3LNJMpqO01s2Z/v+OQMaulGIp6dwcI1HOxV+JTHxHQ==" }, "node_modules/activitypub-core/node_modules/cookie": { "version": "0.5.0", @@ -5187,11 +5212,12 @@ } }, "activitypub-core-express-middleware": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/activitypub-core-express-middleware/-/activitypub-core-express-middleware-0.0.5.tgz", - "integrity": "sha512-zO5qkFlPA/BxgYymfNbVf1lblj7ojtPFuGTJSisRdvdZwc8HRPNyzMdbLQ9k0zhTjhERhP4FIL9o/6P84x2wFg==", + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/activitypub-core-express-middleware/-/activitypub-core-express-middleware-0.0.36.tgz", + "integrity": "sha512-mFoQ3pIw6j/peIjY1/DzEnkWSknlVRdxQ5SPvJIvECfJ1DnhMy2gyOeiz9DypdubdrIV/FTSvh7WmBDUiB2A5g==", "requires": { "activitypub-core": "^0.0.28", + "activitypub-core-types": "^0.0.36", "express": "^4.18.2", "firebase-admin": "^11.1.0", "http": "^0.0.1-security" @@ -5241,6 +5267,33 @@ } } }, + "activitypub-core-jsx-components": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/activitypub-core-jsx-components/-/activitypub-core-jsx-components-0.0.1.tgz", + "integrity": "sha512-cRar55cVR3hFmg2HSWsoM3o9lRomHT8+BsKx3OkmIhHF0qaj+3IINo3DmpWa+ZURCmH3+xmDDr5ck3Mypy8H2Q==", + "requires": { + "activitypub-core": "^0.0.24", + "activitypub-core-express-middleware": "^0.0.0", + "react": "^18.2.0" + }, + "dependencies": { + "activitypub-core": { + "version": "0.0.24", + "resolved": "https://registry.npmjs.org/activitypub-core/-/activitypub-core-0.0.24.tgz", + "integrity": "sha512-rpyYApqgnKTWHUKdeyT3fRcPt8FpJonUNWgUmF1Ub/FiFkJyd3XTUS/SghmG++gJCI64ZJtdtu1Z4twZ8rDZ3A==", + "requires": { + "cookie": "^0.5.0", + "firebase-admin": "^11.1.0", + "http": "^0.0.1-security", + "isomorphic-fetch": "^3.0.0", + "jsonld": "^8.1.0", + "mongodb": "^4.10.0", + "next": "^12.3.1", + "superjson": "^1.10.1" + } + } + } + }, "cookie": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", @@ -5276,7 +5329,6 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", - "peer": true, "requires": { "loose-envify": "^1.1.0" } @@ -5303,12 +5355,12 @@ } }, "activitypub-core-jsx-components": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/activitypub-core-jsx-components/-/activitypub-core-jsx-components-0.0.1.tgz", - "integrity": "sha512-cRar55cVR3hFmg2HSWsoM3o9lRomHT8+BsKx3OkmIhHF0qaj+3IINo3DmpWa+ZURCmH3+xmDDr5ck3Mypy8H2Q==", + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/activitypub-core-jsx-components/-/activitypub-core-jsx-components-0.0.36.tgz", + "integrity": "sha512-oGO4vun+hsbT6Ts8JGyFpXwESamBuhWf8QmF7h+chx9CjOFykuKlfFTtwbAHz5MaxRVJi5gBpXeetjARRhTtZg==", "requires": { - "activitypub-core": "^0.0.24", "activitypub-core-express-middleware": "^0.0.0", + "activitypub-core-types": "^0.0.36", "react": "^18.2.0" }, "dependencies": { @@ -5333,9 +5385,9 @@ } }, "activitypub-core-types": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.1.tgz", - "integrity": "sha512-ILbRangWIutnlf612xREVq42o363zTe8tf5O1UuegmsZ8Xs57BBcwG0xODg6gDYI/p7uMyt1hl6lmc40RWqdNg==" + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.36.tgz", + "integrity": "sha512-hb7FZymbEf6uN/FvTCHO+nzyaB2WcFs0Gg76ovC9VJpA3LNJMpqO01s2Z/v+OQMaulGIp6dwcI1HOxV+JTHxHQ==" }, "agent-base": { "version": "6.0.2", diff --git a/packages/activitypub-core-express-jsx/package.json b/packages/activitypub-core-express-jsx/package.json index 17d4c3e4..6aed5124 100644 --- a/packages/activitypub-core-express-jsx/package.json +++ b/packages/activitypub-core-express-jsx/package.json @@ -1,6 +1,6 @@ { "name": "activitypub-core-express-jsx", - "version": "0.0.35", + "version": "0.0.36", "description": "> TODO: description", "author": "Michael Puckett ", "homepage": "", @@ -22,11 +22,11 @@ "dev": "ts-node ./src/index.tsx" }, "dependencies": { - "activitypub-core-express-middleware": "^0.0.5", - "activitypub-core-jsx-components": "^0.0.1", - "activitypub-core-types": "^0.0.35", + "activitypub-core-express-middleware": "^0.0.36", + "activitypub-core-jsx-components": "^0.0.36", + "activitypub-core-types": "^0.0.36", "firebase-admin": "^11.1.0", "react": "^16.14.0", "react-server": "^0.8.1" } -} +} \ No newline at end of file diff --git a/packages/activitypub-core-express-middleware/lib/index.d.ts b/packages/activitypub-core-express-middleware/lib/index.d.ts index a45da301..158acfaf 100644 --- a/packages/activitypub-core-express-middleware/lib/index.d.ts +++ b/packages/activitypub-core-express-middleware/lib/index.d.ts @@ -1,6 +1,6 @@ import type { NextFunction } from 'express'; import type { IncomingMessage, ServerResponse } from 'http'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import type { ServiceAccount } from 'firebase-admin'; export declare const activityPub: ({ renderIndex, renderHome, renderEntity, }: { renderIndex: () => Promise; diff --git a/packages/activitypub-core-express-middleware/package.json b/packages/activitypub-core-express-middleware/package.json index 99f711a6..32420cbd 100644 --- a/packages/activitypub-core-express-middleware/package.json +++ b/packages/activitypub-core-express-middleware/package.json @@ -1,6 +1,6 @@ { "name": "activitypub-core-express-middleware", - "version": "0.0.35", + "version": "0.0.36", "description": "> TODO: description", "author": "Michael Puckett ", "homepage": "", @@ -21,9 +21,9 @@ }, "dependencies": { "activitypub-core": "^0.0.28", - "activitypub-core-types": "^0.0.35", + "activitypub-core-types": "^0.0.36", "express": "^4.18.2", "firebase-admin": "^11.1.0", "http": "^0.0.1-security" } -} +} \ No newline at end of file diff --git a/packages/activitypub-core-express-middleware/src/index.ts b/packages/activitypub-core-express-middleware/src/index.ts index e81a550d..658dab46 100644 --- a/packages/activitypub-core-express-middleware/src/index.ts +++ b/packages/activitypub-core-express-middleware/src/index.ts @@ -1,7 +1,7 @@ import type { NextFunction } from 'express'; import type { IncomingMessage, ServerResponse } from 'http'; import { userPostHandler, homeGetHandler, entityGetHandler } from 'activitypub-core'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import type { ServiceAccount } from 'firebase-admin'; export const activityPub = ({ diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage.d.ts index c9da528b..a74eb77d 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare const EntityPage: ({ entity }: { entity: AP.Entity; }) => JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Activity.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Activity.d.ts index 2bc5c981..faec8217 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Activity.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Activity.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function ActivityEntity({ activity }: { activity: AP.Activity; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Actor.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Actor.d.ts index e68199c5..68b78663 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Actor.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Actor.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function ActorEntity({ actor }: { actor: AP.Actor; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Collection.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Collection.d.ts index 33cf6240..4a74b8fe 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Collection.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Collection.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function CollectionEntity({ collection }: { collection: AP.Collection; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/CollectionPage.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/CollectionPage.d.ts index b804b0fb..4a046704 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/CollectionPage.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/CollectionPage.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function CollectionPageEntity({ collectionPage }: { collectionPage: AP.CollectionPage; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Link.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Link.d.ts index a1fbd5ea..6a4f49ca 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Link.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Link.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function LinkEntity({ link }: { link: AP.Link; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Note.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Note.d.ts index 635d11a0..b699b46c 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Note.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Note.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function NoteEntity({ note }: { note: AP.Note; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.d.ts index 047b83dc..28c252ab 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function ObjectEntity({ object }: { object: AP.ExtendedObject; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.js b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.js index c07d5b23..f97d34d7 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.js +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.js @@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.ObjectEntity = void 0; -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const Note_1 = require("./Note"); const react_1 = __importDefault(require("react")); function ObjectEntity({ object }) { - if (object.type === src_1.AP.ExtendedObjectTypes.NOTE) { + if (object.type === activitypub_core_types_1.AP.ExtendedObjectTypes.NOTE) { return react_1.default.createElement(Note_1.NoteEntity, { note: object }); } return react_1.default.createElement("div", { className: "card" }, diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.js.map b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.js.map index fd7a33d8..4a75acae 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.js.map +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/Object.js.map @@ -1 +1 @@ -{"version":3,"file":"Object.js","sourceRoot":"","sources":["../../../src/pages/EntityPage/Object.tsx"],"names":[],"mappings":";;;;;;AAAA,oDAAgD;AAChD,iCAAoC;AACpC,kDAA0B;AAE1B,SAAgB,YAAY,CAAC,EAAE,MAAM,EAAiC;IACpE,IAAI,MAAM,CAAC,IAAI,KAAK,QAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE;QAC/C,OAAO,8BAAC,iBAAU,IAAC,IAAI,EAAE,MAAM,GAAe,CAAC;KAChD;IAED,OAAO,uCAAK,SAAS,EAAC,MAAM;QAC1B;YACE;;gBACK,MAAM,CAAC,IAAI,CACb,CACA,CACD,CAAC;AACT,CAAC;AAZD,oCAYC"} \ No newline at end of file +{"version":3,"file":"Object.js","sourceRoot":"","sources":["../../../src/pages/EntityPage/Object.tsx"],"names":[],"mappings":";;;;;;AAAA,mEAA4C;AAC5C,iCAAoC;AACpC,kDAA0B;AAE1B,SAAgB,YAAY,CAAC,EAAE,MAAM,EAAiC;IACpE,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE;QAC/C,OAAO,8BAAC,iBAAU,IAAC,IAAI,EAAE,MAAM,GAAe,CAAC;KAChD;IAED,OAAO,uCAAK,SAAS,EAAC,MAAM;QAC1B;YACE;;gBACK,MAAM,CAAC,IAAI,CACb,CACA,CACD,CAAC;AACT,CAAC;AAZD,oCAYC"} \ No newline at end of file diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/OrderedCollection.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/OrderedCollection.d.ts index a3f7347b..9c07b876 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/OrderedCollection.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/OrderedCollection.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function OrderedCollectionEntity({ collection }: { collection: AP.OrderedCollection; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/OrderedCollectionPage.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/OrderedCollectionPage.d.ts index 26bca30c..5482d55f 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/OrderedCollectionPage.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/OrderedCollectionPage.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function OrderedCollectionPageEntity({ orderedCollectionPage }: { orderedCollectionPage: AP.OrderedCollectionPage; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.d.ts b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.d.ts index f8978803..8550cb69 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function EntityPage({ entity }: { entity: AP.Entity; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.js b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.js index 1b1d8116..d5700f33 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.js +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.js @@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.EntityPage = void 0; -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const Activity_1 = require("./Activity"); const Actor_1 = require("./Actor"); const Collection_1 = require("./Collection"); @@ -27,34 +27,34 @@ function EntityPage({ entity }) { } exports.EntityPage = EntityPage; function Entity({ entity }) { - if (entity.type === src_1.AP.CollectionTypes.COLLECTION) { + if (entity.type === activitypub_core_types_1.AP.CollectionTypes.COLLECTION) { return react_1.default.createElement(Collection_1.CollectionEntity, { collection: entity }); } - if (entity.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + if (entity.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { return react_1.default.createElement(OrderedCollection_1.OrderedCollectionEntity, { collection: entity }); } - if (entity.type === src_1.AP.CollectionPageTypes.COLLECTION_PAGE) { + if (entity.type === activitypub_core_types_1.AP.CollectionPageTypes.COLLECTION_PAGE) { return react_1.default.createElement(CollectionPage_1.CollectionPageEntity, { collectionPage: entity }); } - if (entity.type === src_1.AP.CollectionPageTypes.ORDERED_COLLECTION_PAGE) { + if (entity.type === activitypub_core_types_1.AP.CollectionPageTypes.ORDERED_COLLECTION_PAGE) { return react_1.default.createElement(OrderedCollectionPage_1.OrderedCollectionPageEntity, { orderedCollectionPage: entity }); } - for (const type of Object.values(src_1.AP.ActivityTypes)) { + for (const type of Object.values(activitypub_core_types_1.AP.ActivityTypes)) { if (entity.type === type) { return react_1.default.createElement(Activity_1.ActivityEntity, { activity: entity }); } } - for (const type of Object.values(src_1.AP.ActorTypes)) { + for (const type of Object.values(activitypub_core_types_1.AP.ActorTypes)) { if (entity.type === type) { return react_1.default.createElement(Actor_1.ActorEntity, { actor: entity }); } } - for (const type of Object.values(src_1.AP.ExtendedObjectTypes)) { + for (const type of Object.values(activitypub_core_types_1.AP.ExtendedObjectTypes)) { if (entity.type === type) { return react_1.default.createElement(Object_1.ObjectEntity, { object: entity }); } } - for (const type of Object.values(src_1.AP.LinkTypes)) { + for (const type of Object.values(activitypub_core_types_1.AP.LinkTypes)) { if (entity.type === type) { return react_1.default.createElement(Link_1.LinkEntity, { link: entity }); } diff --git a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.js.map b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.js.map index 7b96cb85..4c578c71 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.js.map +++ b/packages/activitypub-core-jsx-components/lib/pages/EntityPage/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pages/EntityPage/index.tsx"],"names":[],"mappings":";;;;;;AAAA,oDAAgD;AAChD,yCAA4C;AAC5C,mCAAsC;AACtC,6CAAgD;AAChD,qDAAwD;AACxD,iCAAoC;AACpC,qCAAwC;AACxC,2DAA8D;AAC9D,mEAAsE;AACtE,qDAA6B;AAE7B,kDAA0B;AAE1B,SAAgB,UAAU,CAAC,EACzB,MAAM,EAGP;IAEC,OAAO,CACL;QACE,8BAAC,cAAI;YACH,2DAA0B;YAC1B,wCAAM,GAAG,EAAC,MAAM,EAAC,IAAI,EAAC,cAAc,GAAG,CAClC;QACP,8BAAC,MAAM,IAAC,MAAM,EAAE,MAAM,GAAW;QACjC;YACE,qDAEU;YACV,4CAAU,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAa,CACnD,CACT,CACJ,CAAC;AACJ,CAAC;AArBD,gCAqBC;AAED,SAAS,MAAM,CAAC,EAAE,MAAM,EAAyB;IAC/C,IAAI,MAAM,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,UAAU,EAAE;QACjD,OAAO,8BAAC,6BAAgB,IAAC,UAAU,EAAE,MAAuB,GAAqB,CAAC;KACnF;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,kBAAkB,EAAE;QACzD,OAAO,8BAAC,2CAAuB,IAAC,UAAU,EAAE,MAA8B,GAA4B,CAAC;KACxG;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,QAAE,CAAC,mBAAmB,CAAC,eAAe,EAAE;QAC1D,OAAO,8BAAC,qCAAoB,IAAC,cAAc,EAAE,MAA2B,GAAyB,CAAC;KACnG;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,QAAE,CAAC,mBAAmB,CAAC,uBAAuB,EAAE;QAClE,OAAO,8BAAC,mDAA2B,IAAC,qBAAqB,EAAE,MAAkC,GAAgC,CAAC;KAC/H;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,aAAa,CAAC,EAAE;QAClD,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACxB,OAAO,8BAAC,yBAAc,IAAC,QAAQ,EAAE,MAAqB,GAAmB,CAAC;SAC3E;KACF;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,UAAU,CAAC,EAAE;QAC/C,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACxB,OAAO,8BAAC,mBAAW,IAAC,KAAK,EAAE,MAAkB,GAAgB,CAAA;SAC9D;KACF;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,mBAAmB,CAAC,EAAE;QACxD,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACxB,OAAO,8BAAC,qBAAY,IAAC,MAAM,EAAE,MAA2B,GAAiB,CAAA;SAC1E;KACF;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,SAAS,CAAC,EAAE;QAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACxB,OAAO,8BAAC,iBAAU,IAAC,IAAI,EAAE,MAAiB,GAAe,CAAA;SAC1D;KACF;IAED,OAAO,sEAEJ,CAAC;AACN,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pages/EntityPage/index.tsx"],"names":[],"mappings":";;;;;;AAAA,mEAA4C;AAC5C,yCAA4C;AAC5C,mCAAsC;AACtC,6CAAgD;AAChD,qDAAwD;AACxD,iCAAoC;AACpC,qCAAwC;AACxC,2DAA8D;AAC9D,mEAAsE;AACtE,qDAA6B;AAE7B,kDAA0B;AAE1B,SAAgB,UAAU,CAAC,EACzB,MAAM,EAGP;IAEC,OAAO,CACL;QACE,8BAAC,cAAI;YACH,2DAA0B;YAC1B,wCAAM,GAAG,EAAC,MAAM,EAAC,IAAI,EAAC,cAAc,GAAG,CAClC;QACP,8BAAC,MAAM,IAAC,MAAM,EAAE,MAAM,GAAW;QACjC;YACE,qDAEU;YACV,4CAAU,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAa,CACnD,CACT,CACJ,CAAC;AACJ,CAAC;AArBD,gCAqBC;AAED,SAAS,MAAM,CAAC,EAAE,MAAM,EAAyB;IAC/C,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,UAAU,EAAE;QACjD,OAAO,8BAAC,6BAAgB,IAAC,UAAU,EAAE,MAAuB,GAAqB,CAAC;KACnF;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,kBAAkB,EAAE;QACzD,OAAO,8BAAC,2CAAuB,IAAC,UAAU,EAAE,MAA8B,GAA4B,CAAC;KACxG;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAE,CAAC,mBAAmB,CAAC,eAAe,EAAE;QAC1D,OAAO,8BAAC,qCAAoB,IAAC,cAAc,EAAE,MAA2B,GAAyB,CAAC;KACnG;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAE,CAAC,mBAAmB,CAAC,uBAAuB,EAAE;QAClE,OAAO,8BAAC,mDAA2B,IAAC,qBAAqB,EAAE,MAAkC,GAAgC,CAAC;KAC/H;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,aAAa,CAAC,EAAE;QAClD,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACxB,OAAO,8BAAC,yBAAc,IAAC,QAAQ,EAAE,MAAqB,GAAmB,CAAC;SAC3E;KACF;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,UAAU,CAAC,EAAE;QAC/C,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACxB,OAAO,8BAAC,mBAAW,IAAC,KAAK,EAAE,MAAkB,GAAgB,CAAA;SAC9D;KACF;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,mBAAmB,CAAC,EAAE;QACxD,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACxB,OAAO,8BAAC,qBAAY,IAAC,MAAM,EAAE,MAA2B,GAAiB,CAAA;SAC1E;KACF;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,SAAS,CAAC,EAAE;QAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACxB,OAAO,8BAAC,iBAAU,IAAC,IAAI,EAAE,MAAiB,GAAe,CAAA;SAC1D;KACF;IAED,OAAO,sEAEJ,CAAC;AACN,CAAC"} \ No newline at end of file diff --git a/packages/activitypub-core-jsx-components/lib/pages/HomePage.d.ts b/packages/activitypub-core-jsx-components/lib/pages/HomePage.d.ts index df6d3de6..a34465b8 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/HomePage.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/HomePage.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare const HomePage: ({ actor }: { actor: AP.Actor; }) => JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.d.ts b/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.d.ts index 459560e4..db22df85 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function CreateForm({ actor }: { actor: AP.Actor; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.js b/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.js index 865cdfa1..e6973067 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.js +++ b/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.js @@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); exports.CreateForm = void 0; const globals_1 = require("activitypub-core/src/globals"); -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const react_1 = __importDefault(require("react")); function CreateForm({ actor }) { return react_1.default.createElement(react_1.default.Fragment, null, @@ -15,7 +15,7 @@ function CreateForm({ actor }) { react_1.default.createElement("input", { type: "hidden", value: actor.outbox instanceof URL ? actor.outbox.toString() : actor.outbox?.id?.toString(), name: "actorOutboxId" }), react_1.default.createElement("label", null, react_1.default.createElement("span", null, "Type"), - react_1.default.createElement("select", { name: "type", defaultValue: 'Note' }, Object.values(src_1.AP.ExtendedObjectTypes).map(type => react_1.default.createElement("option", { key: type }, type)))), + react_1.default.createElement("select", { name: "type", defaultValue: 'Note' }, Object.values(activitypub_core_types_1.AP.ExtendedObjectTypes).map(type => react_1.default.createElement("option", { key: type }, type)))), react_1.default.createElement("label", null, react_1.default.createElement("span", null, "Summary"), react_1.default.createElement("textarea", { name: "summary" })), diff --git a/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.js.map b/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.js.map index a3c40f92..2527d021 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.js.map +++ b/packages/activitypub-core-jsx-components/lib/pages/HomePage/CreateForm.js.map @@ -1 +1 @@ -{"version":3,"file":"CreateForm.js","sourceRoot":"","sources":["../../../src/pages/HomePage/CreateForm.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"CreateForm.js","sourceRoot":"","sources":["../../../src/pages/HomePage/CreateForm.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/activitypub-core-jsx-components/lib/pages/HomePage/Welcome.d.ts b/packages/activitypub-core-jsx-components/lib/pages/HomePage/Welcome.d.ts index 5b24a277..16b88882 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/HomePage/Welcome.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/HomePage/Welcome.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function Welcome({ actor }: { actor: AP.Actor; }): JSX.Element; diff --git a/packages/activitypub-core-jsx-components/lib/pages/HomePage/index.d.ts b/packages/activitypub-core-jsx-components/lib/pages/HomePage/index.d.ts index 7f4b64e2..05016878 100644 --- a/packages/activitypub-core-jsx-components/lib/pages/HomePage/index.d.ts +++ b/packages/activitypub-core-jsx-components/lib/pages/HomePage/index.d.ts @@ -1,5 +1,5 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; declare type Data = { actor: AP.Actor; }; diff --git a/packages/activitypub-core-jsx-components/package-lock.json b/packages/activitypub-core-jsx-components/package-lock.json index 8f1055c8..8561d993 100644 --- a/packages/activitypub-core-jsx-components/package-lock.json +++ b/packages/activitypub-core-jsx-components/package-lock.json @@ -1,16 +1,16 @@ { "name": "activitypub-core-jsx-components", - "version": "0.0.35", + "version": "0.0.36", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "activitypub-core-jsx-components", - "version": "0.0.35", + "version": "0.0.36", "license": "MIT", "dependencies": { "activitypub-core-express-middleware": "^0.0.0", - "activitypub-core-types": "^0.0.35", + "activitypub-core-types": "^0.0.36", "react": "^18.2.0" }, "devDependencies": { @@ -813,9 +813,9 @@ } }, "node_modules/activitypub-core-types": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.1.tgz", - "integrity": "sha512-ILbRangWIutnlf612xREVq42o363zTe8tf5O1UuegmsZ8Xs57BBcwG0xODg6gDYI/p7uMyt1hl6lmc40RWqdNg==" + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.36.tgz", + "integrity": "sha512-hb7FZymbEf6uN/FvTCHO+nzyaB2WcFs0Gg76ovC9VJpA3LNJMpqO01s2Z/v+OQMaulGIp6dwcI1HOxV+JTHxHQ==" }, "node_modules/agent-base": { "version": "6.0.2", @@ -4440,9 +4440,9 @@ } }, "activitypub-core-types": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.1.tgz", - "integrity": "sha512-ILbRangWIutnlf612xREVq42o363zTe8tf5O1UuegmsZ8Xs57BBcwG0xODg6gDYI/p7uMyt1hl6lmc40RWqdNg==" + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.36.tgz", + "integrity": "sha512-hb7FZymbEf6uN/FvTCHO+nzyaB2WcFs0Gg76ovC9VJpA3LNJMpqO01s2Z/v+OQMaulGIp6dwcI1HOxV+JTHxHQ==" }, "agent-base": { "version": "6.0.2", diff --git a/packages/activitypub-core-jsx-components/package.json b/packages/activitypub-core-jsx-components/package.json index f0334096..99f86346 100644 --- a/packages/activitypub-core-jsx-components/package.json +++ b/packages/activitypub-core-jsx-components/package.json @@ -1,6 +1,6 @@ { "name": "activitypub-core-jsx-components", - "version": "0.0.35", + "version": "0.0.36", "description": "> TODO: description", "author": "Michael Puckett ", "homepage": "", @@ -22,7 +22,7 @@ }, "dependencies": { "activitypub-core-express-middleware": "^0.0.0", - "activitypub-core-types": "^0.0.35", + "activitypub-core-types": "^0.0.36", "react": "^18.2.0" } -} +} \ No newline at end of file diff --git a/packages/activitypub-core-jsx-components/src/EntityCard/Activity.tsx b/packages/activitypub-core-jsx-components/src/EntityCard/Activity.tsx index 0dbf866d..c334d6d8 100644 --- a/packages/activitypub-core-jsx-components/src/EntityCard/Activity.tsx +++ b/packages/activitypub-core-jsx-components/src/EntityCard/Activity.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { EntityLink } from '../EntityLink'; import { EntityMeta } from '../EntityMeta'; import { NoteCard } from './Note'; diff --git a/packages/activitypub-core-jsx-components/src/EntityCard/Actor.tsx b/packages/activitypub-core-jsx-components/src/EntityCard/Actor.tsx index 9337ef8e..03b30051 100644 --- a/packages/activitypub-core-jsx-components/src/EntityCard/Actor.tsx +++ b/packages/activitypub-core-jsx-components/src/EntityCard/Actor.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { EntityLink } from '../EntityLink'; import { EntityMeta } from '../EntityMeta'; diff --git a/packages/activitypub-core-jsx-components/src/EntityCard/Note.tsx b/packages/activitypub-core-jsx-components/src/EntityCard/Note.tsx index 35372e2a..aea56193 100644 --- a/packages/activitypub-core-jsx-components/src/EntityCard/Note.tsx +++ b/packages/activitypub-core-jsx-components/src/EntityCard/Note.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { EntityLink } from '../components/EntityLink'; import { EntityMeta } from '../components/EntityMeta'; diff --git a/packages/activitypub-core-jsx-components/src/EntityCard/index.tsx b/packages/activitypub-core-jsx-components/src/EntityCard/index.tsx index 5e846819..b1d75362 100644 --- a/packages/activitypub-core-jsx-components/src/EntityCard/index.tsx +++ b/packages/activitypub-core-jsx-components/src/EntityCard/index.tsx @@ -1,5 +1,5 @@ import { PUBLIC_ACTOR } from 'activitypub-core/src/globals'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { ActorCard } from './Actor'; import { ActivityCard } from './Activity'; import { NoteCard } from './Note'; diff --git a/packages/activitypub-core-jsx-components/src/Nav.tsx b/packages/activitypub-core-jsx-components/src/Nav.tsx index e0c8da6f..0c6e93b0 100644 --- a/packages/activitypub-core-jsx-components/src/Nav.tsx +++ b/packages/activitypub-core-jsx-components/src/Nav.tsx @@ -1,5 +1,5 @@ import React, { ReactElement } from 'react'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; function BoxLink({ collection, children }: { collection?: URL | AP.EitherCollection, children: string | ReactElement }) { if (!collection) { diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Activity.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Activity.tsx index 92803750..8ca9853c 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Activity.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Activity.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import React from 'react'; export function ActivityEntity({ activity }: { activity: AP.Activity }) { diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Actor.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Actor.tsx index 74d26bec..574ce5b7 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Actor.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Actor.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import React from 'react'; export function ActorEntity({ actor }: { actor: AP.Actor }) { diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Collection.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Collection.tsx index 02218ddc..a82fc079 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Collection.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Collection.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import React from 'react'; diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/CollectionPage.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/CollectionPage.tsx index ab3a300d..0629aa24 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/CollectionPage.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/CollectionPage.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export function CollectionPageEntity({ collectionPage }: { collectionPage: AP.CollectionPage }) { return <> diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Link.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Link.tsx index ecc4a884..3cb1f40a 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Link.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Link.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import React from 'react'; export function LinkEntity({ link }: { link: AP.Link }) { diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Note.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Note.tsx index e492cfad..c269b8b1 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Note.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Note.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import React from 'react'; export function NoteEntity({ note }: { note: AP.Note }) { diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Object.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Object.tsx index bc8b4014..712afd8d 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/Object.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/Object.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { NoteEntity } from './Note'; import React from 'react'; diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/OrderedCollection.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/OrderedCollection.tsx index eea82aa2..710f6e05 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/OrderedCollection.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/OrderedCollection.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import React from 'react'; export function OrderedCollectionEntity({ collection }: { collection: AP.OrderedCollection }) { diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/OrderedCollectionPage.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/OrderedCollectionPage.tsx index d233491d..0fa691c3 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/OrderedCollectionPage.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/OrderedCollectionPage.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import React from 'react'; export function OrderedCollectionPageEntity({ orderedCollectionPage }: { orderedCollectionPage: AP.OrderedCollectionPage }) { diff --git a/packages/activitypub-core-jsx-components/src/pages/EntityPage/index.tsx b/packages/activitypub-core-jsx-components/src/pages/EntityPage/index.tsx index 7955bd0f..5ffbf6aa 100644 --- a/packages/activitypub-core-jsx-components/src/pages/EntityPage/index.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/EntityPage/index.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { ActivityEntity } from './Activity'; import { ActorEntity } from './Actor'; import { CollectionEntity } from './Collection'; diff --git a/packages/activitypub-core-jsx-components/src/pages/HomePage/CreateForm.tsx b/packages/activitypub-core-jsx-components/src/pages/HomePage/CreateForm.tsx index 1a6da4de..60bb6145 100644 --- a/packages/activitypub-core-jsx-components/src/pages/HomePage/CreateForm.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/HomePage/CreateForm.tsx @@ -1,5 +1,5 @@ import { ACTIVITYSTREAMS_CONTEXT, PUBLIC_ACTOR } from 'activitypub-core/src/globals'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { FormEvent, FormEventHandler } from 'react'; import React from 'react'; diff --git a/packages/activitypub-core-jsx-components/src/pages/HomePage/Welcome.tsx b/packages/activitypub-core-jsx-components/src/pages/HomePage/Welcome.tsx index 2a5e6724..ea863d62 100644 --- a/packages/activitypub-core-jsx-components/src/pages/HomePage/Welcome.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/HomePage/Welcome.tsx @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import React from 'react'; export function Welcome({ actor }: { actor: AP.Actor }) { diff --git a/packages/activitypub-core-jsx-components/src/pages/HomePage/index.tsx b/packages/activitypub-core-jsx-components/src/pages/HomePage/index.tsx index c0742ab9..0fb0c534 100644 --- a/packages/activitypub-core-jsx-components/src/pages/HomePage/index.tsx +++ b/packages/activitypub-core-jsx-components/src/pages/HomePage/index.tsx @@ -1,6 +1,6 @@ import Head from 'next/head' import { ChangeEvent, ChangeEventHandler, FormEventHandler, MouseEventHandler, ReactElement, useState } from 'react'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { Welcome } from './Welcome'; import { CreateForm } from './CreateForm'; import { ACCEPT_HEADER, ACTIVITYSTREAMS_CONTENT_TYPE } from 'activitypub-core/src/globals'; diff --git a/packages/activitypub-core-types/index.ts b/packages/activitypub-core-types/index.ts new file mode 100644 index 00000000..2fdd4672 --- /dev/null +++ b/packages/activitypub-core-types/index.ts @@ -0,0 +1 @@ +export * as AP from './src'; diff --git a/packages/activitypub-core-types/lib/activitypub/Core/CoreObject.js.map b/packages/activitypub-core-types/lib/activitypub/Core/CoreObject.js.map deleted file mode 100644 index 25b26715..00000000 --- a/packages/activitypub-core-types/lib/activitypub/Core/CoreObject.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"CoreObject.js","sourceRoot":"","sources":["../../../src/activitypub/Core/CoreObject.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/Activity.js.map b/packages/activitypub-core-types/lib/activitypub/Extended/Activity.js.map deleted file mode 100644 index d35d6b45..00000000 --- a/packages/activitypub-core-types/lib/activitypub/Extended/Activity.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Activity.js","sourceRoot":"","sources":["../../../src/activitypub/Extended/Activity.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/Actor.js.map b/packages/activitypub-core-types/lib/activitypub/Extended/Actor.js.map deleted file mode 100644 index 58c5b6f1..00000000 --- a/packages/activitypub-core-types/lib/activitypub/Extended/Actor.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../../../src/activitypub/Extended/Actor.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/Collection.js.map b/packages/activitypub-core-types/lib/activitypub/Extended/Collection.js.map deleted file mode 100644 index 9103d208..00000000 --- a/packages/activitypub-core-types/lib/activitypub/Extended/Collection.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../src/activitypub/Extended/Collection.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/ExtendedObject.js.map b/packages/activitypub-core-types/lib/activitypub/Extended/ExtendedObject.js.map deleted file mode 100644 index f5f92a26..00000000 --- a/packages/activitypub-core-types/lib/activitypub/Extended/ExtendedObject.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"ExtendedObject.js","sourceRoot":"","sources":["../../../src/activitypub/Extended/ExtendedObject.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/index.js.map b/packages/activitypub-core-types/lib/activitypub/Extended/index.js.map deleted file mode 100644 index c6a75610..00000000 --- a/packages/activitypub-core-types/lib/activitypub/Extended/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/activitypub/Extended/index.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/index.js.map b/packages/activitypub-core-types/lib/activitypub/index.js.map deleted file mode 100644 index ce8ab21e..00000000 --- a/packages/activitypub-core-types/lib/activitypub/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/activitypub/index.ts"],"names":[],"mappings":";;;AAAA,sCAWsB;AAVpB,wGAAA,eAAe,OAAA;AACf,kGAAA,SAAS,OAAA;AACT,gHAAA,uBAAuB,OAAA;AACvB,kHAAA,yBAAyB,OAAA;AACzB,sGAAA,aAAa,OAAA;AACb,mGAAA,UAAU,OAAA;AACV,4GAAA,mBAAmB,OAAA;AACnB,wGAAA,eAAe,OAAA;AACf,4GAAA,mBAAmB,OAAA;AACnB,iGAAA,QAAQ,OAAA"} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/util/const.js.map b/packages/activitypub-core-types/lib/activitypub/util/const.js.map deleted file mode 100644 index eb51b13a..00000000 --- a/packages/activitypub-core-types/lib/activitypub/util/const.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../src/activitypub/util/const.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG;IACjC,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;IAClB,YAAY,EAAE,cAAc;IAC5B,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;CACN,CAAC;AAEE,QAAA,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;CACV,CAAC;AAEE,QAAA,UAAU,GAAG;IACxB,WAAW,EAAE,aAAa;IAC1B,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACV,CAAC;AAEE,QAAA,uBAAuB,GAAG;IACrC,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;IACV,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,gBAAgB,EAAE,iBAAiB;IACnC,gBAAgB,EAAE,iBAAiB;IACnC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;CACJ,CAAC;AAEE,QAAA,yBAAyB,GAAG;IACvC,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;CACZ,CAAC;AAEE,QAAA,aAAa,GAAG;IAC3B,GAAG,+BAAuB;IAC1B,GAAG,iCAAyB;CACpB,CAAC;AAEE,QAAA,eAAe,GAAG;IAC7B,UAAU,EAAE,YAAY;IACxB,kBAAkB,EAAE,mBAAmB;CAC/B,CAAC;AAEE,QAAA,mBAAmB,GAAG;IACjC,eAAe,EAAE,gBAAgB;IACjC,uBAAuB,EAAE,uBAAuB;CACxC,CAAC;AAEE,QAAA,eAAe,GAAG;IAC7B,GAAG,2BAAmB;IACtB,GAAG,kBAAU;IACb,GAAG,qBAAa;IAChB,GAAG,uBAAe;IAClB,GAAG,2BAAmB;CACd,CAAC;AAEE,QAAA,QAAQ,GAAG;IACtB,GAAG,uBAAe;IAClB,GAAG,iBAAS;CACJ,CAAC"} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/index.d.ts b/packages/activitypub-core-types/lib/index.d.ts index b5df930b..2fdd4672 100644 --- a/packages/activitypub-core-types/lib/index.d.ts +++ b/packages/activitypub-core-types/lib/index.d.ts @@ -1 +1 @@ -export * as AP from './activitypub'; +export * as AP from './src'; diff --git a/packages/activitypub-core-types/lib/index.js b/packages/activitypub-core-types/lib/index.js index 06de83dc..792d5d86 100644 --- a/packages/activitypub-core-types/lib/index.js +++ b/packages/activitypub-core-types/lib/index.js @@ -24,5 +24,5 @@ var __importStar = (this && this.__importStar) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.AP = void 0; -exports.AP = __importStar(require("./activitypub")); +exports.AP = __importStar(require("./src")); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/index.js.map b/packages/activitypub-core-types/lib/index.js.map index 23359dd7..50f4db6b 100644 --- a/packages/activitypub-core-types/lib/index.js.map +++ b/packages/activitypub-core-types/lib/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAoC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA4B"} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Core/CoreObject.d.ts b/packages/activitypub-core-types/lib/src/Core/CoreObject.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Core/CoreObject.d.ts rename to packages/activitypub-core-types/lib/src/Core/CoreObject.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/Core/CoreObject.js b/packages/activitypub-core-types/lib/src/Core/CoreObject.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Core/CoreObject.js rename to packages/activitypub-core-types/lib/src/Core/CoreObject.js diff --git a/packages/activitypub-core-types/lib/src/Core/CoreObject.js.map b/packages/activitypub-core-types/lib/src/Core/CoreObject.js.map new file mode 100644 index 00000000..fe12bf9f --- /dev/null +++ b/packages/activitypub-core-types/lib/src/Core/CoreObject.js.map @@ -0,0 +1 @@ +{"version":3,"file":"CoreObject.js","sourceRoot":"","sources":["../../../src/Core/CoreObject.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Core/Entity.d.ts b/packages/activitypub-core-types/lib/src/Core/Entity.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Core/Entity.d.ts rename to packages/activitypub-core-types/lib/src/Core/Entity.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/Core/Entity.js b/packages/activitypub-core-types/lib/src/Core/Entity.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Core/Entity.js rename to packages/activitypub-core-types/lib/src/Core/Entity.js diff --git a/packages/activitypub-core-types/lib/activitypub/Core/Entity.js.map b/packages/activitypub-core-types/lib/src/Core/Entity.js.map similarity index 50% rename from packages/activitypub-core-types/lib/activitypub/Core/Entity.js.map rename to packages/activitypub-core-types/lib/src/Core/Entity.js.map index 1ccae415..45d0064a 100644 --- a/packages/activitypub-core-types/lib/activitypub/Core/Entity.js.map +++ b/packages/activitypub-core-types/lib/src/Core/Entity.js.map @@ -1 +1 @@ -{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../../src/activitypub/Core/Entity.ts"],"names":[],"mappings":""} \ No newline at end of file +{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../../src/Core/Entity.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Core/Link.d.ts b/packages/activitypub-core-types/lib/src/Core/Link.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Core/Link.d.ts rename to packages/activitypub-core-types/lib/src/Core/Link.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/Core/Link.js b/packages/activitypub-core-types/lib/src/Core/Link.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Core/Link.js rename to packages/activitypub-core-types/lib/src/Core/Link.js diff --git a/packages/activitypub-core-types/lib/activitypub/Core/Link.js.map b/packages/activitypub-core-types/lib/src/Core/Link.js.map similarity index 52% rename from packages/activitypub-core-types/lib/activitypub/Core/Link.js.map rename to packages/activitypub-core-types/lib/src/Core/Link.js.map index 695d8f4b..227542d0 100644 --- a/packages/activitypub-core-types/lib/activitypub/Core/Link.js.map +++ b/packages/activitypub-core-types/lib/src/Core/Link.js.map @@ -1 +1 @@ -{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../../src/activitypub/Core/Link.ts"],"names":[],"mappings":""} \ No newline at end of file +{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../../src/Core/Link.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Core/index.d.ts b/packages/activitypub-core-types/lib/src/Core/index.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Core/index.d.ts rename to packages/activitypub-core-types/lib/src/Core/index.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/Core/index.js b/packages/activitypub-core-types/lib/src/Core/index.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Core/index.js rename to packages/activitypub-core-types/lib/src/Core/index.js diff --git a/packages/activitypub-core-types/lib/activitypub/Core/index.js.map b/packages/activitypub-core-types/lib/src/Core/index.js.map similarity index 51% rename from packages/activitypub-core-types/lib/activitypub/Core/index.js.map rename to packages/activitypub-core-types/lib/src/Core/index.js.map index 1595a384..1ddae4ad 100644 --- a/packages/activitypub-core-types/lib/activitypub/Core/index.js.map +++ b/packages/activitypub-core-types/lib/src/Core/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/activitypub/Core/index.ts"],"names":[],"mappings":""} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Core/index.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/Activity.d.ts b/packages/activitypub-core-types/lib/src/Extended/Activity.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/Activity.d.ts rename to packages/activitypub-core-types/lib/src/Extended/Activity.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/Activity.js b/packages/activitypub-core-types/lib/src/Extended/Activity.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/Activity.js rename to packages/activitypub-core-types/lib/src/Extended/Activity.js diff --git a/packages/activitypub-core-types/lib/src/Extended/Activity.js.map b/packages/activitypub-core-types/lib/src/Extended/Activity.js.map new file mode 100644 index 00000000..c7fbe025 --- /dev/null +++ b/packages/activitypub-core-types/lib/src/Extended/Activity.js.map @@ -0,0 +1 @@ +{"version":3,"file":"Activity.js","sourceRoot":"","sources":["../../../src/Extended/Activity.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/Actor.d.ts b/packages/activitypub-core-types/lib/src/Extended/Actor.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/Actor.d.ts rename to packages/activitypub-core-types/lib/src/Extended/Actor.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/Actor.js b/packages/activitypub-core-types/lib/src/Extended/Actor.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/Actor.js rename to packages/activitypub-core-types/lib/src/Extended/Actor.js diff --git a/packages/activitypub-core-types/lib/src/Extended/Actor.js.map b/packages/activitypub-core-types/lib/src/Extended/Actor.js.map new file mode 100644 index 00000000..e79931ce --- /dev/null +++ b/packages/activitypub-core-types/lib/src/Extended/Actor.js.map @@ -0,0 +1 @@ +{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../../../src/Extended/Actor.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/Collection.d.ts b/packages/activitypub-core-types/lib/src/Extended/Collection.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/Collection.d.ts rename to packages/activitypub-core-types/lib/src/Extended/Collection.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/Collection.js b/packages/activitypub-core-types/lib/src/Extended/Collection.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/Collection.js rename to packages/activitypub-core-types/lib/src/Extended/Collection.js diff --git a/packages/activitypub-core-types/lib/src/Extended/Collection.js.map b/packages/activitypub-core-types/lib/src/Extended/Collection.js.map new file mode 100644 index 00000000..e20147de --- /dev/null +++ b/packages/activitypub-core-types/lib/src/Extended/Collection.js.map @@ -0,0 +1 @@ +{"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../src/Extended/Collection.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/ExtendedObject.d.ts b/packages/activitypub-core-types/lib/src/Extended/ExtendedObject.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/ExtendedObject.d.ts rename to packages/activitypub-core-types/lib/src/Extended/ExtendedObject.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/ExtendedObject.js b/packages/activitypub-core-types/lib/src/Extended/ExtendedObject.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/ExtendedObject.js rename to packages/activitypub-core-types/lib/src/Extended/ExtendedObject.js diff --git a/packages/activitypub-core-types/lib/src/Extended/ExtendedObject.js.map b/packages/activitypub-core-types/lib/src/Extended/ExtendedObject.js.map new file mode 100644 index 00000000..10aa6d8e --- /dev/null +++ b/packages/activitypub-core-types/lib/src/Extended/ExtendedObject.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ExtendedObject.js","sourceRoot":"","sources":["../../../src/Extended/ExtendedObject.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/index.d.ts b/packages/activitypub-core-types/lib/src/Extended/index.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/index.d.ts rename to packages/activitypub-core-types/lib/src/Extended/index.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/Extended/index.js b/packages/activitypub-core-types/lib/src/Extended/index.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/Extended/index.js rename to packages/activitypub-core-types/lib/src/Extended/index.js diff --git a/packages/activitypub-core-types/lib/src/Extended/index.js.map b/packages/activitypub-core-types/lib/src/Extended/index.js.map new file mode 100644 index 00000000..4da4b9f5 --- /dev/null +++ b/packages/activitypub-core-types/lib/src/Extended/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Extended/index.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/index.d.ts b/packages/activitypub-core-types/lib/src/index.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/index.d.ts rename to packages/activitypub-core-types/lib/src/index.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/index.js b/packages/activitypub-core-types/lib/src/index.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/index.js rename to packages/activitypub-core-types/lib/src/index.js diff --git a/packages/activitypub-core-types/lib/src/index.js.map b/packages/activitypub-core-types/lib/src/index.js.map new file mode 100644 index 00000000..83624fa0 --- /dev/null +++ b/packages/activitypub-core-types/lib/src/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,sCAWsB;AAVpB,wGAAA,eAAe,OAAA;AACf,kGAAA,SAAS,OAAA;AACT,gHAAA,uBAAuB,OAAA;AACvB,kHAAA,yBAAyB,OAAA;AACzB,sGAAA,aAAa,OAAA;AACb,mGAAA,UAAU,OAAA;AACV,4GAAA,mBAAmB,OAAA;AACnB,wGAAA,eAAe,OAAA;AACf,4GAAA,mBAAmB,OAAA;AACnB,iGAAA,QAAQ,OAAA"} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/util/const.d.ts b/packages/activitypub-core-types/lib/src/util/const.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/util/const.d.ts rename to packages/activitypub-core-types/lib/src/util/const.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/util/const.js b/packages/activitypub-core-types/lib/src/util/const.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/util/const.js rename to packages/activitypub-core-types/lib/src/util/const.js diff --git a/packages/activitypub-core-types/lib/src/util/const.js.map b/packages/activitypub-core-types/lib/src/util/const.js.map new file mode 100644 index 00000000..58a0eb61 --- /dev/null +++ b/packages/activitypub-core-types/lib/src/util/const.js.map @@ -0,0 +1 @@ +{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../src/util/const.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG;IACjC,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;IAClB,YAAY,EAAE,cAAc;IAC5B,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;CACN,CAAC;AAEE,QAAA,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;CACV,CAAC;AAEE,QAAA,UAAU,GAAG;IACxB,WAAW,EAAE,aAAa;IAC1B,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACV,CAAC;AAEE,QAAA,uBAAuB,GAAG;IACrC,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;IACV,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,gBAAgB,EAAE,iBAAiB;IACnC,gBAAgB,EAAE,iBAAiB;IACnC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;CACJ,CAAC;AAEE,QAAA,yBAAyB,GAAG;IACvC,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;CACZ,CAAC;AAEE,QAAA,aAAa,GAAG;IAC3B,GAAG,+BAAuB;IAC1B,GAAG,iCAAyB;CACpB,CAAC;AAEE,QAAA,eAAe,GAAG;IAC7B,UAAU,EAAE,YAAY;IACxB,kBAAkB,EAAE,mBAAmB;CAC/B,CAAC;AAEE,QAAA,mBAAmB,GAAG;IACjC,eAAe,EAAE,gBAAgB;IACjC,uBAAuB,EAAE,uBAAuB;CACxC,CAAC;AAEE,QAAA,eAAe,GAAG;IAC7B,GAAG,2BAAmB;IACtB,GAAG,kBAAU;IACb,GAAG,qBAAa;IAChB,GAAG,uBAAe;IAClB,GAAG,2BAAmB;CACd,CAAC;AAEE,QAAA,QAAQ,GAAG;IACtB,GAAG,uBAAe;IAClB,GAAG,iBAAS;CACJ,CAAC"} \ No newline at end of file diff --git a/packages/activitypub-core-types/lib/activitypub/util/values.d.ts b/packages/activitypub-core-types/lib/src/util/values.d.ts similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/util/values.d.ts rename to packages/activitypub-core-types/lib/src/util/values.d.ts diff --git a/packages/activitypub-core-types/lib/activitypub/util/values.js b/packages/activitypub-core-types/lib/src/util/values.js similarity index 100% rename from packages/activitypub-core-types/lib/activitypub/util/values.js rename to packages/activitypub-core-types/lib/src/util/values.js diff --git a/packages/activitypub-core-types/lib/activitypub/util/values.js.map b/packages/activitypub-core-types/lib/src/util/values.js.map similarity index 50% rename from packages/activitypub-core-types/lib/activitypub/util/values.js.map rename to packages/activitypub-core-types/lib/src/util/values.js.map index 6f46992b..1f9af9ea 100644 --- a/packages/activitypub-core-types/lib/activitypub/util/values.js.map +++ b/packages/activitypub-core-types/lib/src/util/values.js.map @@ -1 +1 @@ -{"version":3,"file":"values.js","sourceRoot":"","sources":["../../../src/activitypub/util/values.ts"],"names":[],"mappings":""} \ No newline at end of file +{"version":3,"file":"values.js","sourceRoot":"","sources":["../../../src/util/values.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core-types/package.json b/packages/activitypub-core-types/package.json index 486c4b0b..4e3854a3 100644 --- a/packages/activitypub-core-types/package.json +++ b/packages/activitypub-core-types/package.json @@ -1,6 +1,6 @@ { "name": "activitypub-core-types", - "version": "0.0.35", + "version": "0.0.36", "description": "> TODO: description", "author": "Michael Puckett ", "homepage": "", @@ -19,4 +19,4 @@ "devDependencies": { "ts-node": "^10.9.1" } -} +} \ No newline at end of file diff --git a/packages/activitypub-core-types/src/activitypub/Core/CoreObject.ts b/packages/activitypub-core-types/src/Core/CoreObject.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/Core/CoreObject.ts rename to packages/activitypub-core-types/src/Core/CoreObject.ts diff --git a/packages/activitypub-core-types/src/activitypub/Core/Entity.ts b/packages/activitypub-core-types/src/Core/Entity.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/Core/Entity.ts rename to packages/activitypub-core-types/src/Core/Entity.ts diff --git a/packages/activitypub-core-types/src/activitypub/Core/Link.ts b/packages/activitypub-core-types/src/Core/Link.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/Core/Link.ts rename to packages/activitypub-core-types/src/Core/Link.ts diff --git a/packages/activitypub-core-types/src/activitypub/Core/index.ts b/packages/activitypub-core-types/src/Core/index.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/Core/index.ts rename to packages/activitypub-core-types/src/Core/index.ts diff --git a/packages/activitypub-core-types/src/activitypub/Extended/Activity.ts b/packages/activitypub-core-types/src/Extended/Activity.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/Extended/Activity.ts rename to packages/activitypub-core-types/src/Extended/Activity.ts diff --git a/packages/activitypub-core-types/src/activitypub/Extended/Actor.ts b/packages/activitypub-core-types/src/Extended/Actor.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/Extended/Actor.ts rename to packages/activitypub-core-types/src/Extended/Actor.ts diff --git a/packages/activitypub-core-types/src/activitypub/Extended/Collection.ts b/packages/activitypub-core-types/src/Extended/Collection.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/Extended/Collection.ts rename to packages/activitypub-core-types/src/Extended/Collection.ts diff --git a/packages/activitypub-core-types/src/activitypub/Extended/ExtendedObject.ts b/packages/activitypub-core-types/src/Extended/ExtendedObject.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/Extended/ExtendedObject.ts rename to packages/activitypub-core-types/src/Extended/ExtendedObject.ts diff --git a/packages/activitypub-core-types/src/activitypub/Extended/index.ts b/packages/activitypub-core-types/src/Extended/index.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/Extended/index.ts rename to packages/activitypub-core-types/src/Extended/index.ts diff --git a/packages/activitypub-core-types/src/activitypub/index.ts b/packages/activitypub-core-types/src/activitypub/index.ts deleted file mode 100644 index f23d3f91..00000000 --- a/packages/activitypub-core-types/src/activitypub/index.ts +++ /dev/null @@ -1,91 +0,0 @@ -export { - CoreObjectTypes, - LinkTypes, - TransitiveActivityTypes, - IntransitiveActivityTypes, - ActivityTypes, - ActorTypes, - ExtendedObjectTypes, - CollectionTypes, - CollectionPageTypes, - AllTypes, -} from './util/const'; -export type { - Entity, - EntityReference, - CoreObject, - CoreObjectReference, - Link, - LinkReference, -} from './Core'; -export type { - Activity, - ActivityReference, - IntransitiveActivity, - TransitiveActivity, - Accept, - Follow, - Delete, - Create, - Arrive, - Add, - Offer, - Like, - Leave, - Ignore, - Join, - Reject, - Invite, - TentativeReject, - TentativeAccept, - View, - Update, - Undo, - Remove, - Read, - Listen, - Move, - Travel, - Announce, - Block, - Flag, - Dislike, - Question, -} from './Extended'; -export type { - Actor, - ActorReference, - Person, - Service, - Group, - Organization, - Application, -} from './Extended'; -export type { - ExtendedObject, - ExtendedObjectReference, - Article, - Event, - Note, - Page, - Place, - Relationship, - Tombstone, - Profile, - Video, - Document, - Audio, - Image, -} from './Extended'; -export type { Collection, CollectionReference } from './Extended'; -export type { OrderedCollection, OrderedCollectionReference } from './Extended'; -export type { CollectionPage, CollectionPageReference } from './Extended'; -export type { - OrderedCollectionPage, - OrderedCollectionPageReference, -} from './Extended'; -export type { EitherCollection } from './Extended'; -export type { EitherCollectionReference } from './Extended'; -export type { EitherCollectionPage } from './Extended'; -export type { EitherCollectionPageReference } from './Extended'; -export type { StringReferenceMap } from './util/values'; diff --git a/packages/activitypub-core-types/src/index.ts b/packages/activitypub-core-types/src/index.ts index b5df930b..f23d3f91 100644 --- a/packages/activitypub-core-types/src/index.ts +++ b/packages/activitypub-core-types/src/index.ts @@ -1 +1,91 @@ -export * as AP from './activitypub'; +export { + CoreObjectTypes, + LinkTypes, + TransitiveActivityTypes, + IntransitiveActivityTypes, + ActivityTypes, + ActorTypes, + ExtendedObjectTypes, + CollectionTypes, + CollectionPageTypes, + AllTypes, +} from './util/const'; +export type { + Entity, + EntityReference, + CoreObject, + CoreObjectReference, + Link, + LinkReference, +} from './Core'; +export type { + Activity, + ActivityReference, + IntransitiveActivity, + TransitiveActivity, + Accept, + Follow, + Delete, + Create, + Arrive, + Add, + Offer, + Like, + Leave, + Ignore, + Join, + Reject, + Invite, + TentativeReject, + TentativeAccept, + View, + Update, + Undo, + Remove, + Read, + Listen, + Move, + Travel, + Announce, + Block, + Flag, + Dislike, + Question, +} from './Extended'; +export type { + Actor, + ActorReference, + Person, + Service, + Group, + Organization, + Application, +} from './Extended'; +export type { + ExtendedObject, + ExtendedObjectReference, + Article, + Event, + Note, + Page, + Place, + Relationship, + Tombstone, + Profile, + Video, + Document, + Audio, + Image, +} from './Extended'; +export type { Collection, CollectionReference } from './Extended'; +export type { OrderedCollection, OrderedCollectionReference } from './Extended'; +export type { CollectionPage, CollectionPageReference } from './Extended'; +export type { + OrderedCollectionPage, + OrderedCollectionPageReference, +} from './Extended'; +export type { EitherCollection } from './Extended'; +export type { EitherCollectionReference } from './Extended'; +export type { EitherCollectionPage } from './Extended'; +export type { EitherCollectionPageReference } from './Extended'; +export type { StringReferenceMap } from './util/values'; diff --git a/packages/activitypub-core-types/src/activitypub/util/const.ts b/packages/activitypub-core-types/src/util/const.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/util/const.ts rename to packages/activitypub-core-types/src/util/const.ts diff --git a/packages/activitypub-core-types/src/activitypub/util/values.ts b/packages/activitypub-core-types/src/util/values.ts similarity index 100% rename from packages/activitypub-core-types/src/activitypub/util/values.ts rename to packages/activitypub-core-types/src/util/values.ts diff --git a/packages/activitypub-core-types/tsconfig.json b/packages/activitypub-core-types/tsconfig.json index f1088ef4..cea53d34 100644 --- a/packages/activitypub-core-types/tsconfig.json +++ b/packages/activitypub-core-types/tsconfig.json @@ -21,6 +21,6 @@ "../../node_modules" ], "include": [ - "src/index.ts" + "index.ts" ] } \ No newline at end of file diff --git a/packages/activitypub-core/.env b/packages/activitypub-core/.env new file mode 100644 index 00000000..f6ccfb61 --- /dev/null +++ b/packages/activitypub-core/.env @@ -0,0 +1,4 @@ +AP_HOST_NAME='test.com' +AP_PORT='80' +AP_PROTOCOL='https:' +NODE_OPTIONS="--experimental_modules" \ No newline at end of file diff --git a/packages/activitypub-core/__tests__/DatabaseService/expandCollection.ts b/packages/activitypub-core/__tests__/DatabaseService/expandCollection.ts new file mode 100644 index 00000000..83d43702 --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/expandCollection.ts @@ -0,0 +1,72 @@ +import { mockDatabaseService } from './mockDatabaseService'; +import { AP } from 'activitypub-core-types'; +import { Db } from 'mongodb'; + +describe('DatabaseService', () => { + describe('getCollectionItems', () => { + const collection1Url = 'https://test.com/activity/123'; + const collection1Result: AP.Collection = { + id: new URL(collection1Url), + url: new URL(collection1Url), + type: 'Collection', + totalItems: 1, + items: [ + new URL('https://test.com/activity/456'), + new URL('https://test.com/activity/789'), + ], + }; + const item1Url = 'https://test.com/activity/456'; + const item1Result: AP.Note = { + id: new URL(item1Url), + url: new URL(item1Url), + type: 'Note', + content: 'Test', + }; + const item2Url = 'https://test.com/activity/789'; + const item2Result: AP.Document = { + id: new URL(item2Url), + url: new URL(item2Url), + type: 'Document', + content: 'Test2', + }; + + const databaseService = mockDatabaseService({ + db: { + findOne: jest.fn((matchingObject: { [key: string]: unknown }) => { + if (matchingObject._id === collection1Url) { + return { + _id: collection1Url, + ...JSON.parse(JSON.stringify(collection1Result)) + }; + } + + if (matchingObject._id === item1Url) { + return { + _id: item1Url, + ...JSON.parse(JSON.stringify(item1Result)), + }; + } + + if (matchingObject._id === item2Url) { + return { + _id: item2Url, + ...JSON.parse(JSON.stringify(item2Result)) + } + } + + return null; + }), + } as unknown as Db, + }); + + it('handles local URLs', async () => { + const result = await databaseService.expandCollection( + new URL(collection1Url), + ); + expect(result).toStrictEqual({ + ...collection1Result, + items: [item1Result, item2Result], + }); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/DatabaseService/expandEntity.ts b/packages/activitypub-core/__tests__/DatabaseService/expandEntity.ts new file mode 100644 index 00000000..c8ed177c --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/expandEntity.ts @@ -0,0 +1,65 @@ +import { mockDatabaseService } from './mockDatabaseService'; +import { AP } from 'activitypub-core-types'; +import { Db } from 'mongodb'; +import { ACTIVITYSTREAMS_CONTEXT } from '../../src/globals'; + +describe('DatabaseService', () => { + describe('expandEntity', () => { + const activity1Url = 'https://test.com/activity/123'; + const actor1Url = 'https://test.com/actor/123'; + const object1Url = 'https://test.com/object/123'; + const activity1: AP.Create = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activity1Url), + url: new URL(activity1Url), + type: 'Create', + actor: new URL(actor1Url), + object: new URL(object1Url), + }; + const actor1: AP.Person = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor1Url), + url: new URL(actor1Url), + type: 'Person', + inbox: new URL(`${actor1Url}/inbox`), + outbox: new URL(`${actor1Url}/outbox`), + }; + const object1: AP.Note = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(object1Url), + url: new URL(object1Url), + type: 'Note', + content: 'Test', + }; + const activity1Result: AP.Create = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activity1Url), + url: new URL(activity1Url), + type: 'Create', + actor: actor1, + object: object1, + }; + + const databaseService = mockDatabaseService({ + db: { + findOne: jest.fn((matchingObject: { [key: string]: unknown }) => { + if (matchingObject._id === object1Url) { + return JSON.parse(JSON.stringify(object1)); + } + if (matchingObject._id === actor1Url) { + return JSON.parse(JSON.stringify(actor1)); + } + if (matchingObject._id === activity1Url) { + return JSON.parse(JSON.stringify(activity1)); + } + return null; + }), + } as unknown as Db, + }); + + it('should expand local activity', async () => { + const result = await databaseService.expandEntity(activity1); + expect(result).toMatchObject(activity1Result); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/DatabaseService/fetchEntityById.ts b/packages/activitypub-core/__tests__/DatabaseService/fetchEntityById.ts new file mode 100644 index 00000000..facc54fd --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/fetchEntityById.ts @@ -0,0 +1,35 @@ +import { mockDatabaseService } from './mockDatabaseService'; +import { AP } from 'activitypub-core-types'; +import { ACTIVITYSTREAMS_CONTEXT } from '../../src/globals'; + +describe('DatabaseService', () => { + describe('fetchEntityById', () => { + const actor1Url = 'https://foreign.test.com/456'; + const actor1Result: AP.Person = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL('https://foreign.test.com/456'), + url: new URL('https://foreign.test.com/456'), + type: 'Person', + name: 'Michael', + inbox: new URL('https://foreign.test.com/456/inbox'), + outbox: new URL('https://foreign.test.com/456/inbox'), + }; + + const databaseService = mockDatabaseService({ + fetchResponder: function (request: Request) { + return async function () { + if (request.url === actor1Url) { + return JSON.parse(JSON.stringify(actor1Result)); + } + + return null; + }; + }, + }); + + it('should fetch from remote host', async () => { + const result = await databaseService.fetchEntityById(new URL(actor1Url)); + expect(result).toMatchObject(actor1Result); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/DatabaseService/findEntityById.ts b/packages/activitypub-core/__tests__/DatabaseService/findEntityById.ts new file mode 100644 index 00000000..23d5d530 --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/findEntityById.ts @@ -0,0 +1,40 @@ +import { Db } from 'mongodb'; +import { mockDatabaseService } from './mockDatabaseService'; +import { AP } from 'activitypub-core-types'; + +describe('DatabaseService', () => { + describe('findOne', () => { + const object1Url = 'https://test.com/object/123'; + const object1Result: AP.Note = { + id: new URL(object1Url), + url: new URL(object1Url), + type: 'Note', + content: 'Test', + }; + + const databaseService = mockDatabaseService({ + db: { + findOne: jest.fn(({ _id }) => { + if (_id === object1Url) { + return JSON.parse( + JSON.stringify({ + _id: object1Url, + ...object1Result, + }), + ); + } + return null; + }), + } as unknown as Db, + }); + + it('should find local object and strip _id', async () => { + const foundItem = await databaseService.findEntityById( + new URL(object1Url), + ); + + expect(foundItem).toMatchObject(object1Result); + expect(databaseService.db.collection).toBeCalledWith('object'); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/DatabaseService/findStringIdByValue.ts b/packages/activitypub-core/__tests__/DatabaseService/findStringIdByValue.ts new file mode 100644 index 00000000..60f5c783 --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/findStringIdByValue.ts @@ -0,0 +1,28 @@ +import { Db } from 'mongodb'; +import { mockDatabaseService } from './mockDatabaseService'; + +describe('DatabaseService', () => { + describe('findStringIdByValue', () => { + const stringId = 'https://test.com/123'; + const stringValue = 'Hello world'; + + const databaseService = mockDatabaseService({ + db: { + findOne: jest.fn(() => ({ + _id: stringId, + value: stringValue, + })), + } as unknown as Db, + }); + + it('should get string ID by value', async () => { + const foundItem = await databaseService.findStringIdByValue( + 'foobar', + stringValue, + ); + + expect(foundItem).toBe(stringId); + expect(databaseService.db.collection).toBeCalledWith('foobar'); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/DatabaseService/findStringValueById.ts b/packages/activitypub-core/__tests__/DatabaseService/findStringValueById.ts new file mode 100644 index 00000000..88a331b6 --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/findStringValueById.ts @@ -0,0 +1,28 @@ +import { Db } from 'mongodb'; +import { mockDatabaseService } from './mockDatabaseService'; + +describe('DatabaseService', () => { + describe('findStringValueById', () => { + const stringId = 'https://test.com/123'; + const stringValue = 'Hello world'; + + const databaseService = mockDatabaseService({ + db: { + findOne: jest.fn(() => ({ + _id: stringId, + value: stringValue, + })), + } as unknown as Db, + }); + + it('should get value', async () => { + const foundItem = await databaseService.findStringValueById( + 'foobar', + stringId, + ); + + expect(foundItem).toBe(stringValue); + expect(databaseService.db.collection).toBeCalledWith('foobar'); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/DatabaseService/getCollectionItems.ts b/packages/activitypub-core/__tests__/DatabaseService/getCollectionItems.ts new file mode 100644 index 00000000..8cecb96b --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/getCollectionItems.ts @@ -0,0 +1,62 @@ +import { mockDatabaseService } from './mockDatabaseService'; +import { AP } from 'activitypub-core-types'; +import { Db } from 'mongodb'; +import { ACTIVITYSTREAMS_CONTEXT } from '../../src/globals'; + +describe('DatabaseService', () => { + describe('getCollectionItems', () => { + const item1Url = 'https://test.com/activity/456'; + const item1Result: AP.Note = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(item1Url), + url: new URL(item1Url), + type: 'Note', + content: 'Test', + }; + const item2Url = 'https://test.com/activity/789'; + const item2Result: AP.Document = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(item2Url), + url: new URL(item2Url), + type: 'Document', + content: 'Test2', + }; + + const collection1Url = 'https://test.com/activity/123'; + const collection1Result: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(collection1Url), + url: new URL(collection1Url), + type: 'Collection', + totalItems: 1, + items: [new URL(item1Url), new URL(item2Url)], + }; + + const databaseService = mockDatabaseService({ + db: { + findOne: jest.fn((matchingObject) => { + if (matchingObject._id === collection1Url) { + return JSON.parse(JSON.stringify(collection1Result)); + } + + if (matchingObject._id === item1Url) { + return JSON.parse(JSON.stringify(item1Result)); + } + + if (matchingObject._id === item2Url) { + return JSON.parse(JSON.stringify(item2Result)); + } + + return null; + }), + } as unknown as Db, + }); + + it('handles local URLs', async () => { + const items = await databaseService.getCollectionItems( + new URL(collection1Url), + ); + expect(items).toStrictEqual([item1Result, item2Result]); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/DatabaseService/mockDatabaseService.ts b/packages/activitypub-core/__tests__/DatabaseService/mockDatabaseService.ts new file mode 100644 index 00000000..6e3ea515 --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/mockDatabaseService.ts @@ -0,0 +1,62 @@ +import { Db } from 'mongodb'; +import { DatabaseService } from '../../src/DatabaseService'; +import { findOne } from '../endpoints/box'; + +export function mockDatabaseService({ + getActorByToken, + getPrivateKey, + db, + fetch, + fetchResponder = function (request: Request) { + return async function () { + return null; + }; + }, +}: { + getActorByToken?: Function; + getPrivateKey?: Function; + db?: Db; + fetch?: Function; + fetchResponder?: (request: Request) => unknown; +}) { + const mockDbInstance = { + collection: jest.fn( + () => + db ?? { + findOne, + }, + ), + } as unknown as Db; + + const fetchMock = + fetch ?? + jest.fn(async (request: Request) => ({ + json: fetchResponder(request), + })); + + let ExtendedDatabaseService = class extends DatabaseService { }; + + if (getActorByToken) { + const ExtendedDatabaseService2 = class extends ExtendedDatabaseService { + public override getActorByToken = getActorByToken; + }; + + ExtendedDatabaseService = ExtendedDatabaseService2; + } + + if (getPrivateKey) { + const ExtendedDatabase2 = class extends ExtendedDatabaseService { + public override getPrivateKey = getPrivateKey; + }; + + ExtendedDatabaseService = ExtendedDatabase2; + } + + return new ExtendedDatabaseService(mockDbInstance, fetchMock); +} + +describe('mockDatabaseService', () => { + it('works', () => { + expect(mockDatabaseService).toBeTruthy(); + }); +}); diff --git a/packages/activitypub-core/__tests__/DatabaseService/queryById.ts b/packages/activitypub-core/__tests__/DatabaseService/queryById.ts new file mode 100644 index 00000000..49f53aa5 --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/queryById.ts @@ -0,0 +1,37 @@ +import { mockDatabaseService } from './mockDatabaseService'; +import { AP } from 'activitypub-core-types'; +import { Db } from 'mongodb'; +import { ACTIVITYSTREAMS_CONTEXT } from '../../src/globals'; + +describe('DatabaseService', () => { + describe('queryById', () => { + const object1Url = 'https://test.com/object/123'; + const object1Result: AP.Note = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(object1Url), + url: new URL(object1Url), + type: 'Note', + content: 'Test', + }; + + const databaseService = mockDatabaseService({ + db: { + findOne: jest.fn(() => null), + } as unknown as Db, + fetchResponder: function (request: Request) { + return async function () { + if (request.url === object1Url) { + return object1Result; + } + + return null; + }; + }, + }); + + it('should expand remote object', async () => { + const result = await databaseService.queryById(new URL(object1Url)); + expect(result).toMatchObject(object1Result); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/DatabaseService/saveEntity.ts b/packages/activitypub-core/__tests__/DatabaseService/saveEntity.ts new file mode 100644 index 00000000..0f925d10 --- /dev/null +++ b/packages/activitypub-core/__tests__/DatabaseService/saveEntity.ts @@ -0,0 +1,54 @@ +import { mockDatabaseService } from './mockDatabaseService'; +import { AP } from 'activitypub-core-types'; +import { Db } from 'mongodb'; +import { ACTIVITYSTREAMS_CONTEXT } from '../../src/globals'; + +describe('DatabaseService', () => { + describe('saveEntity', () => { + const date = new Date('2022-01-01'); + const object1Url = 'https://test.com/object/123'; + const object1: AP.Note = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(object1Url), + url: new URL(object1Url), + type: 'Note', + content: 'Test', + published: date, + }; + + const object1Result = { + "@context": ACTIVITYSTREAMS_CONTEXT, + id: object1Url, + url: object1Url, + type: 'Note', + content: 'Test', + published: date.toISOString(), + }; + + it('should save the entity', async () => { + const replaceOne = jest.fn(async (object) => { + return true; + }); + const databaseService = mockDatabaseService({ + db: { + findOne: jest.fn(() => null), + replaceOne, + } as unknown as Db, + fetchResponder: function (request: Request) { + return async function () { + if (request.url === object1Url) { + return object1Result; + } + + return null; + }; + }, + }); + + await databaseService.saveEntity(object1); + expect(replaceOne).toBeCalledTimes(1); + expect(replaceOne.mock.calls[0][1]).toBeTruthy(); + expect(replaceOne.mock.calls[0][1]).toStrictEqual(object1Result); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/DeliveryService/signAndSendToForeignActorInbox.ts b/packages/activitypub-core/__tests__/DeliveryService/signAndSendToForeignActorInbox.ts new file mode 100644 index 00000000..102b5de1 --- /dev/null +++ b/packages/activitypub-core/__tests__/DeliveryService/signAndSendToForeignActorInbox.ts @@ -0,0 +1,47 @@ +import { mockDatabaseService } from '../DatabaseService/mockDatabaseService'; +import { AP } from 'activitypub-core-types'; +import * as data from '../data'; +import { generateKeyPair } from '../../src/utilities/generateKeyPair'; +import { DeliveryService } from '../../src/DeliveryService'; + +describe('DeliveryService', () => { + describe('signAndSendToForeignActorInbox', () => { + const fetch = jest.fn(async () => { + return true; + }); + + const getPrivateKey = jest.fn(async () => { + const { privateKey } = await generateKeyPair(); + return privateKey; + }); + + const databaseService = mockDatabaseService({ + fetch, + }); + + class ExtendedDeliveryService extends DeliveryService { + public override getPrivateKey = getPrivateKey; + } + + const deliveryService = new ExtendedDeliveryService(databaseService); + + const foreignActorInbox = new URL(data.actor2InboxUrl); + const actor = data.actor1Result; + const activity: AP.Activity = { + type: 'Read', + actor: new URL(data.actor1Url), + object: new URL(data.note2Url), + to: [new URL(data.actor2Url)], + }; + + it('works', async () => { + await deliveryService.signAndSendToForeignActorInbox( + foreignActorInbox, + actor, + activity, + ); + + expect(fetch).toBeCalledTimes(1); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/activitypub-core.test.js b/packages/activitypub-core/__tests__/activitypub-core.test.js deleted file mode 100644 index 464fff8b..00000000 --- a/packages/activitypub-core/__tests__/activitypub-core.test.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -const activitypubCore = require('..'); -const assert = require('assert').strict; - -assert.strictEqual(activitypubCore(), 'Hello from activitypubCore'); -console.info("activitypubCore tests passed"); diff --git a/packages/activitypub-core/__tests__/data.ts b/packages/activitypub-core/__tests__/data.ts new file mode 100644 index 00000000..68a8bf12 --- /dev/null +++ b/packages/activitypub-core/__tests__/data.ts @@ -0,0 +1,333 @@ +import { AP } from 'activitypub-core-types'; +import { ACTIVITYSTREAMS_CONTEXT } from '../src/globals'; + +export const actor1Url = `https://test.com/actor/123`; +export const actor1InboxUrl = `${actor1Url}/inbox`; +export const actor1OutboxUrl = `${actor1Url}/outbox`; +export const actor1FollowersUrl = `${actor1Url}/followers`; +export const actor1FollowingUrl = `${actor1Url}/following`; +export const collection1Url = `${actor1Url}/collection/abc`; +export const collection2Url = `${actor1Url}/collection/def`; +export const actor1SharedUrl = `${actor1Url}/shared`; +export const actor1LikedUrl = `${actor1Url}/liked`; +export const note1Url = `${actor1Url}/object/123`; +export const note2Url = `${actor1Url}/object/345`; +export const note2LikesUrl = `${actor1Url}/object/345/likes`; +export const note2SharesUrl = `${actor1Url}/object/345/shares`; +export const actor2Url = `https://test.com/actor/987`; +export const actor2InboxUrl = `${actor2Url}/inbox`; +export const actor2OutboxUrl = `${actor2Url}/outbox`; +export const actor2FollowersUrl = `${actor2Url}/followers`; +export const actor2FollowingUrl = `${actor2Url}/following`; +export const actor3Url = `https://test.com/actor/654`; +export const actor3InboxUrl = `${actor3Url}/inbox`; +export const actor3OutboxUrl = `${actor3Url}/outbox`; +export const actor4Url = `https://test.com/actor/321`; +export const actor4InboxUrl = `${actor4Url}/inbox`; +export const actor4OutboxUrl = `${actor4Url}/outbox`; +export const sharedInboxUrl = `https://test.com/sharedInbox`; +export const actor5Url = `https://test.com/actor/001`; +export const actor5InboxUrl = `${actor5Url}/inbox`; +export const actor5OutboxUrl = `${actor5Url}/outbox`; + +export const remoteCollection1Url = `http://2.example.com/123/456`; +export const originalAddActivityId = `https://test.com/activity/abc`; +export const originalRemoveActivityId = `https://test.com/activity/def`; +export const originalLikeActivityId = 'https://test.com/activity/ghi'; +export const originalAnnounceActivityId = 'https://test.com/activity/jkl'; +export const originalCreateActivityId = 'https://test.com/activity/mno'; +export const originalDeleteActivityId = 'https://test.com/activity/pqr'; +export const originalFollowActivityId = 'https://test.com/activity/stu'; + +export const originalFollowActivity: AP.Follow = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(originalFollowActivityId), + url: new URL(originalFollowActivityId), + type: 'Follow', + actor: new URL(actor2Url), + object: new URL(actor1Url), +}; + +export const originalAddActivity: AP.Add = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(originalAddActivityId), + url: new URL(originalAddActivityId), + type: 'Add', + actor: new URL(actor1Url), + object: new URL(note1Url), + target: new URL(collection1Url), +}; + +export const originalRemoveActivity: AP.Remove = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(originalRemoveActivityId), + url: new URL(originalRemoveActivityId), + type: 'Remove', + actor: new URL(actor1Url), + object: new URL(note1Url), + target: new URL(collection1Url), +}; + +export const originalLikeActivity: AP.Like = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(originalLikeActivityId), + url: new URL(originalLikeActivityId), + type: 'Like', + actor: new URL(actor1Url), + object: new URL(note2Url), +}; + +export const originalAnnounceActivity: AP.Announce = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(originalAnnounceActivityId), + url: new URL(originalAnnounceActivityId), + type: 'Announce', + actor: new URL(actor1Url), + object: new URL(note2Url), +}; + +export const originalCreateActivity: AP.Create = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(originalCreateActivityId), + url: new URL(originalCreateActivityId), + type: 'Create', + actor: new URL(actor1Url), + object: new URL(note1Url), +}; + +export const originalDeleteActivity: AP.Delete = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(originalDeleteActivityId), + url: new URL(originalDeleteActivityId), + type: 'Delete', + actor: new URL(actor1Url), + object: new URL(note1Url), +}; + +export const actor1Result: AP.Person = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor1Url), + url: new URL(actor1Url), + type: 'Person', + inbox: new URL(actor1InboxUrl), + outbox: new URL(actor1OutboxUrl), + following: new URL(actor1FollowingUrl), + followers: new URL(actor1FollowersUrl), + liked: new URL(actor1LikedUrl), + streams: [new URL(actor1SharedUrl)], +}; + +export const actor1Inbox: AP.OrderedCollection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor1InboxUrl), + url: new URL(actor1InboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +export const actor1Outbox: AP.OrderedCollection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor1OutboxUrl), + url: new URL(actor1OutboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +export const actor1Following: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor1FollowingUrl), + url: new URL(actor1FollowingUrl), + type: 'Collection', + totalItems: 0, + items: [], +}; + +export const actor1Followers: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor1FollowingUrl), + url: new URL(actor1FollowingUrl), + type: 'Collection', + totalItems: 0, + items: [], +}; + +export const actor2Result: AP.Person = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor2Url), + url: new URL(actor2Url), + type: 'Person', + inbox: new URL(actor2InboxUrl), + outbox: new URL(actor2OutboxUrl), + following: new URL(actor2FollowingUrl), + followers: new URL(actor2FollowersUrl), +}; + +export const actor2Inbox: AP.OrderedCollection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor2InboxUrl), + url: new URL(actor2InboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +export const actor2Outbox: AP.OrderedCollection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor2OutboxUrl), + url: new URL(actor2OutboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +export const actor2Following: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor2FollowingUrl), + url: new URL(actor2FollowingUrl), + type: 'Collection', + totalItems: 0, + items: [], +}; + +export const actor2Followers: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor2FollowingUrl), + url: new URL(actor2FollowingUrl), + type: 'Collection', + totalItems: 0, + items: [], +}; + +export const actor3Result: AP.Person = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor3Url), + url: new URL(actor3Url), + type: 'Person', + inbox: new URL(actor3InboxUrl), + outbox: new URL(actor3OutboxUrl), +}; + +export const actor5Result: AP.Person = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor5Url), + url: new URL(actor5Url), + type: 'Person', + inbox: new URL(actor5InboxUrl), + outbox: new URL(actor5OutboxUrl), + endpoints: { + sharedInbox: new URL(sharedInboxUrl), + }, +}; + +export const actor3Inbox: AP.OrderedCollection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor3InboxUrl), + url: new URL(actor3InboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +export const actor3Outbox: AP.OrderedCollection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor3OutboxUrl), + url: new URL(actor3OutboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +export const actor4Result: AP.Person = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor4Url), + url: new URL(actor4Url), + type: 'Person', + inbox: new URL(actor4InboxUrl), + outbox: new URL(actor4OutboxUrl), + endpoints: { + sharedInbox: new URL(sharedInboxUrl), + }, +}; + +export const actor1Shared: AP.OrderedCollection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor1SharedUrl), + url: new URL(actor1SharedUrl), + name: 'Shared', + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +export const actor1Liked: AP.OrderedCollection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor1LikedUrl), + url: new URL(actor1LikedUrl), + name: 'Liked', + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +export const collection1: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(collection1Url), + url: new URL(collection1Url), + type: 'Collection', + totalItems: 1, + items: [new URL(actor3Url)], +}; + +export const collection2: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(collection1Url), + url: new URL(collection1Url), + type: 'Collection', + totalItems: 0, + items: [new URL(note1Url)], +}; + +export const note1 = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(note1Url), + url: new URL(note1Url), + type: 'Note', + content: 'Hello world', +}; + +export const note2 = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(note2Url), + url: new URL(note2Url), + type: 'Note', + content: 'Foo bar', + attributedTo: new URL(actor1Url), + shares: new URL(note2SharesUrl), + likes: new URL(note2LikesUrl), +}; + +export const note2Likes = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(note2LikesUrl), + url: new URL(note2LikesUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +export const note2Shares = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(note2SharesUrl), + url: new URL(note2SharesUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], +}; + +describe('data', () => { + it('works', () => { + expect(actor1Result).toBeTruthy(); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/box.ts b/packages/activitypub-core/__tests__/endpoints/box.ts new file mode 100644 index 00000000..41fe0658 --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/box.ts @@ -0,0 +1,409 @@ +jest.mock('../../src/utilities/streamToString', () => { + return { + streamToString: function streamToString(req) { + return req.body; + }, + }; +}); + +import type { Db } from 'mongodb'; +import { AP } from 'activitypub-core-types'; +import { ACTIVITYSTREAMS_CONTENT_TYPE } from '../../src/globals'; +import { mockDatabaseService } from '../DatabaseService/mockDatabaseService'; +import * as data from '../data'; +import { DeliveryService } from '../../src/DeliveryService'; +import { outboxHandler as outbox } from '../../src/endpoints/outbox'; +import { inboxHandler as inbox } from '../../src/endpoints/inbox'; +import { sharedInboxPostHandler as sharedInbox } from '../../src/endpoints/sharedInbox'; +import { IncomingMessage, ServerResponse } from 'http'; + +export const findOne = jest.fn(({ _id, outbox, inbox }) => { + if (_id === data.actor1Url) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1Url, + ...JSON.parse(JSON.stringify(data.actor1Result)), + }), + ); + } + if (_id === data.actor1FollowingUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1FollowingUrl, + ...JSON.parse(JSON.stringify(data.actor1Following)), + }), + ); + } + if (_id === data.actor1FollowersUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1FollowersUrl, + ...JSON.parse(JSON.stringify(data.actor1Followers)), + }), + ); + } + if (_id === data.actor2FollowingUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor2FollowingUrl, + ...JSON.parse(JSON.stringify(data.actor2Following)), + }), + ); + } + if (_id === data.actor2FollowersUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor2FollowersUrl, + ...JSON.parse(JSON.stringify(data.actor2Followers)), + }), + ); + } + if (_id === data.actor1InboxUrl) { + return { + _id: data.actor1InboxUrl, + ...JSON.parse(JSON.stringify(data.actor1Inbox)), + }; + } + if (_id === data.actor1OutboxUrl) { + return { + _id: data.actor1OutboxUrl, + ...JSON.parse(JSON.stringify(data.actor1Outbox)), + }; + } + if (_id === data.actor2Url) { + return { + _id: data.actor2Url, + ...JSON.parse(JSON.stringify(data.actor2Result)), + }; + } + if (_id === data.actor2InboxUrl) { + return { + _id: data.actor2InboxUrl, + ...JSON.parse(JSON.stringify(data.actor2Inbox)), + }; + } + if (_id === data.actor2OutboxUrl) { + return { + _id: data.actor2OutboxUrl, + ...JSON.parse(JSON.stringify(data.actor2Outbox)), + }; + } + if (_id === data.actor3Url) { + return { + _id: data.actor3Url, + ...JSON.parse(JSON.stringify(data.actor3Result)), + }; + } + if (_id === data.actor3InboxUrl) { + return { + _id: data.actor3InboxUrl, + ...JSON.parse(JSON.stringify(data.actor3Inbox)), + }; + } + if (_id === data.actor3OutboxUrl) { + return { + _id: data.actor3OutboxUrl, + ...JSON.parse(JSON.stringify(data.actor3Outbox)), + }; + } + if (outbox === data.actor1OutboxUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1Url, + ...JSON.parse(JSON.stringify(data.actor1Result)), + }), + ); + } + if (outbox === data.actor2OutboxUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor2Url, + ...JSON.parse(JSON.stringify(data.actor2Result)), + }), + ); + } + if (_id === data.actor4Url) { + return JSON.parse( + JSON.stringify({ + _id: data.actor4Url, + ...JSON.parse(JSON.stringify(data.actor4Result)), + }), + ); + } + if (_id === data.actor5Url) { + return JSON.parse( + JSON.stringify({ + _id: data.actor5Url, + ...JSON.parse(JSON.stringify(data.actor5Result)), + }), + ); + } + if (inbox === data.actor1InboxUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1InboxUrl, + ...JSON.parse(JSON.stringify(data.actor1Result)), + }), + ); + } + if (inbox === data.actor2InboxUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor2InboxUrl, + ...JSON.parse(JSON.stringify(data.actor2Result)), + }), + ); + } + if (_id === data.actor1SharedUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1SharedUrl, + ...JSON.parse(JSON.stringify(data.actor1Shared)), + }), + ); + } + if (_id === data.actor1LikedUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1LikedUrl, + ...JSON.parse(JSON.stringify(data.actor1Liked)), + }), + ); + } + if (_id === data.collection1Url) { + return JSON.parse( + JSON.stringify({ + _id: data.collection1Url, + ...JSON.parse(JSON.stringify(data.collection1)), + }), + ); + } + if (_id === data.collection2Url) { + return JSON.parse( + JSON.stringify({ + _id: data.collection2Url, + ...JSON.parse(JSON.stringify(data.collection2)), + }), + ); + } + if (_id === data.note1Url) { + return JSON.parse( + JSON.stringify({ + _id: data.note1Url, + ...JSON.parse(JSON.stringify(data.note1)), + }), + ); + } + if (_id === data.note2Url) { + return JSON.parse( + JSON.stringify({ + _id: data.note2Url, + ...JSON.parse(JSON.stringify(data.note2)), + }), + ); + } + if (_id === data.note2LikesUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.note2LikesUrl, + ...JSON.parse(JSON.stringify(data.note2Likes)), + }), + ); + } + if (_id === data.note2SharesUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.note2SharesUrl, + ...JSON.parse(JSON.stringify(data.note2Shares)), + }), + ); + } + if (_id === data.originalFollowActivityId) { + return JSON.parse( + JSON.stringify({ + _id: data.originalFollowActivityId, + ...JSON.parse(JSON.stringify(data.originalFollowActivity)), + }), + ); + } + if (_id === data.originalAddActivityId) { + return JSON.parse( + JSON.stringify({ + _id: data.originalAddActivityId, + ...JSON.parse(JSON.stringify(data.originalAddActivity)), + }), + ); + } + if (_id === data.originalRemoveActivityId) { + return JSON.parse( + JSON.stringify({ + _id: data.originalRemoveActivityId, + ...JSON.parse(JSON.stringify(data.originalRemoveActivity)), + }), + ); + } + if (_id === data.originalLikeActivityId) { + return JSON.parse( + JSON.stringify({ + _id: data.originalLikeActivityId, + ...JSON.parse(JSON.stringify(data.originalLikeActivity)), + }), + ); + } + if (_id === data.originalAnnounceActivityId) { + return JSON.parse( + JSON.stringify({ + _id: data.originalAnnounceActivityId, + ...JSON.parse(JSON.stringify(data.originalAnnounceActivity)), + }), + ); + } + if (_id === data.originalCreateActivityId) { + return JSON.parse( + JSON.stringify({ + _id: data.originalCreateActivityId, + ...JSON.parse(JSON.stringify(data.originalCreateActivity)), + }), + ); + } + if (_id === data.originalDeleteActivityId) { + return JSON.parse( + JSON.stringify({ + _id: data.originalDeleteActivityId, + ...JSON.parse(JSON.stringify(data.originalDeleteActivity)), + }), + ); + } + return null; +}); + +const handleBox = async ( + url: string, + handler: Function, + activity?: AP.Activity, + options?: { [key: string]: unknown }, +) => { + const replaceOne = jest.fn(async (object) => { + return true; + }); + + const updateOne = jest.fn(async (object) => { + return true; + }); + + const fetch = jest.fn(async () => { + return true; + }); + + const signAndSendToForeignActorInbox = jest.fn(async () => { + return true; + }); + + const databaseService = mockDatabaseService({ + fetch, + ...(options ?? {}), + db: { + replaceOne, + updateOne, + findOne, + } as unknown as Db, + }); + + class ExtendedDeliveryService extends DeliveryService { + public override signAndSendToForeignActorInbox = + signAndSendToForeignActorInbox; + } + + const deliveryService = new ExtendedDeliveryService(databaseService); + + const setHeader = jest.fn(() => { }); + const write = jest.fn(() => { }); + const end = jest.fn(() => { }); + + const req: Partial = { + url, + method: 'POST', + headers: { + accept: ACTIVITYSTREAMS_CONTENT_TYPE, + }, + body: JSON.stringify(activity), + on: { + event: { + end: () => { }, + data: () => { + return JSON.stringify(activity); + } + } + } + }; + const res: Partial = { + setHeader, + write, + end, + }; + + if (handler) { + await handler( + req as IncomingMessage, + res as ServerResponse, + databaseService, + deliveryService, + ); + } + + return { + fetch, + signAndSendToForeignActorInbox, + replaceOne, + updateOne, + setHeader, + write, + end, + }; +}; + +export const inboxHandler = async ( + activity: AP.Activity, + options?: { [key: string]: unknown }, +) => { + return await handleBox( + data.actor1OutboxUrl.toString().split('https://test.com')[1], + inbox, + activity, + options, + ); +}; + +export const outboxHandler = async ( + activity: AP.Activity, + options?: { [key: string]: unknown }, +) => { + return await handleBox( + data.actor1InboxUrl.toString().split('https://test.com')[1], + outbox, + activity, + options, + ); +}; + +export const sharedInboxPostHandler = async ( + activity: AP.Activity, + options?: { [key: string]: unknown }, +) => { + return await handleBox( + data.actor4Result.endpoints.sharedInbox + .toString() + .split('https://test.com')[1], + sharedInbox, + activity, + options, + ); +}; + +describe('post', () => { + it('works', () => { + expect(outboxHandler).toBeTruthy(); + expect(inboxHandler).toBeTruthy(); + expect(sharedInboxPostHandler).toBeTruthy(); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/entity.ts b/packages/activitypub-core/__tests__/endpoints/entity.ts new file mode 100644 index 00000000..d41bfa95 --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/entity.ts @@ -0,0 +1,127 @@ +import { mockDatabaseService } from '../DatabaseService/mockDatabaseService'; +import { AP } from 'activitypub-core-types'; +import { Db } from 'mongodb'; +import { entityGetHandler } from '../../src/endpoints/entity'; +import { IncomingMessage, ServerResponse } from 'http'; +import { + ACTIVITYSTREAMS_CONTENT_TYPE, + ACTIVITYSTREAMS_CONTEXT, + CONTENT_TYPE_HEADER, + W3ID_SECURITY_CONTEXT, +} from '../../src/globals'; + +describe('Endpoints', () => { + describe('Entity', () => { + const actor1Url = `https://test.com/actor/123`; + const actor1InboxUrl = `${actor1Url}/inbox`; + const actor1OutboxUrl = `${actor1Url}/outbox`; + + const actor1Result: AP.Person = { + id: new URL(actor1Url), + url: new URL(actor1Url), + type: 'Person', + inbox: new URL(actor1InboxUrl), + outbox: new URL(actor1OutboxUrl), + }; + + const actor1Inbox: AP.OrderedCollection = { + id: new URL(actor1InboxUrl), + url: new URL(actor1InboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], + }; + + const actor1Outbox: AP.OrderedCollection = { + id: new URL(actor1OutboxUrl), + url: new URL(actor1OutboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], + }; + + const databaseService = mockDatabaseService({ + db: { + findOne: jest.fn(({ _id }) => { + if (_id === actor1Url) { + return JSON.parse( + JSON.stringify({ + _id: actor1Url, + ...JSON.parse(JSON.stringify(actor1Result)), + }), + ); + } + if (_id === actor1InboxUrl) { + return { + id: actor1InboxUrl, + ...JSON.parse(JSON.stringify(actor1Inbox)), + }; + } + if (_id === actor1OutboxUrl) { + return { + id: actor1OutboxUrl, + ...JSON.parse(JSON.stringify(actor1Outbox)), + }; + } + return null; + }), + } as unknown as Db, + }); + + const setHeader = jest.fn(() => { }); + const write = jest.fn(() => { }); + const end = jest.fn(() => { }); + + it('works with accept application/json', async () => { + const request: Partial = { + url: actor1Url.toString().split('https://test.com')[1], + headers: { + accept: ACTIVITYSTREAMS_CONTENT_TYPE, + }, + }; + const response: Partial = { + setHeader, + write, + end, + }; + const data = await entityGetHandler(request as IncomingMessage, response as ServerResponse, databaseService); + expect(setHeader).toBeCalledWith( + CONTENT_TYPE_HEADER, + ACTIVITYSTREAMS_CONTENT_TYPE, + ); + expect(write).toBeCalledWith( + JSON.stringify({ + '@context': [ACTIVITYSTREAMS_CONTEXT, W3ID_SECURITY_CONTEXT], + ...actor1Result, + inbox: actor1Inbox, + outbox: actor1Outbox, + }), + ); + expect(end).toBeCalledTimes(1); + }); + + it('works with text/html accept header', async () => { + const request: Partial = { + url: actor1Url.toString().split('https://test.com')[1], + headers: { + accept: 'text/html', + }, + }; + const response: Partial = { + setHeader, + write, + end, + }; + const data = await entityGetHandler(request as IncomingMessage, response as ServerResponse, databaseService); + expect(data.props).toStrictEqual({ + entity: JSON.parse( + JSON.stringify({ + ...actor1Result, + inbox: actor1Inbox, + outbox: actor1Outbox, + }), + ), + }); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/home.ts b/packages/activitypub-core/__tests__/endpoints/home.ts new file mode 100644 index 00000000..caf84b4c --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/home.ts @@ -0,0 +1,139 @@ +import { mockDatabaseService } from '../DatabaseService/mockDatabaseService'; +import { AP } from 'activitypub-core-types'; +import { Db } from 'mongodb'; +import { homeGetHandler } from '../../src/endpoints/home'; +import { IncomingMessage, ServerResponse } from 'http'; + +describe('Endpoints', () => { + describe('Home', () => { + const actor1Url = `https://test.com/actor/123`; + const actor1InboxUrl = `${actor1Url}/inbox`; + const actor1OutboxUrl = `${actor1Url}/outbox`; + const actor1FollowersUrl = `${actor1Url}/followers`; + const actor1FollowingUrl = `${actor1Url}/following`; + + const actor1Result: AP.Person = { + id: new URL(actor1Url), + url: new URL(actor1Url), + type: 'Person', + inbox: new URL(actor1InboxUrl), + outbox: new URL(actor1OutboxUrl), + following: new URL(actor1FollowingUrl), + followers: new URL(actor1FollowersUrl), + streams: [], + }; + + const actor1Inbox: AP.OrderedCollection = { + id: new URL(actor1InboxUrl), + url: new URL(actor1InboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], + }; + + const actor1Outbox: AP.OrderedCollection = { + id: new URL(actor1OutboxUrl), + url: new URL(actor1OutboxUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], + }; + const actor1Followers: AP.OrderedCollection = { + id: new URL(actor1FollowersUrl), + url: new URL(actor1FollowersUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], + }; + + const actor1Following: AP.OrderedCollection = { + id: new URL(actor1FollowingUrl), + url: new URL(actor1FollowingUrl), + type: 'OrderedCollection', + totalItems: 0, + orderedItems: [], + }; + + const databaseService = mockDatabaseService({ + getActorByToken: jest.fn(() => { + return JSON.parse(JSON.stringify(actor1Result)); + }), + db: { + findOne: jest.fn(({ _id }) => { + if (_id === actor1Url) { + return JSON.parse( + JSON.stringify({ + _id: actor1Url, + ...JSON.parse(JSON.stringify(actor1Result)), + }), + ); + } + if (_id === actor1InboxUrl) { + return { + id: actor1InboxUrl, + ...JSON.parse(JSON.stringify(actor1Inbox)), + }; + } + if (_id === actor1OutboxUrl) { + return { + id: actor1OutboxUrl, + ...JSON.parse(JSON.stringify(actor1Outbox)), + }; + } + if (_id === actor1FollowersUrl) { + return { + id: actor1FollowersUrl, + ...JSON.parse(JSON.stringify(actor1Followers)), + }; + } + if (_id === actor1FollowingUrl) { + return { + id: actor1FollowingUrl, + ...JSON.parse(JSON.stringify(actor1Following)), + }; + } + return null; + }), + } as unknown as Db, + }); + + const setHeader = jest.fn(() => { }); + const write = jest.fn(() => { }); + const end = jest.fn(() => { }); + + it('works with text/html accept header', async () => { + const request: Partial = { + url: actor1Url.toString().split('https://test.com')[1], + headers: { + accept: 'text/html', + cookie: '__session=xyz', + }, + }; + const response: Partial = { + setHeader, + write, + end, + }; + const data = await homeGetHandler( + request as IncomingMessage, + response as ServerResponse, + void 0, + databaseService, + ); + expect(data.props).toStrictEqual( + JSON.parse( + JSON.stringify({ + actor: { + ...actor1Result, + inbox: actor1Inbox, + outbox: actor1Outbox, + following: actor1Following, + followers: actor1Followers, + streams: [], + }, + }), + ), + ); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/inbox/index.ts b/packages/activitypub-core/__tests__/endpoints/inbox/index.ts new file mode 100644 index 00000000..fbf222c2 --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/inbox/index.ts @@ -0,0 +1,333 @@ +import { ACTIVITYSTREAMS_CONTEXT } from '../../../src/globals'; +import { AP } from 'activitypub-core-types'; +import * as data from '../../data'; +import { inboxHandler } from '../box'; + +describe('Endpoints', () => { + describe('Actor Inbox', () => { + it('Accepts Activity Objects', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + to: [new URL(data.actor1Url), new URL(data.actor3Url)], + type: 'Arrive', + actor: new URL(data.actor2Url), + location: { + type: 'Place', + name: 'Disney World', + }, + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into inbox + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(0); // no delivery. + + expect(end).toBeCalledTimes(1); + }); + + it('Forwards with TO:collection', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Arrive', + to: [new URL(data.actor1Url), new URL(data.collection1Url)], + actor: new URL(data.actor2Url), + location: { + type: 'Place', + name: 'Disney World', + }, + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into inbox + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(1); // delivery {to: actor3} + + expect(end).toBeCalledTimes(1); + }); + + it('Forwards with CC:collection', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Arrive', + to: new URL(data.actor1Url), + cc: new URL(data.collection1Url), + actor: new URL(data.actor2Url), + location: { + type: 'Place', + name: 'Disney World', + }, + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into inbox + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(1); // delivery {to: actor3} + + expect(end).toBeCalledTimes(1); + }); + + it('Forwards with audience:collection', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Arrive', + to: new URL(data.actor1Url), + audience: new URL(data.collection1Url), + actor: new URL(data.actor2Url), + location: { + type: 'Place', + name: 'Disney World', + }, + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into inbox + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(1); // delivery {to: actor3} + + expect(end).toBeCalledTimes(1); + }); + + it('Forwards with known inReplyTo', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Read', + to: [new URL(data.actor1Url), new URL(data.actor3Url)], + actor: new URL(data.actor2Url), + object: new URL('https://foreign-url.test.com/~123'), + inReplyTo: new URL(data.note1Url), + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into inbox + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(1); // delivery {to: actor3} + + expect(end).toBeCalledTimes(1); + }); + + it('Forwards with known object', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Read', + to: [new URL(data.actor1Url), new URL(data.actor3Url)], + actor: new URL(data.actor2Url), + object: new URL(data.note1Url), + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into inbox + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(1); // delivery {to: actor3} + + expect(end).toBeCalledTimes(1); + }); + + it('Forwards with known target', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Arrive', + to: [new URL(data.actor1Url), new URL(data.actor3Url)], + actor: new URL(data.actor2Url), + location: { + type: 'Place', + name: 'Disney World', + }, + target: new URL(data.collection1Url), + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into inbox + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(1); // delivery {to: actor3} + + expect(end).toBeCalledTimes(1); + }); + + it('Forwards with known tag', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Arrive', + to: [new URL(data.actor1Url), new URL(data.actor3Url)], + actor: new URL(data.actor2Url), + location: { + type: 'Place', + name: 'Disney World', + }, + tag: new URL(data.actor3Url), + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into inbox + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(1); // delivery {to: actor3} + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts announce activity (increments shares)', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Announce = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Announce', + to: new URL(data.actor1Url), + actor: new URL(data.actor2Url), + object: new URL(data.note2Url), + }; + + const { updateOne, replaceOne, end } = await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(2); // insert activity into inbox, insert Share into Shares + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts like activity (increments likes)', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Like = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Like', + to: new URL(data.actor1Url), + actor: new URL(data.actor2Url), + object: new URL(data.note2Url), + }; + + const { updateOne, replaceOne, end } = await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(2); // insert activity into inbox, insert Like into Likes + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts Follow request from another Actor (follows back automatically)', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Follow = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Follow', + actor: new URL(data.actor2Url), + to: new URL(data.actor1Url), + object: new URL(data.actor1Url), + }; + + const { updateOne, replaceOne, signAndSendToForeignActorInbox, end } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(3); // insert activity into inbox, insert follower, insert activity into outbox + expect(replaceOne).toBeCalledTimes(2); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(1); // auto-generated response + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts accept activity', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Accept = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Accept', + actor: new URL(data.actor2Url), + to: new URL(data.actor1Url), + object: new URL(data.originalFollowActivityId), + }; + + const { updateOne, replaceOne, end } = await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(3); // insert activity into inbox, insert follower, insert followee + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts JSON-LD', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity = { + '@context': { + as: new URL(ACTIVITYSTREAMS_CONTEXT), + }, + '@id': new URL(activityId), + '@type': ['as:Arrive'], + 'as:url': [ + { + '@id': new URL(activityId), + }, + ], + 'as:actor': [ + { + '@id': new URL(data.actor2Url), + }, + ], + 'as:to': [ + { + '@id': new URL(data.actor1Url), + }, + { + '@id': new URL(data.actor3Url), + }, + ], + 'as:location': [ + { + '@type': 'as:Place', + 'as:name': 'Disney World', + }, + ], + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await inboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into inbox + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(0); // no delivery. + + expect(end).toBeCalledTimes(1); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/outbox/addressing.ts b/packages/activitypub-core/__tests__/endpoints/outbox/addressing.ts new file mode 100644 index 00000000..cf5d8131 --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/outbox/addressing.ts @@ -0,0 +1,61 @@ +import { AP } from 'activitypub-core-types'; +import * as data from '../../data'; +import { outboxHandler } from '../box'; +import { ACTIVITYSTREAMS_CONTEXT } from '../../../src/globals'; + +describe('Endpoints', () => { + describe('Actor Outbox', () => { + it('Combines addresses', async () => { + const activity: AP.Create = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + type: AP.ActivityTypes.CREATE, + actor: new URL(data.actor1Url), + to: new URL(data.actor2Url), + object: { + cc: new URL(data.actor3Url), + type: AP.ExtendedObjectTypes.PLACE, + name: 'Disney World', + }, + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await outboxHandler(activity); + + // TODO: Check if bto, bcc were removed before saving. + expect(updateOne).toBeCalledTimes(1); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(4); // activity + expect(replaceOne.mock.calls[0][1]).toBeTruthy(); + expect(replaceOne.mock.calls[0][1].to).toBeTruthy(); + expect(replaceOne.mock.calls[0][1].cc).toBeTruthy(); + expect(signAndSendToForeignActorInbox).toBeCalledTimes(2); + + expect(end).toBeCalledTimes(1); + }); + + it('Removes the `bto` and `bcc` properties from Objects before storage (`outbox:removes-bto-and-bcc`) *MUST*', async () => { + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + type: AP.ActivityTypes.CREATE, // TODO CREATE + actor: new URL(data.actor1Url), + bto: [new URL(data.actor2Url)], + object: { + type: AP.ExtendedObjectTypes.PLACE, + name: 'Disney World', + bcc: [new URL(data.actor3Url)], + }, + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(4); // activity, create, likes, shares + expect(replaceOne.mock.calls[0][1]).toBeTruthy(); + expect(replaceOne.mock.calls[0][1].bto).toBeUndefined(); + expect(replaceOne.mock.calls[0][1].bcc).toBeUndefined(); + expect(signAndSendToForeignActorInbox).toBeCalledTimes(2); + + expect(end).toBeCalledTimes(1); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/outbox/get_html.ts b/packages/activitypub-core/__tests__/endpoints/outbox/get_html.ts new file mode 100644 index 00000000..9a1b6325 --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/outbox/get_html.ts @@ -0,0 +1,87 @@ +jest.mock('../../../src/utilities/streamToString', () => { + return { + streamToString: function streamToString(req) { + return req.body; + }, + }; +}); + +import * as data from '../../data'; +import { mockDatabaseService } from '../../DatabaseService/mockDatabaseService'; +import { Db } from 'mongodb'; +import { getServerSideProps } from '../../../src/endpoints/outbox'; +import { NextPageContext } from 'next'; + +describe('Endpoints', () => { + describe('Actor Outbox', () => { + it('GET text/html', async () => { + const replaceOne = jest.fn(async (object) => { + return true; + }); + + const updateOne = jest.fn(async (object) => { + return true; + }); + + const databaseService = mockDatabaseService({ + db: { + replaceOne, + updateOne, + findOne: jest.fn(({ _id, outbox }) => { + if (_id === data.actor1Url) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1Url, + ...JSON.parse(JSON.stringify(data.actor1Result)), + }), + ); + } + if (_id === data.actor1InboxUrl) { + return { + id: data.actor1InboxUrl, + ...JSON.parse(JSON.stringify(data.actor1Inbox)), + }; + } + if (_id === data.actor1OutboxUrl) { + return { + id: data.actor1OutboxUrl, + ...JSON.parse(JSON.stringify(data.actor1Outbox)), + }; + } + if (outbox === data.actor1OutboxUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1Url, + ...JSON.parse(JSON.stringify(data.actor1Result)), + }), + ); + } + return null; + }), + } as unknown as Db, + }); + + const setHeader = jest.fn(() => { }); + const write = jest.fn(() => { }); + const end = jest.fn(() => { }); + + const context: NextPageContext = { + req: { + url: data.actor1OutboxUrl.toString().split('https://test.com')[1], + headers: { + accept: 'text/html', + }, + }, + res: { + setHeader, + write, + end, + }, + }; + const result = await getServerSideProps(context, databaseService); + expect(result.props).toStrictEqual({ + entity: JSON.parse(JSON.stringify(data.actor1Outbox)), + }); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/outbox/get_json.ts b/packages/activitypub-core/__tests__/endpoints/outbox/get_json.ts new file mode 100644 index 00000000..2748f489 --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/outbox/get_json.ts @@ -0,0 +1,100 @@ +jest.mock('../../../src/utilities/streamToString', () => { + return { + streamToString: function streamToString(req) { + return req.body; + }, + }; +}); + +import { mockDatabaseService } from '../../DatabaseService/mockDatabaseService'; +import { Db } from 'mongodb'; +import { getServerSideProps } from '../../../src/endpoints/outbox'; +import { NextPageContext } from 'next'; +import { + ACTIVITYSTREAMS_CONTENT_TYPE, + ACTIVITYSTREAMS_CONTEXT, + CONTENT_TYPE_HEADER, +} from '../../../src/globals'; +import * as data from '../../data'; + +describe('Endpoints', () => { + describe('Actor Outbox', () => { + it('GET application/json', async () => { + const replaceOne = jest.fn(async (object) => { + return true; + }); + + const updateOne = jest.fn(async (object) => { + return true; + }); + + const databaseService = mockDatabaseService({ + db: { + replaceOne, + updateOne, + findOne: jest.fn(({ _id, outbox }) => { + if (_id === data.actor1Url) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1Url, + ...JSON.parse(JSON.stringify(data.actor1Result)), + }), + ); + } + if (_id === data.actor1InboxUrl) { + return { + id: data.actor1InboxUrl, + ...JSON.parse(JSON.stringify(data.actor1Inbox)), + }; + } + if (_id === data.actor1OutboxUrl) { + return { + id: data.actor1OutboxUrl, + ...JSON.parse(JSON.stringify(data.actor1Outbox)), + }; + } + if (outbox === data.actor1OutboxUrl) { + return JSON.parse( + JSON.stringify({ + _id: data.actor1Url, + ...JSON.parse(JSON.stringify(data.actor1Result)), + }), + ); + } + return null; + }), + } as unknown as Db, + }); + + const setHeader = jest.fn(() => { }); + const write = jest.fn(() => { }); + const end = jest.fn(() => { }); + + const context: NextPageContext = { + req: { + url: data.actor1OutboxUrl.toString().split('https://test.com')[1], + headers: { + accept: ACTIVITYSTREAMS_CONTENT_TYPE, + }, + }, + res: { + setHeader, + write, + end, + }, + }; + await getServerSideProps(context, databaseService); + expect(setHeader).toBeCalledWith( + CONTENT_TYPE_HEADER, + ACTIVITYSTREAMS_CONTENT_TYPE, + ); + expect(write).toBeCalledWith( + JSON.stringify({ + '@context': ACTIVITYSTREAMS_CONTEXT, + ...data.actor1Outbox, + }), + ); + expect(end).toBeCalledTimes(1); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/outbox/index.ts b/packages/activitypub-core/__tests__/endpoints/outbox/index.ts new file mode 100644 index 00000000..76a63503 --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/outbox/index.ts @@ -0,0 +1,269 @@ +import { ACTIVITYSTREAMS_CONTEXT } from '../../../src/globals'; +import { AP } from 'activitypub-core-types'; +import * as data from '../../data'; +import { outboxHandler } from '../box'; + +describe('Endpoints', () => { + describe('Actor Outbox', () => { + it('Accepts Activity Objects (outbox:accepts-activities)', async () => { + const activity: AP.Activity = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + type: 'Arrive', + actor: new URL(data.actor1Url), + location: { + type: 'Place', + name: 'Disney World', + }, + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: create', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Create', + actor: new URL(data.actor1Url), + object: { + type: 'Note', + content: 'Hello world', + }, + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(4); // activity, created object, object likes, object shares + + expect(end).toBeCalledTimes(1); + }); + + it('Rejects POST: create and no object', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Create', + }; + + const { updateOne, replaceOne, write, end } = await outboxHandler( + activity, + ); + + expect(write).toBeCalledWith('Bad request'); + + expect(updateOne).toBeCalledTimes(0); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(0); // activity, created object, object likes, object shares + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts non-Activity Objects, and converts to Create Activities (`outbox:accepts-non-activity-objects`) *MUST*', async () => { + const object: AP.Note = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Note', + summary: 'Hello world', + }; + + const { updateOne, replaceOne, end } = await outboxHandler(object); + + expect(updateOne).toBeCalledTimes(1); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(4); // activity, created object, object likes, object shares + + expect(end).toBeCalledTimes(1); + }); + + it('Server does not trust client submitted content (outbox:not-trust-submitted) SHOULD', async () => { + const activity: AP.Read = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: AP.ActivityTypes.READ, + actor: new URL(data.actor2Url), + object: { + id: new URL('https://example.org/~alice/note/23'), + type: 'Note', + attributedTo: new URL(data.actor2Url), + content: "I'm a goat", + }, + }; + + const { updateOne, replaceOne, write, end } = await outboxHandler( + activity, + ); + + expect(write).toBeCalledWith('Bad request'); + + expect(updateOne).toBeCalledTimes(0); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(0); // activity, created object, object likes, object shares + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: add', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Add', + actor: new URL(data.actor1Url), + target: new URL(data.collection1Url), + object: new URL(data.note1Url), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(2); // insert activity into outbox, insert object into collection + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Rejects POST: add with remote target', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Add', + actor: new URL(data.actor1Url), + target: new URL(data.remoteCollection1Url), + object: new URL(data.note1Url), + }; + + const { updateOne, replaceOne, write, end } = await outboxHandler( + activity, + ); + + expect(write).toBeCalledWith('Bad request'); + expect(updateOne).toBeCalledTimes(0); // insert activity into outbox, insert object into collection + expect(replaceOne).toBeCalledTimes(0); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: announce', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Announce', + actor: new URL(data.actor1Url), + object: new URL(data.note2Url), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(3); // insert activity into outbox, insert object into shares collection. insert object into shared collection + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: delete', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Delete', + actor: new URL(data.actor1Url), + object: new URL(data.note1Url), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(2); // activity, tombstone + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: like', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Like', + actor: new URL(data.actor1Url), + object: new URL(data.note2Url), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(3); // insert activity into outbox, insert object into likes collection. insert object into liked collection + expect(replaceOne).toBeCalledTimes(1); // activity + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: remove', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Remove', + actor: new URL(data.actor1Url), + target: new URL(data.collection2Url), + object: new URL(data.note1Url), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(2); // insert activity into outbox, remove object from collection + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Rejects POST: remove with remote target', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Remove', + actor: new URL(data.actor1Url), + target: new URL(data.remoteCollection1Url), + object: new URL(data.note1Url), + }; + + const { updateOne, replaceOne, write, end } = await outboxHandler( + activity, + ); + + expect(write).toBeCalledWith('Bad request'); + expect(updateOne).toBeCalledTimes(0); // insert activity into outbox, insert object into collection + expect(replaceOne).toBeCalledTimes(0); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: update', async () => { + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Update', + actor: new URL(data.actor1Url), + object: { + ...data.note1, + content: 'Goodbye!', + }, + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(2); // activity, updated object + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts JSON-LD', async () => { + const activity = { + '@context': { + as: ACTIVITYSTREAMS_CONTEXT, + }, + '@type': 'as:Arrive', + 'as:actor': [ + { + '@id': new URL(data.actor1Url), + }, + ], + 'as:location': { + '@type': 'Place', + 'as:name': 'Disney World', + }, + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/outbox/undo.ts b/packages/activitypub-core/__tests__/endpoints/outbox/undo.ts new file mode 100644 index 00000000..196c9064 --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/outbox/undo.ts @@ -0,0 +1,88 @@ +import { AP } from 'activitypub-core-types'; +import * as data from '../../data'; +import { ACTIVITYSTREAMS_CONTEXT } from '../../../src/globals'; +import { outboxHandler } from '../box'; + +describe('Endpoints', () => { + describe('Actor Outbox', () => { + it('Accepts POST: undo add', async () => { + const activity: AP.Undo = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Undo', + actor: new URL(data.actor1Url), + object: new URL(data.originalAddActivityId), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(2); // insert activity into outbox, remove object + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: undo remove', async () => { + const activity: AP.Undo = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Undo', + actor: new URL(data.actor1Url), + object: new URL(data.originalRemoveActivityId), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(2); // insert activity into outbox, add object + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: undo like', async () => { + const activity: AP.Undo = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Undo', + actor: new URL(data.actor1Url), + object: new URL(data.originalLikeActivityId), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(3); // insert activity into outbox, remove from likes, remove from liked + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: undo announce', async () => { + const activity: AP.Undo = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Undo', + actor: new URL(data.actor1Url), + object: new URL(data.originalAnnounceActivityId), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(3); // insert activity into outbox, remove from shares, remove from shared + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts POST: undo create', async () => { + const activity: AP.Undo = { + '@context': ACTIVITYSTREAMS_CONTEXT, + type: 'Undo', + actor: new URL(data.actor1Url), + object: new URL(data.originalCreateActivityId), + }; + + const { updateOne, replaceOne, end } = await outboxHandler(activity); + + expect(updateOne).toBeCalledTimes(1); // insert activity into outbox + expect(replaceOne).toBeCalledTimes(2); // activity, tombstone + + expect(end).toBeCalledTimes(1); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/endpoints/sharedInbox/index.ts b/packages/activitypub-core/__tests__/endpoints/sharedInbox/index.ts new file mode 100644 index 00000000..dd84bfa8 --- /dev/null +++ b/packages/activitypub-core/__tests__/endpoints/sharedInbox/index.ts @@ -0,0 +1,165 @@ +import { ACTIVITYSTREAMS_CONTEXT } from '../../../src/globals'; +import { AP } from 'activitypub-core-types'; +import * as data from '../../data'; +import { sharedInboxPostHandler } from '../box'; + +describe('Endpoints', () => { + describe('Actor Inbox', () => { + it('Accepts Activity Objects', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Activity = { + '@context': ACTIVITYSTREAMS_CONTEXT, + id: new URL(activityId), + url: new URL(activityId), + to: [new URL(data.actor4Url), new URL(data.actor5Url)], + type: 'Arrive', + actor: new URL(data.actor2Url), + location: { + type: 'Place', + name: 'Disney World', + }, + }; + + const { updateOne, replaceOne, end } = await sharedInboxPostHandler( + activity, + ); + + expect(updateOne).toBeCalledTimes(2); // insert activity into 2 inboxes + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts announce activity (increments shares)', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Announce = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Announce', + to: [new URL(data.actor4Url), new URL(data.actor5Url)], + actor: new URL(data.actor2Url), + object: new URL(data.note2Url), + }; + + const { updateOne, replaceOne, end } = await sharedInboxPostHandler( + activity, + ); + + expect(updateOne).toBeCalledTimes(3); // insert activity into both inboxes, insert Share into Shares + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts like activity (increments likes)', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Like = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Like', + to: [new URL(data.actor4Url), new URL(data.actor5Url)], + actor: new URL(data.actor2Url), + object: new URL(data.note2Url), + }; + + const { updateOne, replaceOne, end } = await sharedInboxPostHandler( + activity, + ); + + expect(updateOne).toBeCalledTimes(3); // insert activity into both inboxes, insert Like into Likes + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts Follow request from another Actor (follows back automatically)', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Follow = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Follow', + actor: new URL(data.actor2Url), + to: [new URL(data.actor4Url), new URL(data.actor5Url)], + object: new URL(data.actor1Url), + }; + + const { updateOne, replaceOne, signAndSendToForeignActorInbox, end } = + await sharedInboxPostHandler(activity); + + expect(updateOne).toBeCalledTimes(4); // insert activity into both inboxes, insert follower, insert activity into outbox + expect(replaceOne).toBeCalledTimes(2); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(1); // auto-generated response + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts accept activity', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity: AP.Accept = { + '@context': new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activityId), + url: new URL(activityId), + type: 'Accept', + actor: new URL(data.actor2Url), + to: [new URL(data.actor4Url), new URL(data.actor5Url)], + object: new URL(data.originalFollowActivityId), + }; + + const { updateOne, replaceOne, end } = await sharedInboxPostHandler( + activity, + ); + + expect(updateOne).toBeCalledTimes(4); // insert activity into both inboxes, insert follower, insert followee + expect(replaceOne).toBeCalledTimes(1); // activity + + expect(end).toBeCalledTimes(1); + }); + + it('Accepts JSON-LD', async () => { + const activityId = 'https://test.com/activity/~123'; + const activity = { + '@context': { + as: new URL(ACTIVITYSTREAMS_CONTEXT), + }, + '@id': new URL(activityId), + '@type': ['as:Arrive'], + 'as:url': [ + { + '@id': new URL(activityId), + }, + ], + 'as:actor': [ + { + '@id': new URL(data.actor2Url), + }, + ], + 'as:to': [ + { + '@id': new URL(data.actor4Url), + }, + { + '@id': new URL(data.actor5Url), + }, + ], + 'as:location': [ + { + '@type': 'as:Place', + 'as:name': 'Disney World', + }, + ], + }; + + const { updateOne, replaceOne, end, signAndSendToForeignActorInbox } = + await sharedInboxPostHandler(activity); + + expect(updateOne).toBeCalledTimes(2); // insert activity into both inboxes + expect(replaceOne).toBeCalledTimes(1); // activity + expect(signAndSendToForeignActorInbox).toBeCalledTimes(0); // no delivery. + + expect(end).toBeCalledTimes(1); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/utilities/compressEntity.ts b/packages/activitypub-core/__tests__/utilities/compressEntity.ts new file mode 100644 index 00000000..91f8b1d4 --- /dev/null +++ b/packages/activitypub-core/__tests__/utilities/compressEntity.ts @@ -0,0 +1,46 @@ +import { AP } from 'activitypub-core-types'; +import { compressEntity } from '../../src/utilities/compressEntity'; +import { ACTIVITYSTREAMS_CONTEXT } from '../../src/globals'; + +describe('Utilities', () => { + describe('compressEntity', () => { + const actor1Url = `https://test.com/actor/123`; + const actor1Result: AP.Person = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(actor1Url), + url: new URL(actor1Url), + type: 'Person', + inbox: new URL(`${actor1Url}/inbox`), + outbox: new URL(`${actor1Url}/outbox`), + updated: new Date('2022-01-01'), + }; + + const object1Url = `https://test.com/actor/123`; + const object1Result: AP.Note = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(object1Url), + url: new URL(object1Url), + type: 'Note', + content: 'Test2', + }; + const activity1Url = 'https://test.com/activity/456'; + const activity1Result: AP.Create = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(activity1Url), + url: new URL(activity1Url), + type: 'Create', + actor: new URL(actor1Url), + object: new URL(object1Url), + }; + + it('compresses', async () => { + expect( + compressEntity({ + ...activity1Result, + actor: actor1Result, + object: object1Result, + }), + ).toStrictEqual(activity1Result); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/utilities/convertStringsToUrls.ts b/packages/activitypub-core/__tests__/utilities/convertStringsToUrls.ts new file mode 100644 index 00000000..7f67b846 --- /dev/null +++ b/packages/activitypub-core/__tests__/utilities/convertStringsToUrls.ts @@ -0,0 +1,40 @@ +import { ACTIVITYSTREAMS_CONTEXT } from '../../src/globals'; +import { AP } from 'activitypub-core-types'; +import { convertStringsToUrls } from '../../src/utilities/convertStringsToUrls'; + +describe('utilities', () => { + describe('convertStringsToUrls', () => { + const date = new Date('2021-01-01'); + const collection1Url = 'https://test.com/activity/123'; + const item1Url = 'https://test.com/activity/456'; + const item2Url = 'https://test.com/activity/789'; + const collection1Result: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(collection1Url), + url: new URL(collection1Url), + type: 'Collection', + totalItems: 1, + items: [ + new URL(item1Url), + new URL(item2Url), + ], + published: date, + }; + const collection1 = { + "@context": ACTIVITYSTREAMS_CONTEXT, + id: collection1Url, + url: collection1Url, + type: 'Collection', + totalItems: 1, + items: [ + item1Url, + item2Url, + ], + published: date.toISOString(), + }; + it('converts strings to URLS', async () => { + const result = convertStringsToUrls(collection1); + expect(result).toStrictEqual(collection1Result); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/utilities/convertUrlsToStrings.ts b/packages/activitypub-core/__tests__/utilities/convertUrlsToStrings.ts new file mode 100644 index 00000000..525eb663 --- /dev/null +++ b/packages/activitypub-core/__tests__/utilities/convertUrlsToStrings.ts @@ -0,0 +1,40 @@ +import { ACTIVITYSTREAMS_CONTEXT } from '../../src/globals'; +import { AP } from 'activitypub-core-types'; +import { convertUrlsToStrings } from '../../src/utilities/convertUrlsToStrings'; + +describe('utilities', () => { + describe('convertUrlsToStrings', () => { + const date = new Date('2021-01-01'); + const collection1Url = 'https://test.com/activity/123'; + const item1Url = 'https://test.com/activity/456'; + const item2Url = 'https://test.com/activity/789'; + const collection1: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(collection1Url), + url: new URL(collection1Url), + type: 'Collection', + totalItems: 1, + items: [ + new URL(item1Url), + new URL(item2Url), + ], + published: date, + }; + const collection1Result = { + "@context": ACTIVITYSTREAMS_CONTEXT, + id: collection1Url, + url: collection1Url, + type: 'Collection', + totalItems: 1, + items: [ + item1Url, + item2Url, + ], + published: date.toISOString(), + }; + it('converts', async () => { + const result = convertUrlsToStrings(collection1); + expect(result).toStrictEqual(collection1Result); + }); + }); +}); diff --git a/packages/activitypub-core/__tests__/utilities/getId.ts b/packages/activitypub-core/__tests__/utilities/getId.ts new file mode 100644 index 00000000..578a95aa --- /dev/null +++ b/packages/activitypub-core/__tests__/utilities/getId.ts @@ -0,0 +1,30 @@ +import { ACTIVITYSTREAMS_CONTEXT } from '../../src/globals'; +import { AP } from 'activitypub-core-types'; +import { getId } from '../../src/utilities/getId'; + +describe('utilities', () => { + describe('getId', () => { + const collection1Url = 'https://test.com/activity/123'; + const collection1Result: AP.Collection = { + "@context": new URL(ACTIVITYSTREAMS_CONTEXT), + id: new URL(collection1Url), + url: new URL(collection1Url), + type: 'Collection', + totalItems: 1, + items: [ + new URL('https://test.com/activity/456'), + new URL('https://test.com/activity/789'), + ], + }; + + it('gets an ID when provided an ID', async () => { + const result = getId(new URL(collection1Url)); + expect(result).toStrictEqual(new URL(collection1Url)); + }); + + it('gets an ID when provided an Entity', async () => { + const result = getId(collection1Result); + expect(result).toStrictEqual(new URL(collection1Url)); + }); + }); +}); diff --git a/packages/activitypub-core/jest-setup.ts b/packages/activitypub-core/jest-setup.ts new file mode 100644 index 00000000..27ef551a --- /dev/null +++ b/packages/activitypub-core/jest-setup.ts @@ -0,0 +1,5 @@ +import * as dotenv from 'dotenv'; // see https://github.com/motdotla/dotenv#how-do-i-use-dotenv-with-import + +export default function () { + dotenv.config(); +} diff --git a/packages/activitypub-core/jest.config.ts b/packages/activitypub-core/jest.config.ts new file mode 100644 index 00000000..06360eef --- /dev/null +++ b/packages/activitypub-core/jest.config.ts @@ -0,0 +1,17 @@ +import type { JestConfigWithTsJest } from 'ts-jest'; + +const jestConfig: JestConfigWithTsJest = { + globalSetup: './jest-setup.ts', + transform: { + // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest` + // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest` + '^.+\\.tsx?$': [ + 'ts-jest', + { + isolatedModules: true, + }, + ], + }, +}; + +export default jestConfig; diff --git a/packages/activitypub-core/lib/DatabaseService/expandCollection.d.ts b/packages/activitypub-core/lib/DatabaseService/expandCollection.d.ts index 3ccffc82..d76f6f90 100644 --- a/packages/activitypub-core/lib/DatabaseService/expandCollection.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/expandCollection.d.ts @@ -1,3 +1,3 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function expandCollection(this: DatabaseService, collection: AP.EitherCollectionReference): Promise; diff --git a/packages/activitypub-core/lib/DatabaseService/expandCollection.js b/packages/activitypub-core/lib/DatabaseService/expandCollection.js index 02228cd0..5066cab8 100644 --- a/packages/activitypub-core/lib/DatabaseService/expandCollection.js +++ b/packages/activitypub-core/lib/DatabaseService/expandCollection.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.expandCollection = void 0; -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const getId_1 = require("../utilities/getId"); async function expandCollection(collection) { const id = (0, getId_1.getId)(collection); @@ -12,21 +12,21 @@ async function expandCollection(collection) { if (!foundThing) { return null; } - if (foundThing.type !== src_1.AP.CollectionTypes.COLLECTION && - foundThing.type !== src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + if (foundThing.type !== activitypub_core_types_1.AP.CollectionTypes.COLLECTION && + foundThing.type !== activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { return null; } const items = await this.getCollectionItems(foundThing); if (!items) { return foundThing; } - if (foundThing.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + if (foundThing.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { return { ...foundThing, orderedItems: items, }; } - if (foundThing.type === src_1.AP.CollectionTypes.COLLECTION) { + if (foundThing.type === activitypub_core_types_1.AP.CollectionTypes.COLLECTION) { return { ...foundThing, items, diff --git a/packages/activitypub-core/lib/DatabaseService/expandCollection.js.map b/packages/activitypub-core/lib/DatabaseService/expandCollection.js.map index e055780d..c1efb8cb 100644 --- a/packages/activitypub-core/lib/DatabaseService/expandCollection.js.map +++ b/packages/activitypub-core/lib/DatabaseService/expandCollection.js.map @@ -1 +1 @@ -{"version":3,"file":"expandCollection.js","sourceRoot":"","sources":["../../src/DatabaseService/expandCollection.ts"],"names":[],"mappings":";;;AACA,oDAAgD;AAChD,8CAA2C;AAEpC,KAAK,UAAU,gBAAgB,CAEpC,UAAwC;IAExC,MAAM,EAAE,GAAG,IAAA,aAAK,EAAC,UAAU,CAAC,CAAC;IAE7B,IAAI,CAAC,EAAE,EAAE;QACP,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAE5C,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,IAAI,CAAC;KACb;IAED,IACE,UAAU,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,UAAU;QACjD,UAAU,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,kBAAkB,EACzD;QACA,OAAO,IAAI,CAAC;KACb;IAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAExD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,UAAU,CAAC;KACnB;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,kBAAkB,EAAE;QAC7D,OAAO;YACL,GAAG,UAAU;YACb,YAAY,EAAE,KAAK;SACpB,CAAC;KACH;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,UAAU,EAAE;QACrD,OAAO;YACL,GAAG,UAAU;YACb,KAAK;SACN,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA5CD,4CA4CC"} \ No newline at end of file +{"version":3,"file":"expandCollection.js","sourceRoot":"","sources":["../../src/DatabaseService/expandCollection.ts"],"names":[],"mappings":";;;AACA,mEAA4C;AAC5C,8CAA2C;AAEpC,KAAK,UAAU,gBAAgB,CAEpC,UAAwC;IAExC,MAAM,EAAE,GAAG,IAAA,aAAK,EAAC,UAAU,CAAC,CAAC;IAE7B,IAAI,CAAC,EAAE,EAAE;QACP,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAE5C,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,IAAI,CAAC;KACb;IAED,IACE,UAAU,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,UAAU;QACjD,UAAU,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,kBAAkB,EACzD;QACA,OAAO,IAAI,CAAC;KACb;IAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAExD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,UAAU,CAAC;KACnB;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,kBAAkB,EAAE;QAC7D,OAAO;YACL,GAAG,UAAU;YACb,YAAY,EAAE,KAAK;SACpB,CAAC;KACH;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,UAAU,EAAE;QACrD,OAAO;YACL,GAAG,UAAU;YACb,KAAK;SACN,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA5CD,4CA4CC"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/DatabaseService/expandEntity.d.ts b/packages/activitypub-core/lib/DatabaseService/expandEntity.d.ts index 5cb03606..789d9025 100644 --- a/packages/activitypub-core/lib/DatabaseService/expandEntity.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/expandEntity.d.ts @@ -1,3 +1,3 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function expandEntity(this: DatabaseService, originalEntity: AP.Entity): Promise; diff --git a/packages/activitypub-core/lib/DatabaseService/fetchEntityById.d.ts b/packages/activitypub-core/lib/DatabaseService/fetchEntityById.d.ts index 4b376533..68e664ed 100644 --- a/packages/activitypub-core/lib/DatabaseService/fetchEntityById.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/fetchEntityById.d.ts @@ -1,4 +1,4 @@ /// import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function fetchEntityById(this: DatabaseService, id: URL): Promise; diff --git a/packages/activitypub-core/lib/DatabaseService/findAll.d.ts b/packages/activitypub-core/lib/DatabaseService/findAll.d.ts index 51281ae6..d67286ab 100644 --- a/packages/activitypub-core/lib/DatabaseService/findAll.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/findAll.d.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function findAll(this: DatabaseService, collection: string, matchingObject: { [key: string]: unknown; }): Promise; diff --git a/packages/activitypub-core/lib/DatabaseService/findEntityById.d.ts b/packages/activitypub-core/lib/DatabaseService/findEntityById.d.ts index ead0132c..2c58fde4 100644 --- a/packages/activitypub-core/lib/DatabaseService/findEntityById.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/findEntityById.d.ts @@ -1,4 +1,4 @@ /// import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function findEntityById(this: DatabaseService, id: URL): Promise; diff --git a/packages/activitypub-core/lib/DatabaseService/findOne.d.ts b/packages/activitypub-core/lib/DatabaseService/findOne.d.ts index c88e68a6..66c1f100 100644 --- a/packages/activitypub-core/lib/DatabaseService/findOne.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/findOne.d.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function findOne(this: DatabaseService, collection: string, matchingObject: { [key: string]: unknown; }): Promise; diff --git a/packages/activitypub-core/lib/DatabaseService/findOne.js b/packages/activitypub-core/lib/DatabaseService/findOne.js index 17416669..5f846de6 100644 --- a/packages/activitypub-core/lib/DatabaseService/findOne.js +++ b/packages/activitypub-core/lib/DatabaseService/findOne.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.findOne = void 0; -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const convertStringsToUrls_1 = require("../utilities/convertStringsToUrls"); async function findOne(collection, matchingObject) { const value = await this.db.collection(collection).findOne(matchingObject); @@ -14,7 +14,7 @@ async function findOne(collection, matchingObject) { ...foundEntity, type: foundEntity.type, }; - for (const type of Object.values(src_1.AP.AllTypes)) { + for (const type of Object.values(activitypub_core_types_1.AP.AllTypes)) { if (type === entityWithType.type) { return entityWithType; } diff --git a/packages/activitypub-core/lib/DatabaseService/findOne.js.map b/packages/activitypub-core/lib/DatabaseService/findOne.js.map index 098f38dd..84f08904 100644 --- a/packages/activitypub-core/lib/DatabaseService/findOne.js.map +++ b/packages/activitypub-core/lib/DatabaseService/findOne.js.map @@ -1 +1 @@ -{"version":3,"file":"findOne.js","sourceRoot":"","sources":["../../src/DatabaseService/findOne.ts"],"names":[],"mappings":";;;AACA,oDAAgD;AAChD,4EAAyE;AAElE,KAAK,UAAU,OAAO,CAE3B,UAAkB,EAClB,cAA0C;IAE1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAE3E,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,OAAQ,KAA+B,CAAC,GAAG,CAAC;IAE5C,MAAM,WAAW,GAAG,IAAA,2CAAoB,EAAC,KAAK,CAAc,CAAC;IAE7D,MAAM,cAAc,GAGhB;QACF,GAAG,WAAW;QACd,IAAI,EAAE,WAAW,CAAC,IAAoD;KACvE,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,QAAQ,CAAC,EAAE;QAC7C,IAAI,IAAI,KAAK,cAAc,CAAC,IAAI,EAAE;YAChC,OAAO,cAA2B,CAAC;SACpC;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA9BD,0BA8BC"} \ No newline at end of file +{"version":3,"file":"findOne.js","sourceRoot":"","sources":["../../src/DatabaseService/findOne.ts"],"names":[],"mappings":";;;AACA,mEAA4C;AAC5C,4EAAyE;AAElE,KAAK,UAAU,OAAO,CAE3B,UAAkB,EAClB,cAA0C;IAE1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAE3E,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,OAAQ,KAA+B,CAAC,GAAG,CAAC;IAE5C,MAAM,WAAW,GAAG,IAAA,2CAAoB,EAAC,KAAK,CAAc,CAAC;IAE7D,MAAM,cAAc,GAGhB;QACF,GAAG,WAAW;QACd,IAAI,EAAE,WAAW,CAAC,IAAoD;KACvE,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,QAAQ,CAAC,EAAE;QAC7C,IAAI,IAAI,KAAK,cAAc,CAAC,IAAI,EAAE;YAChC,OAAO,cAA2B,CAAC;SACpC;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA9BD,0BA8BC"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/DatabaseService/getActorByToken.d.ts b/packages/activitypub-core/lib/DatabaseService/getActorByToken.d.ts index 92bdc387..8ddd7cb6 100644 --- a/packages/activitypub-core/lib/DatabaseService/getActorByToken.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/getActorByToken.d.ts @@ -1,4 +1,4 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { ServiceAccount } from 'firebase-admin'; export declare function getActorByToken(this: DatabaseService, token: string, credentials: ServiceAccount): Promise; diff --git a/packages/activitypub-core/lib/DatabaseService/getCollectionItems.d.ts b/packages/activitypub-core/lib/DatabaseService/getCollectionItems.d.ts index 5ef3d0b1..caab34e8 100644 --- a/packages/activitypub-core/lib/DatabaseService/getCollectionItems.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/getCollectionItems.d.ts @@ -1,4 +1,4 @@ /// import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function getCollectionItems(this: DatabaseService, entity: URL | AP.Collection | AP.OrderedCollection): Promise; diff --git a/packages/activitypub-core/lib/DatabaseService/getCollectionItems.js b/packages/activitypub-core/lib/DatabaseService/getCollectionItems.js index d3e55973..80ec429e 100644 --- a/packages/activitypub-core/lib/DatabaseService/getCollectionItems.js +++ b/packages/activitypub-core/lib/DatabaseService/getCollectionItems.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.getCollectionItems = void 0; -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const getId_1 = require("../utilities/getId"); async function getCollectionItems(entity) { const id = (0, getId_1.getId)(entity); @@ -12,15 +12,15 @@ async function getCollectionItems(entity) { if (!collection) { return []; } - if (collection.type !== src_1.AP.CollectionTypes.COLLECTION && - collection.type !== src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + if (collection.type !== activitypub_core_types_1.AP.CollectionTypes.COLLECTION && + collection.type !== activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { return []; } if (!(('items' in collection && Array.isArray(collection.items)) || ('orderedItems' in collection && Array.isArray(collection.orderedItems)))) { return []; } - const collectionItems = collection.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION + const collectionItems = collection.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION ? collection.orderedItems : collection.items; if (!Array.isArray(collectionItems)) { @@ -31,7 +31,7 @@ async function getCollectionItems(entity) { if (item instanceof URL) { const foundEntity = await this.queryById(item); result.push(foundEntity ? await this.expandEntity(foundEntity) : { - type: src_1.AP.CoreObjectTypes.TOMBSTONE, + type: activitypub_core_types_1.AP.CoreObjectTypes.TOMBSTONE, content: 'Not found', }); } diff --git a/packages/activitypub-core/lib/DatabaseService/getCollectionItems.js.map b/packages/activitypub-core/lib/DatabaseService/getCollectionItems.js.map index db60d390..fe253238 100644 --- a/packages/activitypub-core/lib/DatabaseService/getCollectionItems.js.map +++ b/packages/activitypub-core/lib/DatabaseService/getCollectionItems.js.map @@ -1 +1 @@ -{"version":3,"file":"getCollectionItems.js","sourceRoot":"","sources":["../../src/DatabaseService/getCollectionItems.ts"],"names":[],"mappings":";;;AACA,oDAAgD;AAChD,8CAA2C;AAEpC,KAAK,UAAU,kBAAkB,CAEtC,MAAkD;IAElD,MAAM,EAAE,GAAG,IAAA,aAAK,EAAC,MAAM,CAAC,CAAC;IAEzB,IAAI,CAAC,EAAE,EAAE;QACP,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAE5C,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,EAAE,CAAC;KACX;IAED,IACE,UAAU,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,UAAU;QACjD,UAAU,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,kBAAkB,EACzD;QACA,OAAO,EAAE,CAAC;KACX;IAED,IACE,CAAC,CACC,CAAC,OAAO,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1D,CAAC,cAAc,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CACzE,EACD;QACA,OAAO,EAAE,CAAC;KACX;IAED,MAAM,eAAe,GACnB,UAAU,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,kBAAkB;QACvD,CAAC,CAAC,UAAU,CAAC,YAAY;QACzB,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC;IAEvB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QACnC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,MAAM,GAAyB,EAAE,CAAC;IAExC,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE;QAClC,IAAI,IAAI,YAAY,GAAG,EAAE;YACvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAE/C,MAAM,CAAC,IAAI,CACT,WAAW,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACnD,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,SAAS;gBAClC,OAAO,EAAE,WAAW;aACrB,CACF,CAAC;SAEH;aAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,YAAY,GAAG,EAAE;YACzD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAElD,MAAM,CAAC,IAAI,CACT,WAAW,IAAI,IAAI,CACpB,CAAC;SACH;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAhED,gDAgEC"} \ No newline at end of file +{"version":3,"file":"getCollectionItems.js","sourceRoot":"","sources":["../../src/DatabaseService/getCollectionItems.ts"],"names":[],"mappings":";;;AACA,mEAA4C;AAC5C,8CAA2C;AAEpC,KAAK,UAAU,kBAAkB,CAEtC,MAAkD;IAElD,MAAM,EAAE,GAAG,IAAA,aAAK,EAAC,MAAM,CAAC,CAAC;IAEzB,IAAI,CAAC,EAAE,EAAE;QACP,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAE5C,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,EAAE,CAAC;KACX;IAED,IACE,UAAU,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,UAAU;QACjD,UAAU,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,kBAAkB,EACzD;QACA,OAAO,EAAE,CAAC;KACX;IAED,IACE,CAAC,CACC,CAAC,OAAO,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1D,CAAC,cAAc,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CACzE,EACD;QACA,OAAO,EAAE,CAAC;KACX;IAED,MAAM,eAAe,GACnB,UAAU,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,kBAAkB;QACvD,CAAC,CAAC,UAAU,CAAC,YAAY;QACzB,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC;IAEvB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QACnC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,MAAM,GAAyB,EAAE,CAAC;IAExC,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE;QAClC,IAAI,IAAI,YAAY,GAAG,EAAE;YACvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAE/C,MAAM,CAAC,IAAI,CACT,WAAW,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACnD,IAAI,EAAE,2BAAE,CAAC,eAAe,CAAC,SAAS;gBAClC,OAAO,EAAE,WAAW;aACrB,CACF,CAAC;SAEH;aAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,YAAY,GAAG,EAAE;YACzD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAElD,MAAM,CAAC,IAAI,CACT,WAAW,IAAI,IAAI,CACpB,CAAC;SACH;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAhED,gDAgEC"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/DatabaseService/queryById.d.ts b/packages/activitypub-core/lib/DatabaseService/queryById.d.ts index 72dc886f..03d09c66 100644 --- a/packages/activitypub-core/lib/DatabaseService/queryById.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/queryById.d.ts @@ -1,4 +1,4 @@ /// import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function queryById(this: DatabaseService, id: URL): Promise; diff --git a/packages/activitypub-core/lib/DatabaseService/saveEntity.d.ts b/packages/activitypub-core/lib/DatabaseService/saveEntity.d.ts index a0359108..9c0a19ec 100644 --- a/packages/activitypub-core/lib/DatabaseService/saveEntity.d.ts +++ b/packages/activitypub-core/lib/DatabaseService/saveEntity.d.ts @@ -1,3 +1,3 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function saveEntity(this: DatabaseService, entity: AP.Entity): Promise; diff --git a/packages/activitypub-core/lib/endpoints/entity/index.d.ts b/packages/activitypub-core/lib/endpoints/entity/index.d.ts index 768008d9..59cfca61 100644 --- a/packages/activitypub-core/lib/endpoints/entity/index.d.ts +++ b/packages/activitypub-core/lib/endpoints/entity/index.d.ts @@ -1,11 +1,11 @@ /// import { IncomingMessage, ServerResponse } from 'http'; import { DatabaseService } from '../../DatabaseService'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function entityGetHandler(request: IncomingMessage, response: ServerResponse, providedDatabaseService?: DatabaseService): Promise<{ props: {}; } | { props: { - entity: import("activitypub-core-types/src/activitypub/Core/Link").BaseLink | AP.Article | AP.Event | AP.Note | AP.Page | AP.Place | AP.Relationship | AP.Tombstone | AP.Profile | AP.Document | AP.Application | AP.Service | AP.Group | AP.Organization | AP.Person | AP.Accept | AP.Follow | AP.Delete | AP.Create | AP.Arrive | AP.Add | AP.Offer | AP.Like | AP.Leave | AP.Ignore | AP.Join | AP.Reject | AP.View | AP.Update | AP.Undo | AP.Remove | AP.Read | AP.Listen | AP.Move | AP.Travel | AP.Announce | AP.Flag | AP.Dislike | AP.Question | AP.Collection | AP.OrderedCollection | AP.CollectionPage | AP.OrderedCollectionPage | import("activitypub-core-types/src/activitypub/Core").Mention; + entity: AP.Article | AP.Event | AP.Note | AP.Page | AP.Place | AP.Relationship | AP.Tombstone | AP.Profile | AP.Document | AP.Application | AP.Service | AP.Group | AP.Organization | AP.Person | AP.Accept | AP.Follow | AP.Delete | AP.Create | AP.Arrive | AP.Add | AP.Offer | AP.Like | AP.Leave | AP.Ignore | AP.Join | AP.Reject | AP.View | AP.Update | AP.Undo | AP.Remove | AP.Read | AP.Listen | AP.Move | AP.Travel | AP.Announce | AP.Flag | AP.Dislike | AP.Question | AP.Collection | AP.OrderedCollection | AP.CollectionPage | AP.OrderedCollectionPage | import("activitypub-core-types/lib/activitypub/Core/Link").BaseLink | import("activitypub-core-types/lib/activitypub/Core").Mention; }; }>; diff --git a/packages/activitypub-core/lib/endpoints/entity/index.js b/packages/activitypub-core/lib/endpoints/entity/index.js index 840b1bfe..553c681b 100644 --- a/packages/activitypub-core/lib/endpoints/entity/index.js +++ b/packages/activitypub-core/lib/endpoints/entity/index.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.entityGetHandler = void 0; const DatabaseService_1 = require("../../DatabaseService"); -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const globals_1 = require("../../globals"); const getTypedEntity_1 = require("../../utilities/getTypedEntity"); const convertUrlsToStrings_1 = require("../../utilities/convertUrlsToStrings"); @@ -44,8 +44,8 @@ async function entityGetHandler(request, response, providedDatabaseService) { if (!entity) { return handleNotFound(); } - if (entity.type === src_1.AP.CollectionTypes.COLLECTION || - entity.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + if (entity.type === activitypub_core_types_1.AP.CollectionTypes.COLLECTION || + entity.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { const collection = await databaseService.expandCollection(entity); if (collection) { entity = collection; @@ -54,10 +54,10 @@ async function entityGetHandler(request, response, providedDatabaseService) { if ('likes' in entity && entity.likes instanceof URL) { const foundLikesCollection = await databaseService.findEntityById(entity.likes); if (foundLikesCollection && - foundLikesCollection.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + foundLikesCollection.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { const expandedLikes = await databaseService.expandCollection(foundLikesCollection); if (expandedLikes && - expandedLikes.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + expandedLikes.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { entity.likes = expandedLikes; } } @@ -65,10 +65,10 @@ async function entityGetHandler(request, response, providedDatabaseService) { if ('shares' in entity && entity.shares instanceof URL) { const foundSharesCollection = await databaseService.findEntityById(entity.shares); if (foundSharesCollection && - foundSharesCollection.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + foundSharesCollection.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { const expandedShares = await databaseService.expandCollection(foundSharesCollection); if (expandedShares && - expandedShares.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + expandedShares.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { entity.shares = expandedShares; } } diff --git a/packages/activitypub-core/lib/endpoints/entity/index.js.map b/packages/activitypub-core/lib/endpoints/entity/index.js.map index c5bad520..47360795 100644 --- a/packages/activitypub-core/lib/endpoints/entity/index.js.map +++ b/packages/activitypub-core/lib/endpoints/entity/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/endpoints/entity/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/endpoints/entity/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/endpoints/home/index.d.ts b/packages/activitypub-core/lib/endpoints/home/index.d.ts index 66da02fb..9ee85633 100644 --- a/packages/activitypub-core/lib/endpoints/home/index.d.ts +++ b/packages/activitypub-core/lib/endpoints/home/index.d.ts @@ -1,5 +1,5 @@ import { IncomingMessage } from 'http'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { ServiceAccount } from 'firebase-admin'; import type { ServerResponse } from 'http'; @@ -15,7 +15,7 @@ export declare const homeGetHandler: (req: IncomingMessage, res: ServerResponse, props?: undefined; } | { props: { - actor: import("activitypub-core-types/src/activitypub/Core/Link").BaseLink | AP.Article | AP.Event | AP.Note | AP.Page | AP.Place | AP.Relationship | AP.Tombstone | AP.Profile | AP.Document | AP.Application | AP.Service | AP.Group | AP.Organization | AP.Person | AP.Accept | AP.Follow | AP.Delete | AP.Create | AP.Arrive | AP.Add | AP.Offer | AP.Like | AP.Leave | AP.Ignore | AP.Join | AP.Reject | AP.View | AP.Update | AP.Undo | AP.Remove | AP.Read | AP.Listen | AP.Move | AP.Travel | AP.Announce | AP.Flag | AP.Dislike | AP.Question | AP.Collection | AP.OrderedCollection | AP.CollectionPage | AP.OrderedCollectionPage | import("activitypub-core-types/src/activitypub/Core").Mention; + actor: AP.Article | AP.Event | AP.Note | AP.Page | AP.Place | AP.Relationship | AP.Tombstone | AP.Profile | AP.Document | AP.Application | AP.Service | AP.Group | AP.Organization | AP.Person | AP.Accept | AP.Follow | AP.Delete | AP.Create | AP.Arrive | AP.Add | AP.Offer | AP.Like | AP.Leave | AP.Ignore | AP.Join | AP.Reject | AP.View | AP.Update | AP.Undo | AP.Remove | AP.Read | AP.Listen | AP.Move | AP.Travel | AP.Announce | AP.Flag | AP.Dislike | AP.Question | AP.Collection | AP.OrderedCollection | AP.CollectionPage | AP.OrderedCollectionPage | import("activitypub-core-types/lib/activitypub/Core/Link").BaseLink | import("activitypub-core-types/lib/activitypub/Core").Mention; }; redirect?: undefined; }>; diff --git a/packages/activitypub-core/lib/endpoints/home/index.js b/packages/activitypub-core/lib/endpoints/home/index.js index 185d8ac3..22f8efb6 100644 --- a/packages/activitypub-core/lib/endpoints/home/index.js +++ b/packages/activitypub-core/lib/endpoints/home/index.js @@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.homeGetHandler = void 0; -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const DatabaseService_1 = require("../../DatabaseService"); const convertUrlsToStrings_1 = require("../../utilities/convertUrlsToStrings"); const cookie_1 = __importDefault(require("cookie")); @@ -45,8 +45,8 @@ const homeGetHandler = async (req, res, serviceAccount, setup, providedDatabaseS if (stream instanceof URL) { const foundStream = await databaseService.findEntityById(stream); if (foundStream && - (foundStream.type === src_1.AP.CollectionTypes.COLLECTION || - foundStream.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION)) { + (foundStream.type === activitypub_core_types_1.AP.CollectionTypes.COLLECTION || + foundStream.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION)) { const expandedStream = await databaseService.expandCollection(foundStream); if (expandedStream) { streams.push(expandedStream); diff --git a/packages/activitypub-core/lib/endpoints/home/index.js.map b/packages/activitypub-core/lib/endpoints/home/index.js.map index 8c744974..13320dfc 100644 --- a/packages/activitypub-core/lib/endpoints/home/index.js.map +++ b/packages/activitypub-core/lib/endpoints/home/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/endpoints/home/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/endpoints/home/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/endpoints/user/createServerActor.js b/packages/activitypub-core/lib/endpoints/user/createServerActor.js index b056e414..8d5cad62 100644 --- a/packages/activitypub-core/lib/endpoints/user/createServerActor.js +++ b/packages/activitypub-core/lib/endpoints/user/createServerActor.js @@ -2,21 +2,21 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.createServerActor = void 0; const globals_1 = require("../../globals"); -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const generateKeyPair_1 = require("../../utilities/generateKeyPair"); async function createServerActor(databaseService) { const { publicKey: botPublicKey, privateKey: botPrivateKey } = await (0, generateKeyPair_1.generateKeyPair)(); const botInbox = { id: new URL(`${globals_1.SERVER_ACTOR_ID}/inbox`), url: new URL(`${globals_1.SERVER_ACTOR_ID}/inbox`), - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; const botOutbox = { id: new URL(`${globals_1.SERVER_ACTOR_ID}/outbox`), url: new URL(`${globals_1.SERVER_ACTOR_ID}/outbox`), - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -24,7 +24,7 @@ async function createServerActor(databaseService) { id: new URL(`${globals_1.SERVER_ACTOR_ID}/followers`), url: new URL(`${globals_1.SERVER_ACTOR_ID}/followers`), name: 'Followers', - type: src_1.AP.CollectionTypes.COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.COLLECTION, totalItems: 0, items: [], }; @@ -32,14 +32,14 @@ async function createServerActor(databaseService) { id: new URL(`${globals_1.SERVER_ACTOR_ID}/following`), url: new URL(`${globals_1.SERVER_ACTOR_ID}/following`), name: 'Following', - type: src_1.AP.CollectionTypes.COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.COLLECTION, totalItems: 0, items: [], }; const botActor = { id: new URL(globals_1.SERVER_ACTOR_ID), url: new URL(globals_1.SERVER_ACTOR_ID), - type: src_1.AP.ActorTypes.APPLICATION, + type: activitypub_core_types_1.AP.ActorTypes.APPLICATION, name: globals_1.SERVER_ACTOR_USERNAME, preferredUsername: globals_1.SERVER_ACTOR_USERNAME, inbox: botInbox, diff --git a/packages/activitypub-core/lib/endpoints/user/createServerActor.js.map b/packages/activitypub-core/lib/endpoints/user/createServerActor.js.map index 64e5e0d9..a75e9180 100644 --- a/packages/activitypub-core/lib/endpoints/user/createServerActor.js.map +++ b/packages/activitypub-core/lib/endpoints/user/createServerActor.js.map @@ -1 +1 @@ -{"version":3,"file":"createServerActor.js","sourceRoot":"","sources":["../../../src/endpoints/user/createServerActor.ts"],"names":[],"mappings":";;;AAAA,2CAIuB;AACvB,oDAAgD;AAChD,qEAAkE;AAG3D,KAAK,UAAU,iBAAiB,CAAC,eAAgC;IACtE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAe,GAAE,CAAC;IAE1B,MAAM,QAAQ,GAAyB;QACrC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,QAAQ,CAAC;QACvC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,QAAQ,CAAC;QACxC,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,SAAS,GAAyB;QACtC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,SAAS,CAAC;QACxC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,SAAS,CAAC;QACzC,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,YAAY,GAAkB;QAClC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,YAAY,CAAC;QAC3C,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,YAAY,CAAC;QAC5C,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,UAAU;QACnC,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,YAAY,GAAkB;QAClC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,YAAY,CAAC;QAC3C,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,YAAY,CAAC;QAC5C,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,UAAU;QACnC,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,QAAQ,GAAa;QACzB,EAAE,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;QAC5B,GAAG,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;QAC7B,IAAI,EAAE,QAAE,CAAC,UAAU,CAAC,WAAW;QAC/B,IAAI,EAAE,+BAAqB;QAC3B,iBAAiB,EAAE,+BAAqB;QACxC,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,YAAY;QACvB,SAAS,EAAE,YAAY;QACvB,SAAS,EAAE;YACT,WAAW,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;SACtC;QACD,SAAS,EAAE;YACT,EAAE,EAAE,GAAG,yBAAe,WAAW;YACjC,KAAK,EAAE,yBAAe;YACtB,YAAY,EAAE,YAAY;SAC3B;KACF,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC;QACpC,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC;QACpC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC;QACrC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC;QACxC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC;QACxC,eAAe,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC;QACpD,eAAe,CAAC,UAAU,CAAC,aAAa,EAAE,KAAK,EAAE,aAAa,CAAC;KAChE,CAAC,CAAC;AACL,CAAC;AAnED,8CAmEC"} \ No newline at end of file +{"version":3,"file":"createServerActor.js","sourceRoot":"","sources":["../../../src/endpoints/user/createServerActor.ts"],"names":[],"mappings":";;;AAAA,2CAIuB;AACvB,mEAA4C;AAC5C,qEAAkE;AAG3D,KAAK,UAAU,iBAAiB,CAAC,eAAgC;IACtE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAe,GAAE,CAAC;IAE1B,MAAM,QAAQ,GAAyB;QACrC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,QAAQ,CAAC;QACvC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,QAAQ,CAAC;QACxC,IAAI,EAAE,2BAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,SAAS,GAAyB;QACtC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,SAAS,CAAC;QACxC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,SAAS,CAAC;QACzC,IAAI,EAAE,2BAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,YAAY,GAAkB;QAClC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,YAAY,CAAC;QAC3C,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,YAAY,CAAC;QAC5C,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,2BAAE,CAAC,eAAe,CAAC,UAAU;QACnC,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,YAAY,GAAkB;QAClC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,YAAY,CAAC;QAC3C,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,yBAAe,YAAY,CAAC;QAC5C,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,2BAAE,CAAC,eAAe,CAAC,UAAU;QACnC,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,QAAQ,GAAa;QACzB,EAAE,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;QAC5B,GAAG,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;QAC7B,IAAI,EAAE,2BAAE,CAAC,UAAU,CAAC,WAAW;QAC/B,IAAI,EAAE,+BAAqB;QAC3B,iBAAiB,EAAE,+BAAqB;QACxC,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,YAAY;QACvB,SAAS,EAAE,YAAY;QACvB,SAAS,EAAE;YACT,WAAW,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;SACtC;QACD,SAAS,EAAE;YACT,EAAE,EAAE,GAAG,yBAAe,WAAW;YACjC,KAAK,EAAE,yBAAe;YACtB,YAAY,EAAE,YAAY;SAC3B;KACF,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC;QACpC,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC;QACpC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC;QACrC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC;QACxC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC;QACxC,eAAe,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC;QACpD,eAAe,CAAC,UAAU,CAAC,aAAa,EAAE,KAAK,EAAE,aAAa,CAAC;KAChE,CAAC,CAAC;AACL,CAAC;AAnED,8CAmEC"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/endpoints/user/createUserActor.js b/packages/activitypub-core/lib/endpoints/user/createUserActor.js index 89b27862..78ed5684 100644 --- a/packages/activitypub-core/lib/endpoints/user/createUserActor.js +++ b/packages/activitypub-core/lib/endpoints/user/createUserActor.js @@ -4,7 +4,7 @@ exports.createUserActor = void 0; const getGuid_1 = require("../../utilities/getGuid"); const generateKeyPair_1 = require("../../utilities/generateKeyPair"); const globals_1 = require("../../globals"); -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); async function createUserActor(databaseService, user) { const { publicKey, privateKey } = await (0, generateKeyPair_1.generateKeyPair)(); const id = `${globals_1.LOCAL_DOMAIN}/actor/${user.preferredUsername}`; @@ -12,7 +12,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/inbox`), url: new URL(`${id}/inbox`), name: 'Inbox', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -20,7 +20,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/outbox`), url: new URL(`${id}/outbox`), name: 'Outbox', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -28,7 +28,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/followers`), url: new URL(`${id}/followers`), name: 'Followers', - type: src_1.AP.CollectionTypes.COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.COLLECTION, totalItems: 0, items: [], }; @@ -36,7 +36,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/following`), url: new URL(`${id}/following`), name: 'Following', - type: src_1.AP.CollectionTypes.COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.COLLECTION, totalItems: 0, items: [], }; @@ -44,7 +44,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/liked`), url: new URL(`${id}/liked`), name: 'Liked', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -52,7 +52,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/shared`), url: new URL(`${id}/shared`), name: 'Shared', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -60,7 +60,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/blocked`), url: new URL(`${id}/blocked`), name: 'Blocked', - type: src_1.AP.CollectionTypes.COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.COLLECTION, totalItems: 0, items: [], }; @@ -68,7 +68,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/groups`), url: new URL(`${id}/groups`), name: 'Groups', - type: src_1.AP.CollectionTypes.COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.COLLECTION, totalItems: 0, items: [], }; @@ -76,7 +76,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/likes`), url: new URL(`${id}/likes`), name: 'Likes', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -84,7 +84,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/shares`), url: new URL(`${id}/shares`), name: 'Shares', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -92,14 +92,14 @@ async function createUserActor(databaseService, user) { id: new URL(`${id}/bookmarks`), url: new URL(`${id}/bookmarks`), name: 'Bookmarks', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; const userActor = { id: new URL(id), url: new URL(id), - type: src_1.AP.ActorTypes.PERSON, + type: activitypub_core_types_1.AP.ActorTypes.PERSON, name: user.name, preferredUsername: user.preferredUsername, inbox: userInbox, @@ -124,7 +124,7 @@ async function createUserActor(databaseService, user) { const createActorActivity = { id: new URL(createActorActivityId), url: new URL(createActorActivityId), - type: src_1.AP.ActivityTypes.CREATE, + type: activitypub_core_types_1.AP.ActivityTypes.CREATE, actor: new URL(globals_1.SERVER_ACTOR_ID), object: userActor, }; @@ -151,7 +151,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${friendsGroupId}/inbox`), url: new URL(`${friendsGroupId}/inbox`), name: 'Inbox', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -159,7 +159,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${friendsGroupId}/outbox`), url: new URL(`${friendsGroupId}/outbox`), name: 'Outbox', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -167,7 +167,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${friendsGroupId}/likes`), url: new URL(`${friendsGroupId}/likes`), name: 'Likes', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -175,7 +175,7 @@ async function createUserActor(databaseService, user) { id: new URL(`${friendsGroupId}/shares`), url: new URL(`${friendsGroupId}/shares`), name: 'Shares', - type: src_1.AP.CollectionTypes.ORDERED_COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION, totalItems: 0, orderedItems: [], }; @@ -183,14 +183,14 @@ async function createUserActor(databaseService, user) { id: new URL(`${friendsGroupId}/members`), url: new URL(`${friendsGroupId}/members`), name: 'Members', - type: src_1.AP.CollectionTypes.COLLECTION, + type: activitypub_core_types_1.AP.CollectionTypes.COLLECTION, totalItems: 0, items: [], }; const friendsGroupActor = { id: new URL(friendsGroupId), url: new URL(friendsGroupId), - type: src_1.AP.ActorTypes.GROUP, + type: activitypub_core_types_1.AP.ActorTypes.GROUP, name: 'Friends', inbox: friendsGroupInbox, outbox: friendsGroupOutbox, @@ -208,7 +208,7 @@ async function createUserActor(databaseService, user) { const createFriendsGroupActorActivity = { id: new URL(createFriendsGroupActorActivityId), url: new URL(createFriendsGroupActorActivityId), - type: src_1.AP.ActivityTypes.CREATE, + type: activitypub_core_types_1.AP.ActivityTypes.CREATE, actor: new URL(globals_1.SERVER_ACTOR_ID), object: friendsGroupActor, }; diff --git a/packages/activitypub-core/lib/endpoints/user/createUserActor.js.map b/packages/activitypub-core/lib/endpoints/user/createUserActor.js.map index e173b4ab..7df8b810 100644 --- a/packages/activitypub-core/lib/endpoints/user/createUserActor.js.map +++ b/packages/activitypub-core/lib/endpoints/user/createUserActor.js.map @@ -1 +1 @@ -{"version":3,"file":"createUserActor.js","sourceRoot":"","sources":["../../../src/endpoints/user/createUserActor.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,qEAAkE;AAClE,2CAA+E;AAE/E,oDAAgD;AAEzC,KAAK,UAAU,eAAe,CACnC,eAAgC,EAChC,IAA6E;IAE7E,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAC;IAE1D,MAAM,EAAE,GAAG,GAAG,sBAAY,UAAU,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAE7D,MAAM,SAAS,GAAyB;QACtC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC;QAC1B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC;QAC3B,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,UAAU,GAAyB;QACvC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC;QAC3B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC;QAC5B,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC;QAC9B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC;QAC/B,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,UAAU;QACnC,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC;QAC9B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC;QAC/B,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,UAAU;QACnC,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,SAAS,GAAyB;QACtC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC;QAC1B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC;QAC3B,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,UAAU,GAAyB;QACvC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC;QAC3B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC;QAC5B,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,WAAW,GAAkB;QACjC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC;QAC5B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC;QAC7B,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,UAAU;QACnC,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,UAAU,GAAkB;QAChC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC;QAC3B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC;QAC5B,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,UAAU;QACnC,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,SAAS,GAAyB;QACtC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC;QAC1B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC;QAC3B,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,UAAU,GAAyB;QACvC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC;QAC3B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC;QAC5B,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,aAAa,GAAyB;QAC1C,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC;QAC9B,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC;QAC/B,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,SAAS,GAAa;QAC1B,EAAE,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC;QACf,GAAG,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC;QAChB,IAAI,EAAE,QAAE,CAAC,UAAU,CAAC,MAAM;QAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,UAAU;QAClB,SAAS,EAAE,IAAI,IAAI,EAAE;QACrB,SAAS,EAAE,aAAa;QACxB,SAAS,EAAE,aAAa;QACxB,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,aAAa,CAAC;QAC7D,SAAS,EAAE;YACT,WAAW,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;SACtC;QACD,SAAS,EAAE;YACT,EAAE,EAAE,GAAG,EAAE,WAAW;YACpB,KAAK,EAAE,EAAE;YACT,YAAY,EAAE,SAAS;SACxB;KACF,CAAC;IAEF,MAAM,qBAAqB,GAAG,GAAG,sBAAY,aAAa,IAAA,iBAAO,GAAE,EAAE,CAAC;IAEtE,MAAM,mBAAmB,GAAc;QACrC,EAAE,EAAE,IAAI,GAAG,CAAC,qBAAqB,CAAC;QAClC,GAAG,EAAE,IAAI,GAAG,CAAC,qBAAqB,CAAC;QACnC,IAAI,EAAE,QAAE,CAAC,aAAa,CAAC,MAAM;QAC7B,KAAK,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;QAC/B,MAAM,EAAE,SAAS;KAClB,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,eAAe,CAAC,UAAU,CAAC,mBAAmB,CAAC;QAC/C,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC;QACrC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC;QACrC,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC;QACtC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC;QACrC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC;QACrC,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC;QACtC,eAAe,CAAC,UAAU,CAAC,aAAa,CAAC;QACzC,eAAe,CAAC,UAAU,CAAC,aAAa,CAAC;QACzC,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC;QACtC,eAAe,CAAC,UAAU,CAAC,WAAW,CAAC;QACvC,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC;QACtC,eAAe,CAAC,UAAU,CAAC,aAAa,CAAC;QACzC,eAAe,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC;QAC3D,eAAe,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC;QAC/D,eAAe,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC;KACzE,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,GAAG,EAAE,iBAAiB,CAAC;IAE9C,MAAM,iBAAiB,GAAyB;QAC9C,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,QAAQ,CAAC;QACtC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,QAAQ,CAAC;QACvC,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAyB;QAC/C,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,SAAS,CAAC;QACvC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,SAAS,CAAC;QACxC,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,iBAAiB,GAAyB;QAC9C,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,QAAQ,CAAC;QACtC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,QAAQ,CAAC;QACvC,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAyB;QAC/C,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,SAAS,CAAC;QACvC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,SAAS,CAAC;QACxC,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,kBAAkB;QAC3C,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,mBAAmB,GAAkB;QACzC,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,UAAU,CAAC;QACxC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,cAAc,UAAU,CAAC;QACzC,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,QAAE,CAAC,eAAe,CAAC,UAAU;QACnC,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,iBAAiB,GAAa;QAClC,EAAE,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC;QAC3B,GAAG,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC;QAC5B,IAAI,EAAE,QAAE,CAAC,UAAU,CAAC,KAAK;QACzB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE,kBAAkB;QAC1B,SAAS,EAAE,IAAI,IAAI,EAAE;QACrB,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE,kBAAkB;QAC1B,OAAO,EAAE;YACP,mBAAmB;SACpB;QACD,SAAS,EAAE;YACT,WAAW,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;SACtC;KACF,CAAC;IAEF,MAAM,iCAAiC,GAAG,GAAG,sBAAY,aAAa,IAAA,iBAAO,GAAE,EAAE,CAAC;IAElF,MAAM,+BAA+B,GAAc;QACjD,EAAE,EAAE,IAAI,GAAG,CAAC,iCAAiC,CAAC;QAC9C,GAAG,EAAE,IAAI,GAAG,CAAC,iCAAiC,CAAC;QAC/C,IAAI,EAAE,QAAE,CAAC,aAAa,CAAC,MAAM;QAC7B,KAAK,EAAE,IAAI,GAAG,CAAC,yBAAe,CAAC;QAC/B,MAAM,EAAE,iBAAiB;KAC1B,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,eAAe,CAAC,UAAU,CAAC,iBAAiB,CAAC;QAC7C,eAAe,CAAC,UAAU,CAAC,iBAAiB,CAAC;QAC7C,eAAe,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,eAAe,CAAC,UAAU,CAAC,iBAAiB,CAAC;QAC7C,eAAe,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,eAAe,CAAC,UAAU,CAAC,mBAAmB,CAAC;QAC/C,eAAe,CAAC,UAAU,CAAC,+BAA+B,CAAC;KAC5D,CAAC,CAAC;IAEH,IAAI,UAAU,CAAC,EAAE,EAAE;QACjB,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;SACnE,CAAC,CAAC;KACJ;IAED,IAAI,+BAA+B,CAAC,EAAE,IAAI,iBAAiB,CAAC,EAAE,EAAE;QAC9D,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,eAAe,CAAC,iBAAiB,CAC/B,IAAI,GAAG,CAAC,GAAG,yBAAe,SAAS,CAAC,EACpC,+BAA+B,CAAC,EAAE,CACnC;YACD,eAAe,CAAC,iBAAiB,CAC/B,iBAAiB,CAAC,EAAE,EACpB,+BAA+B,CAAC,EAAE,CACnC;SACF,CAAC,CAAC;KACJ;IAED,IAAI,mBAAmB,CAAC,EAAE,IAAI,SAAS,CAAC,EAAE,EAAE;QAC1C,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,eAAe,CAAC,iBAAiB,CAC/B,IAAI,GAAG,CAAC,GAAG,yBAAe,SAAS,CAAC,EACpC,mBAAmB,CAAC,EAAE,CACvB;YACD,eAAe,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,mBAAmB,CAAC,EAAE,CAAC;SACxE,CAAC,CAAC;KACJ;AACH,CAAC;AAlRD,0CAkRC"} \ No newline at end of file +{"version":3,"file":"createUserActor.js","sourceRoot":"","sources":["../../../src/endpoints/user/createUserActor.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/endpoints/user/index.d.ts b/packages/activitypub-core/lib/endpoints/user/index.d.ts index bd2b863d..cbb1a3c2 100644 --- a/packages/activitypub-core/lib/endpoints/user/index.d.ts +++ b/packages/activitypub-core/lib/endpoints/user/index.d.ts @@ -1,7 +1,7 @@ /// import { DatabaseService } from '../../DatabaseService'; import { ServiceAccount } from 'firebase-admin'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import type { IncomingMessage, ServerResponse } from 'http'; export declare function userPostHandler(req: IncomingMessage, res: ServerResponse, serviceAccount: ServiceAccount, setup?: (actor: AP.Entity, databaseService: DatabaseService) => Promise<{ actor: AP.Actor; diff --git a/packages/activitypub-core/lib/types/activitypub/Core/CoreObject.d.ts b/packages/activitypub-core/lib/types/activitypub/Core/CoreObject.d.ts deleted file mode 100644 index ec96b82d..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/CoreObject.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { CoreObjectTypes } from '../util/const'; -import type { BaseEntity } from './Entity'; -import type { EntityReference } from '.'; -import type { StringReferenceMap } from '../util/values'; -import type { ImageReference } from '../Extended/ExtendedObject'; -import type { LinkReference } from './Link'; -import type { CollectionReference, OrderedCollectionReference } from '../Extended/Collection'; -export interface BaseCoreObject extends BaseEntity { - type: typeof CoreObjectTypes[keyof typeof CoreObjectTypes]; - attachment?: EntityReference | EntityReference[]; - attributedTo?: EntityReference | EntityReference[]; - audience?: EntityReference | EntityReference[]; - bcc?: EntityReference | EntityReference[]; - bto?: EntityReference | EntityReference[]; - cc?: EntityReference | EntityReference[]; - content?: string; - contentMap?: StringReferenceMap; - context?: EntityReference | EntityReference[]; - duration?: string; - endTime?: Date; - generator?: EntityReference | EntityReference[]; - icon?: ImageReference | ImageReference[] | LinkReference | LinkReference[]; - image?: ImageReference | ImageReference[] | LinkReference | LinkReference[]; - inReplyTo?: EntityReference | EntityReference[]; - location?: EntityReference | EntityReference[]; - mediaType?: string; - name?: string; - nameMap?: StringReferenceMap; - preview?: EntityReference | EntityReference[]; - published?: Date; - replies?: CollectionReference; - startTime?: Date; - summary?: string; - summaryMap?: StringReferenceMap; - tag?: EntityReference | EntityReference[]; - to?: EntityReference | EntityReference[]; - updated?: Date; - url?: LinkReference | LinkReference[]; - likes?: OrderedCollectionReference; - shares?: OrderedCollectionReference; - source?: { - content?: string; - contentMap?: StringReferenceMap; - }; -} diff --git a/packages/activitypub-core/lib/types/activitypub/Core/CoreObject.js b/packages/activitypub-core/lib/types/activitypub/Core/CoreObject.js deleted file mode 100644 index 8cb9691e..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/CoreObject.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=CoreObject.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Core/CoreObject.js.map b/packages/activitypub-core/lib/types/activitypub/Core/CoreObject.js.map deleted file mode 100644 index 74498976..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/CoreObject.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"CoreObject.js","sourceRoot":"","sources":["../../../../src/types/activitypub/Core/CoreObject.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Core/Entity.d.ts b/packages/activitypub-core/lib/types/activitypub/Core/Entity.d.ts deleted file mode 100644 index 2d60b015..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/Entity.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -/// -import { AllTypes } from '../util/const'; -export declare type BaseEntity = { - '@context'?: URL | URL[] | unknown; - id?: URL | null; - type: typeof AllTypes[keyof typeof AllTypes]; -}; diff --git a/packages/activitypub-core/lib/types/activitypub/Core/Entity.js b/packages/activitypub-core/lib/types/activitypub/Core/Entity.js deleted file mode 100644 index edf04eba..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/Entity.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=Entity.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Core/Entity.js.map b/packages/activitypub-core/lib/types/activitypub/Core/Entity.js.map deleted file mode 100644 index 9c8be32d..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/Entity.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../../../src/types/activitypub/Core/Entity.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Core/Link.d.ts b/packages/activitypub-core/lib/types/activitypub/Core/Link.d.ts deleted file mode 100644 index ce2e5c91..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/Link.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -/// -import { BaseEntity } from './Entity'; -import { LinkTypes } from '../util/const'; -import { StringReferenceMap } from '../util/values'; -import { EntityReference } from '.'; -export interface BaseLink extends BaseEntity { - type: typeof LinkTypes[keyof typeof LinkTypes]; - height?: number; - href?: URL; - hrefLang?: string; - mediaType?: string; - name?: string; - nameMap?: StringReferenceMap; - preview?: EntityReference | EntityReference[]; - rel?: string | string[]; - width?: number; -} -export interface Mention extends BaseLink { - type: typeof LinkTypes.MENTION; -} -export declare type Link = BaseLink | Mention; -export declare type LinkReference = URL | Link; diff --git a/packages/activitypub-core/lib/types/activitypub/Core/Link.js b/packages/activitypub-core/lib/types/activitypub/Core/Link.js deleted file mode 100644 index 0bb6aa38..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/Link.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=Link.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Core/Link.js.map b/packages/activitypub-core/lib/types/activitypub/Core/Link.js.map deleted file mode 100644 index bd726587..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/Link.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../../../src/types/activitypub/Core/Link.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Core/index.d.ts b/packages/activitypub-core/lib/types/activitypub/Core/index.d.ts deleted file mode 100644 index d864163d..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/index.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -/// -import { Link } from './Link'; -import { ExtendedObject } from '../Extended/ExtendedObject'; -import { Actor } from '../Extended/Actor'; -import { Activity } from '../Extended/Activity'; -import { Collection, OrderedCollection } from '../Extended/Collection'; -import { CollectionPage, OrderedCollectionPage } from '../Extended/Collection'; -export type { Link, LinkReference, Mention } from './Link'; -export declare type CoreObject = ExtendedObject | Actor | Activity | Collection | OrderedCollection | CollectionPage | OrderedCollectionPage; -export declare type CoreObjectReference = URL | CoreObject; -export declare type Entity = CoreObject | Link; -export declare type EntityReference = URL | CoreObject | Link; diff --git a/packages/activitypub-core/lib/types/activitypub/Core/index.js b/packages/activitypub-core/lib/types/activitypub/Core/index.js deleted file mode 100644 index aa219d8f..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/index.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Core/index.js.map b/packages/activitypub-core/lib/types/activitypub/Core/index.js.map deleted file mode 100644 index 2c4607a9..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Core/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/activitypub/Core/index.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/Activity.d.ts b/packages/activitypub-core/lib/types/activitypub/Extended/Activity.d.ts deleted file mode 100644 index 8c872096..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/Activity.d.ts +++ /dev/null @@ -1,107 +0,0 @@ -/// -import { BaseCoreObject } from '../Core/CoreObject'; -import { ActivityTypes } from '../util/const'; -import { EntityReference } from '../Core'; -declare type BaseActivity = BaseCoreObject & { - type: typeof ActivityTypes[keyof typeof ActivityTypes]; - actor: EntityReference | EntityReference[]; - object?: EntityReference | EntityReference[]; - target?: EntityReference | EntityReference[]; - result?: EntityReference | EntityReference[]; - origin?: EntityReference | EntityReference[]; - instrument?: EntityReference | EntityReference[]; -}; -export declare type IntransitiveActivity = Omit; -export declare type TransitiveActivity = BaseActivity & { - object: EntityReference | EntityReference[]; -}; -export declare type Accept = BaseActivity & { - type: typeof ActivityTypes.ACCEPT; -}; -export declare type TentativeAccept = Accept & { - type: typeof ActivityTypes.TENTATIVE_ACCEPT; -}; -export declare type Add = BaseActivity & { - type: typeof ActivityTypes.ADD; -}; -export declare type Arrive = IntransitiveActivity & { - type: typeof ActivityTypes.ARRIVE; -}; -export declare type Create = BaseActivity & { - type: typeof ActivityTypes.CREATE; -}; -export declare type Delete = BaseActivity & { - type: typeof ActivityTypes.DELETE; -}; -export declare type Follow = BaseActivity & { - type: typeof ActivityTypes.FOLLOW; -}; -export declare type Ignore = BaseActivity & { - type: typeof ActivityTypes.IGNORE; -}; -export declare type Join = BaseActivity & { - type: typeof ActivityTypes.JOIN; -}; -export declare type Leave = BaseActivity & { - type: typeof ActivityTypes.LEAVE; -}; -export declare type Like = BaseActivity & { - type: typeof ActivityTypes.LIKE; -}; -export declare type Offer = BaseActivity & { - type: typeof ActivityTypes.OFFER; -}; -export declare type Invite = Offer & { - type: typeof ActivityTypes.INVITE; -}; -export declare type Reject = BaseActivity & { - type: typeof ActivityTypes.REJECT; -}; -export declare type TentativeReject = Reject & { - type: typeof ActivityTypes.TENTATIVE_REJECT; -}; -export declare type Remove = BaseActivity & { - type: typeof ActivityTypes.REMOVE; -}; -export declare type Undo = BaseActivity & { - type: typeof ActivityTypes.UNDO; -}; -export declare type Update = BaseActivity & { - type: typeof ActivityTypes.UPDATE; -}; -export declare type View = BaseActivity & { - type: typeof ActivityTypes.VIEW; -}; -export declare type Listen = BaseActivity & { - type: typeof ActivityTypes.LISTEN; -}; -export declare type Read = BaseActivity & { - type: typeof ActivityTypes.READ; -}; -export declare type Move = BaseActivity & { - type: typeof ActivityTypes.MOVE; -}; -export declare type Travel = IntransitiveActivity & { - type: typeof ActivityTypes.TRAVEL; -}; -export declare type Announce = BaseActivity & { - type: typeof ActivityTypes.ANNOUNCE; -}; -export declare type Block = Ignore & { - type: typeof ActivityTypes.BLOCK; -}; -export declare type Flag = BaseActivity & { - type: typeof ActivityTypes.FLAG; -}; -export declare type Dislike = BaseActivity & { - type: typeof ActivityTypes.DISLIKE; -}; -export declare type Question = IntransitiveActivity & { - type: typeof ActivityTypes.QUESTION; - oneOf: EntityReference | EntityReference[]; - anyOf: EntityReference | EntityReference[]; - closed: EntityReference | Date | boolean; -}; -export declare type Activity = Accept | Follow | Delete | Create | Arrive | Add | Offer | Like | Leave | Ignore | Join | Reject | Invite | TentativeReject | TentativeAccept | View | Update | Undo | Remove | Read | Listen | Move | Travel | Announce | Block | Flag | Dislike | Question; -export declare type ActivityReference = URL | Activity; -export {}; diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/Activity.js b/packages/activitypub-core/lib/types/activitypub/Extended/Activity.js deleted file mode 100644 index 5dcd78b2..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/Activity.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=Activity.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/Activity.js.map b/packages/activitypub-core/lib/types/activitypub/Extended/Activity.js.map deleted file mode 100644 index 1f541f8b..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/Activity.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Activity.js","sourceRoot":"","sources":["../../../../src/types/activitypub/Extended/Activity.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/Actor.d.ts b/packages/activitypub-core/lib/types/activitypub/Extended/Actor.d.ts deleted file mode 100644 index ae22d240..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/Actor.d.ts +++ /dev/null @@ -1,48 +0,0 @@ -/// -import { BaseCoreObject } from '../Core/CoreObject'; -import { ActorTypes } from '../util/const'; -import { CollectionReference, EitherCollectionReference, OrderedCollectionReference } from './Collection'; -import { StringReferenceMap } from '../util/values'; -declare type BaseActor = BaseCoreObject & { - type: typeof ActorTypes[keyof typeof ActorTypes]; - inbox: OrderedCollectionReference; - outbox: OrderedCollectionReference; - following?: CollectionReference; - followers?: CollectionReference; - liked?: EitherCollectionReference; - preferredUsername?: string; - preferredUsernameMap?: StringReferenceMap; - streams?: EitherCollectionReference[]; - endpoints?: { - [key: string]: URL | string | undefined; - proxyUrl?: URL; - oauthAuthorizationEndpoint?: string; - oauthTokenEndpoint?: string; - provideClientKey?: string; - signClientKey?: string; - sharedInbox?: URL; - }; - publicKey?: { - id: string; - owner: string; - publicKeyPem: string; - }; -}; -export declare type Application = BaseActor & { - type: typeof ActorTypes.APPLICATION; -}; -export declare type Person = BaseActor & { - type: typeof ActorTypes.PERSON; -}; -export declare type Group = BaseActor & { - type: typeof ActorTypes.GROUP; -}; -export declare type Service = BaseActor & { - type: typeof ActorTypes.SERVICE; -}; -export declare type Organization = BaseActor & { - type: typeof ActorTypes.ORGANIZATION; -}; -export declare type Actor = Application | Service | Group | Organization | Person; -export declare type ActorReference = URL | Actor; -export {}; diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/Actor.js b/packages/activitypub-core/lib/types/activitypub/Extended/Actor.js deleted file mode 100644 index 52d59458..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/Actor.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=Actor.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/Actor.js.map b/packages/activitypub-core/lib/types/activitypub/Extended/Actor.js.map deleted file mode 100644 index 36300ab0..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/Actor.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../../../../src/types/activitypub/Extended/Actor.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/Collection.d.ts b/packages/activitypub-core/lib/types/activitypub/Extended/Collection.d.ts deleted file mode 100644 index f41be646..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/Collection.d.ts +++ /dev/null @@ -1,43 +0,0 @@ -/// -import { CollectionTypes, CollectionPageTypes } from '../util/const'; -import { BaseCoreObject } from '../Core/CoreObject'; -import { EntityReference } from '../Core'; -import { Link } from '../Core/Link'; -declare type BaseCollection = BaseCoreObject & { - type: typeof CollectionTypes[keyof typeof CollectionTypes] | typeof CollectionPageTypes[keyof typeof CollectionPageTypes]; - totalItems?: number; - items?: EntityReference | EntityReference[]; - current?: URL | CollectionPage | Link; - first?: URL | CollectionPage | Link; - last?: URL | CollectionPage | Link; -}; -export declare type Collection = BaseCollection & { - type: typeof CollectionTypes.COLLECTION; -}; -export declare type OrderedCollection = BaseCollection & { - type: typeof CollectionTypes.ORDERED_COLLECTION; - orderedItems?: EntityReference | EntityReference[]; -}; -declare type BaseCollectionPage = BaseCollection & { - type: typeof CollectionPageTypes[keyof typeof CollectionPageTypes]; - current?: URL | CollectionPage | Link; - first?: URL | CollectionPage | Link; - last?: URL | CollectionPage | Link; -}; -export declare type CollectionPage = BaseCollectionPage & { - type: typeof CollectionPageTypes.COLLECTION_PAGE; -}; -export declare type OrderedCollectionPage = BaseCollectionPage & { - type: typeof CollectionPageTypes.ORDERED_COLLECTION_PAGE; - startIndex?: number; - orderedItems?: EntityReference | EntityReference[]; -}; -export declare type CollectionReference = URL | Collection; -export declare type OrderedCollectionReference = URL | OrderedCollection; -export declare type CollectionPageReference = URL | CollectionPage; -export declare type OrderedCollectionPageReference = URL | OrderedCollectionPage; -export declare type EitherCollection = Collection | OrderedCollection; -export declare type EitherCollectionPage = CollectionPage | OrderedCollectionPage; -export declare type EitherCollectionReference = URL | EitherCollection; -export declare type EitherCollectionPageReference = URL | EitherCollectionPage; -export {}; diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/Collection.js b/packages/activitypub-core/lib/types/activitypub/Extended/Collection.js deleted file mode 100644 index be5e8598..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/Collection.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=Collection.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/Collection.js.map b/packages/activitypub-core/lib/types/activitypub/Extended/Collection.js.map deleted file mode 100644 index ede13441..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/Collection.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../../src/types/activitypub/Extended/Collection.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/ExtendedObject.d.ts b/packages/activitypub-core/lib/types/activitypub/Extended/ExtendedObject.d.ts deleted file mode 100644 index 243b3897..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/ExtendedObject.d.ts +++ /dev/null @@ -1,59 +0,0 @@ -/// -import { AllTypes, ExtendedObjectTypes } from '../util/const'; -import { BaseCoreObject } from '../Core/CoreObject'; -import { EntityReference, CoreObjectReference } from '../Core'; -declare type BaseExtendedObject = BaseCoreObject & { - type: typeof ExtendedObjectTypes[keyof typeof ExtendedObjectTypes]; -}; -export declare type Tombstone = BaseExtendedObject & { - type: typeof ExtendedObjectTypes.TOMBSTONE; - formerType?: typeof AllTypes[keyof typeof AllTypes] | Array; - deleted?: Date; -}; -export declare type Relationship = BaseExtendedObject & { - type: typeof ExtendedObjectTypes.RELATIONSHIP; - subject?: EntityReference; - object?: EntityReference | EntityReference[]; - relationship?: CoreObjectReference; -}; -export declare type Article = BaseExtendedObject & { - type: typeof ExtendedObjectTypes.ARTICLE; -}; -export declare type Note = BaseExtendedObject & { - type: typeof ExtendedObjectTypes.NOTE; -}; -export declare type Page = BaseExtendedObject & { - type: typeof ExtendedObjectTypes.PAGE; -}; -export declare type Event = BaseExtendedObject & { - type: typeof ExtendedObjectTypes.EVENT; -}; -export declare type Place = BaseExtendedObject & { - type: typeof ExtendedObjectTypes.PLACE; - accuracy?: number; - altitude?: number; - latitude?: number; - longitude?: number; - radius?: number; - units?: string; -}; -export declare type Document = BaseExtendedObject & { - type: typeof ExtendedObjectTypes.DOCUMENT; -}; -export declare type Image = Document & { - type: typeof ExtendedObjectTypes.IMAGE; -}; -export declare type Audio = Document & { - type: typeof ExtendedObjectTypes.IMAGE; -}; -export declare type Video = Document & { - type: typeof ExtendedObjectTypes.IMAGE; -}; -export declare type Profile = BaseExtendedObject & { - type: typeof ExtendedObjectTypes.PROFILE; - describes?: CoreObjectReference; -}; -export declare type ExtendedObject = Article | Event | Note | Page | Place | Relationship | Tombstone | Profile | Video | Document | Audio | Image; -export declare type ExtendedObjectReference = URL | ExtendedObject; -export declare type ImageReference = URL | Image; -export {}; diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/ExtendedObject.js b/packages/activitypub-core/lib/types/activitypub/Extended/ExtendedObject.js deleted file mode 100644 index 9bd0f2b8..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/ExtendedObject.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=ExtendedObject.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/ExtendedObject.js.map b/packages/activitypub-core/lib/types/activitypub/Extended/ExtendedObject.js.map deleted file mode 100644 index 6c27405c..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/ExtendedObject.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"ExtendedObject.js","sourceRoot":"","sources":["../../../../src/types/activitypub/Extended/ExtendedObject.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/index.d.ts b/packages/activitypub-core/lib/types/activitypub/Extended/index.d.ts deleted file mode 100644 index 70c3de32..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/index.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -export type { Activity, ActivityReference, IntransitiveActivity, TransitiveActivity, Accept, Follow, Delete, Create, Arrive, Add, Offer, Like, Leave, Ignore, Join, Reject, Invite, TentativeReject, TentativeAccept, View, Update, Undo, Remove, Read, Listen, Move, Travel, Announce, Block, Flag, Dislike, Question, } from './Activity'; -export type { Actor, ActorReference, Person, Service, Group, Organization, Application, } from './Actor'; -export type { ExtendedObject, ExtendedObjectReference, Article, Event, Note, Page, Place, Relationship, Tombstone, Profile, Video, Document, Audio, Image, } from './ExtendedObject'; -export type { Collection, CollectionReference } from './Collection'; -export type { OrderedCollection, OrderedCollectionReference, } from './Collection'; -export type { CollectionPage, CollectionPageReference } from './Collection'; -export type { OrderedCollectionPage, OrderedCollectionPageReference, } from './Collection'; -export type { EitherCollection } from './Collection'; -export type { EitherCollectionReference } from './Collection'; -export type { EitherCollectionPage } from './Collection'; -export type { EitherCollectionPageReference } from './Collection'; diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/index.js b/packages/activitypub-core/lib/types/activitypub/Extended/index.js deleted file mode 100644 index aa219d8f..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/index.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/Extended/index.js.map b/packages/activitypub-core/lib/types/activitypub/Extended/index.js.map deleted file mode 100644 index a08bc814..00000000 --- a/packages/activitypub-core/lib/types/activitypub/Extended/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/activitypub/Extended/index.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/index.d.ts b/packages/activitypub-core/lib/types/activitypub/index.d.ts deleted file mode 100644 index 040e6c3a..00000000 --- a/packages/activitypub-core/lib/types/activitypub/index.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -export { CoreObjectTypes, LinkTypes, TransitiveActivityTypes, IntransitiveActivityTypes, ActivityTypes, ActorTypes, ExtendedObjectTypes, CollectionTypes, CollectionPageTypes, AllTypes, } from './util/const'; -export type { Entity, EntityReference, CoreObject, CoreObjectReference, Link, LinkReference, } from './Core'; -export type { Activity, ActivityReference, IntransitiveActivity, TransitiveActivity, Accept, Follow, Delete, Create, Arrive, Add, Offer, Like, Leave, Ignore, Join, Reject, Invite, TentativeReject, TentativeAccept, View, Update, Undo, Remove, Read, Listen, Move, Travel, Announce, Block, Flag, Dislike, Question, } from './Extended'; -export type { Actor, ActorReference, Person, Service, Group, Organization, Application, } from './Extended'; -export type { ExtendedObject, ExtendedObjectReference, Article, Event, Note, Page, Place, Relationship, Tombstone, Profile, Video, Document, Audio, Image, } from './Extended'; -export type { Collection, CollectionReference } from './Extended'; -export type { OrderedCollection, OrderedCollectionReference } from './Extended'; -export type { CollectionPage, CollectionPageReference } from './Extended'; -export type { OrderedCollectionPage, OrderedCollectionPageReference, } from './Extended'; -export type { EitherCollection } from './Extended'; -export type { EitherCollectionReference } from './Extended'; -export type { EitherCollectionPage } from './Extended'; -export type { EitherCollectionPageReference } from './Extended'; -export type { StringReferenceMap } from './util/values'; diff --git a/packages/activitypub-core/lib/types/activitypub/index.js b/packages/activitypub-core/lib/types/activitypub/index.js deleted file mode 100644 index 32ce4449..00000000 --- a/packages/activitypub-core/lib/types/activitypub/index.js +++ /dev/null @@ -1,15 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.AllTypes = exports.CollectionPageTypes = exports.CollectionTypes = exports.ExtendedObjectTypes = exports.ActorTypes = exports.ActivityTypes = exports.IntransitiveActivityTypes = exports.TransitiveActivityTypes = exports.LinkTypes = exports.CoreObjectTypes = void 0; -var const_1 = require("./util/const"); -Object.defineProperty(exports, "CoreObjectTypes", { enumerable: true, get: function () { return const_1.CoreObjectTypes; } }); -Object.defineProperty(exports, "LinkTypes", { enumerable: true, get: function () { return const_1.LinkTypes; } }); -Object.defineProperty(exports, "TransitiveActivityTypes", { enumerable: true, get: function () { return const_1.TransitiveActivityTypes; } }); -Object.defineProperty(exports, "IntransitiveActivityTypes", { enumerable: true, get: function () { return const_1.IntransitiveActivityTypes; } }); -Object.defineProperty(exports, "ActivityTypes", { enumerable: true, get: function () { return const_1.ActivityTypes; } }); -Object.defineProperty(exports, "ActorTypes", { enumerable: true, get: function () { return const_1.ActorTypes; } }); -Object.defineProperty(exports, "ExtendedObjectTypes", { enumerable: true, get: function () { return const_1.ExtendedObjectTypes; } }); -Object.defineProperty(exports, "CollectionTypes", { enumerable: true, get: function () { return const_1.CollectionTypes; } }); -Object.defineProperty(exports, "CollectionPageTypes", { enumerable: true, get: function () { return const_1.CollectionPageTypes; } }); -Object.defineProperty(exports, "AllTypes", { enumerable: true, get: function () { return const_1.AllTypes; } }); -//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/index.js.map b/packages/activitypub-core/lib/types/activitypub/index.js.map deleted file mode 100644 index 35ea3a9a..00000000 --- a/packages/activitypub-core/lib/types/activitypub/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/activitypub/index.ts"],"names":[],"mappings":";;;AAAA,sCAWsB;AAVpB,wGAAA,eAAe,OAAA;AACf,kGAAA,SAAS,OAAA;AACT,gHAAA,uBAAuB,OAAA;AACvB,kHAAA,yBAAyB,OAAA;AACzB,sGAAA,aAAa,OAAA;AACb,mGAAA,UAAU,OAAA;AACV,4GAAA,mBAAmB,OAAA;AACnB,wGAAA,eAAe,OAAA;AACf,4GAAA,mBAAmB,OAAA;AACnB,iGAAA,QAAQ,OAAA"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/util/const.d.ts b/packages/activitypub-core/lib/types/activitypub/util/const.d.ts deleted file mode 100644 index 925de513..00000000 --- a/packages/activitypub-core/lib/types/activitypub/util/const.d.ts +++ /dev/null @@ -1,199 +0,0 @@ -export declare const ExtendedObjectTypes: { - readonly ARTICLE: "Article"; - readonly AUDIO: "Audio"; - readonly DOCUMENT: "Document"; - readonly EVENT: "Event"; - readonly IMAGE: "Image"; - readonly NOTE: "Note"; - readonly PAGE: "Page"; - readonly PLACE: "Place"; - readonly PROFILE: "Profile"; - readonly RELATIONSHIP: "Relationship"; - readonly TOMBSTONE: "Tombstone"; - readonly VIDEO: "Video"; -}; -export declare const LinkTypes: { - readonly LINK: "Link"; - readonly MENTION: "Mention"; -}; -export declare const ActorTypes: { - readonly APPLICATION: "Application"; - readonly GROUP: "Group"; - readonly ORGANIZATION: "Organization"; - readonly PERSON: "Person"; - readonly SERVICE: "Service"; -}; -export declare const TransitiveActivityTypes: { - readonly ACCEPT: "Accept"; - readonly ADD: "Add"; - readonly ANNOUNCE: "Announce"; - readonly BLOCK: "Block"; - readonly IGNORE: "Ignore"; - readonly CREATE: "Create"; - readonly DELETE: "Delete"; - readonly DISLIKE: "Dislike"; - readonly FLAG: "Flag"; - readonly FOLLOW: "Follow"; - readonly INVITE: "Invite"; - readonly JOIN: "Join"; - readonly LEAVE: "Leave"; - readonly LIKE: "Like"; - readonly LISTEN: "Listen"; - readonly MOVE: "Move"; - readonly OFFER: "Offer"; - readonly READ: "Read"; - readonly REJECT: "Reject"; - readonly REMOVE: "Remove"; - readonly TENTATIVE_ACCEPT: "TentativeAccept"; - readonly TENTATIVE_REJECT: "TentativeReject"; - readonly UNDO: "Undo"; - readonly UPDATE: "Update"; - readonly VIEW: "View"; -}; -export declare const IntransitiveActivityTypes: { - readonly ARRIVE: "Arrive"; - readonly TRAVEL: "Travel"; - readonly QUESTION: "Question"; -}; -export declare const ActivityTypes: { - readonly ARRIVE: "Arrive"; - readonly TRAVEL: "Travel"; - readonly QUESTION: "Question"; - readonly ACCEPT: "Accept"; - readonly ADD: "Add"; - readonly ANNOUNCE: "Announce"; - readonly BLOCK: "Block"; - readonly IGNORE: "Ignore"; - readonly CREATE: "Create"; - readonly DELETE: "Delete"; - readonly DISLIKE: "Dislike"; - readonly FLAG: "Flag"; - readonly FOLLOW: "Follow"; - readonly INVITE: "Invite"; - readonly JOIN: "Join"; - readonly LEAVE: "Leave"; - readonly LIKE: "Like"; - readonly LISTEN: "Listen"; - readonly MOVE: "Move"; - readonly OFFER: "Offer"; - readonly READ: "Read"; - readonly REJECT: "Reject"; - readonly REMOVE: "Remove"; - readonly TENTATIVE_ACCEPT: "TentativeAccept"; - readonly TENTATIVE_REJECT: "TentativeReject"; - readonly UNDO: "Undo"; - readonly UPDATE: "Update"; - readonly VIEW: "View"; -}; -export declare const CollectionTypes: { - readonly COLLECTION: "Collection"; - readonly ORDERED_COLLECTION: "OrderedCollection"; -}; -export declare const CollectionPageTypes: { - readonly COLLECTION_PAGE: "CollectionPage"; - readonly ORDERED_COLLECTION_PAGE: "OrderedCollectionPage"; -}; -export declare const CoreObjectTypes: { - readonly COLLECTION_PAGE: "CollectionPage"; - readonly ORDERED_COLLECTION_PAGE: "OrderedCollectionPage"; - readonly COLLECTION: "Collection"; - readonly ORDERED_COLLECTION: "OrderedCollection"; - readonly ARRIVE: "Arrive"; - readonly TRAVEL: "Travel"; - readonly QUESTION: "Question"; - readonly ACCEPT: "Accept"; - readonly ADD: "Add"; - readonly ANNOUNCE: "Announce"; - readonly BLOCK: "Block"; - readonly IGNORE: "Ignore"; - readonly CREATE: "Create"; - readonly DELETE: "Delete"; - readonly DISLIKE: "Dislike"; - readonly FLAG: "Flag"; - readonly FOLLOW: "Follow"; - readonly INVITE: "Invite"; - readonly JOIN: "Join"; - readonly LEAVE: "Leave"; - readonly LIKE: "Like"; - readonly LISTEN: "Listen"; - readonly MOVE: "Move"; - readonly OFFER: "Offer"; - readonly READ: "Read"; - readonly REJECT: "Reject"; - readonly REMOVE: "Remove"; - readonly TENTATIVE_ACCEPT: "TentativeAccept"; - readonly TENTATIVE_REJECT: "TentativeReject"; - readonly UNDO: "Undo"; - readonly UPDATE: "Update"; - readonly VIEW: "View"; - readonly APPLICATION: "Application"; - readonly GROUP: "Group"; - readonly ORGANIZATION: "Organization"; - readonly PERSON: "Person"; - readonly SERVICE: "Service"; - readonly ARTICLE: "Article"; - readonly AUDIO: "Audio"; - readonly DOCUMENT: "Document"; - readonly EVENT: "Event"; - readonly IMAGE: "Image"; - readonly NOTE: "Note"; - readonly PAGE: "Page"; - readonly PLACE: "Place"; - readonly PROFILE: "Profile"; - readonly RELATIONSHIP: "Relationship"; - readonly TOMBSTONE: "Tombstone"; - readonly VIDEO: "Video"; -}; -export declare const AllTypes: { - readonly LINK: "Link"; - readonly MENTION: "Mention"; - readonly COLLECTION_PAGE: "CollectionPage"; - readonly ORDERED_COLLECTION_PAGE: "OrderedCollectionPage"; - readonly COLLECTION: "Collection"; - readonly ORDERED_COLLECTION: "OrderedCollection"; - readonly ARRIVE: "Arrive"; - readonly TRAVEL: "Travel"; - readonly QUESTION: "Question"; - readonly ACCEPT: "Accept"; - readonly ADD: "Add"; - readonly ANNOUNCE: "Announce"; - readonly BLOCK: "Block"; - readonly IGNORE: "Ignore"; - readonly CREATE: "Create"; - readonly DELETE: "Delete"; - readonly DISLIKE: "Dislike"; - readonly FLAG: "Flag"; - readonly FOLLOW: "Follow"; - readonly INVITE: "Invite"; - readonly JOIN: "Join"; - readonly LEAVE: "Leave"; - readonly LIKE: "Like"; - readonly LISTEN: "Listen"; - readonly MOVE: "Move"; - readonly OFFER: "Offer"; - readonly READ: "Read"; - readonly REJECT: "Reject"; - readonly REMOVE: "Remove"; - readonly TENTATIVE_ACCEPT: "TentativeAccept"; - readonly TENTATIVE_REJECT: "TentativeReject"; - readonly UNDO: "Undo"; - readonly UPDATE: "Update"; - readonly VIEW: "View"; - readonly APPLICATION: "Application"; - readonly GROUP: "Group"; - readonly ORGANIZATION: "Organization"; - readonly PERSON: "Person"; - readonly SERVICE: "Service"; - readonly ARTICLE: "Article"; - readonly AUDIO: "Audio"; - readonly DOCUMENT: "Document"; - readonly EVENT: "Event"; - readonly IMAGE: "Image"; - readonly NOTE: "Note"; - readonly PAGE: "Page"; - readonly PLACE: "Place"; - readonly PROFILE: "Profile"; - readonly RELATIONSHIP: "Relationship"; - readonly TOMBSTONE: "Tombstone"; - readonly VIDEO: "Video"; -}; diff --git a/packages/activitypub-core/lib/types/activitypub/util/const.js b/packages/activitypub-core/lib/types/activitypub/util/const.js deleted file mode 100644 index ce2c003d..00000000 --- a/packages/activitypub-core/lib/types/activitypub/util/const.js +++ /dev/null @@ -1,84 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.AllTypes = exports.CoreObjectTypes = exports.CollectionPageTypes = exports.CollectionTypes = exports.ActivityTypes = exports.IntransitiveActivityTypes = exports.TransitiveActivityTypes = exports.ActorTypes = exports.LinkTypes = exports.ExtendedObjectTypes = void 0; -exports.ExtendedObjectTypes = { - ARTICLE: 'Article', - AUDIO: 'Audio', - DOCUMENT: 'Document', - EVENT: 'Event', - IMAGE: 'Image', - NOTE: 'Note', - PAGE: 'Page', - PLACE: 'Place', - PROFILE: 'Profile', - RELATIONSHIP: 'Relationship', - TOMBSTONE: 'Tombstone', - VIDEO: 'Video', -}; -exports.LinkTypes = { - LINK: 'Link', - MENTION: 'Mention', -}; -exports.ActorTypes = { - APPLICATION: 'Application', - GROUP: 'Group', - ORGANIZATION: 'Organization', - PERSON: 'Person', - SERVICE: 'Service', -}; -exports.TransitiveActivityTypes = { - ACCEPT: 'Accept', - ADD: 'Add', - ANNOUNCE: 'Announce', - BLOCK: 'Block', - IGNORE: 'Ignore', - CREATE: 'Create', - DELETE: 'Delete', - DISLIKE: 'Dislike', - FLAG: 'Flag', - FOLLOW: 'Follow', - INVITE: 'Invite', - JOIN: 'Join', - LEAVE: 'Leave', - LIKE: 'Like', - LISTEN: 'Listen', - MOVE: 'Move', - OFFER: 'Offer', - READ: 'Read', - REJECT: 'Reject', - REMOVE: 'Remove', - TENTATIVE_ACCEPT: 'TentativeAccept', - TENTATIVE_REJECT: 'TentativeReject', - UNDO: 'Undo', - UPDATE: 'Update', - VIEW: 'View', -}; -exports.IntransitiveActivityTypes = { - ARRIVE: 'Arrive', - TRAVEL: 'Travel', - QUESTION: 'Question', -}; -exports.ActivityTypes = { - ...exports.TransitiveActivityTypes, - ...exports.IntransitiveActivityTypes, -}; -exports.CollectionTypes = { - COLLECTION: 'Collection', - ORDERED_COLLECTION: 'OrderedCollection', -}; -exports.CollectionPageTypes = { - COLLECTION_PAGE: 'CollectionPage', - ORDERED_COLLECTION_PAGE: 'OrderedCollectionPage', -}; -exports.CoreObjectTypes = { - ...exports.ExtendedObjectTypes, - ...exports.ActorTypes, - ...exports.ActivityTypes, - ...exports.CollectionTypes, - ...exports.CollectionPageTypes, -}; -exports.AllTypes = { - ...exports.CoreObjectTypes, - ...exports.LinkTypes, -}; -//# sourceMappingURL=const.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/util/const.js.map b/packages/activitypub-core/lib/types/activitypub/util/const.js.map deleted file mode 100644 index 2d5969a5..00000000 --- a/packages/activitypub-core/lib/types/activitypub/util/const.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../../src/types/activitypub/util/const.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG;IACjC,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;IAClB,YAAY,EAAE,cAAc;IAC5B,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;CACN,CAAC;AAEE,QAAA,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;CACV,CAAC;AAEE,QAAA,UAAU,GAAG;IACxB,WAAW,EAAE,aAAa;IAC1B,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACV,CAAC;AAEE,QAAA,uBAAuB,GAAG;IACrC,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;IACV,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,gBAAgB,EAAE,iBAAiB;IACnC,gBAAgB,EAAE,iBAAiB;IACnC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;CACJ,CAAC;AAEE,QAAA,yBAAyB,GAAG;IACvC,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;CACZ,CAAC;AAEE,QAAA,aAAa,GAAG;IAC3B,GAAG,+BAAuB;IAC1B,GAAG,iCAAyB;CACpB,CAAC;AAEE,QAAA,eAAe,GAAG;IAC7B,UAAU,EAAE,YAAY;IACxB,kBAAkB,EAAE,mBAAmB;CAC/B,CAAC;AAEE,QAAA,mBAAmB,GAAG;IACjC,eAAe,EAAE,gBAAgB;IACjC,uBAAuB,EAAE,uBAAuB;CACxC,CAAC;AAEE,QAAA,eAAe,GAAG;IAC7B,GAAG,2BAAmB;IACtB,GAAG,kBAAU;IACb,GAAG,qBAAa;IAChB,GAAG,uBAAe;IAClB,GAAG,2BAAmB;CACd,CAAC;AAEE,QAAA,QAAQ,GAAG;IACtB,GAAG,uBAAe;IAClB,GAAG,iBAAS;CACJ,CAAC"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/util/values.d.ts b/packages/activitypub-core/lib/types/activitypub/util/values.d.ts deleted file mode 100644 index d168bc37..00000000 --- a/packages/activitypub-core/lib/types/activitypub/util/values.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare type StringReferenceMap = { - [key: string]: string; -}; diff --git a/packages/activitypub-core/lib/types/activitypub/util/values.js b/packages/activitypub-core/lib/types/activitypub/util/values.js deleted file mode 100644 index e484953f..00000000 --- a/packages/activitypub-core/lib/types/activitypub/util/values.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=values.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/activitypub/util/values.js.map b/packages/activitypub-core/lib/types/activitypub/util/values.js.map deleted file mode 100644 index 7fb2f688..00000000 --- a/packages/activitypub-core/lib/types/activitypub/util/values.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"values.js","sourceRoot":"","sources":["../../../../src/types/activitypub/util/values.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/index.d.ts b/packages/activitypub-core/lib/types/index.d.ts deleted file mode 100644 index b5df930b..00000000 --- a/packages/activitypub-core/lib/types/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * as AP from './activitypub'; diff --git a/packages/activitypub-core/lib/types/index.js b/packages/activitypub-core/lib/types/index.js deleted file mode 100644 index 06de83dc..00000000 --- a/packages/activitypub-core/lib/types/index.js +++ /dev/null @@ -1,28 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.AP = void 0; -exports.AP = __importStar(require("./activitypub")); -//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/packages/activitypub-core/lib/types/index.js.map b/packages/activitypub-core/lib/types/index.js.map deleted file mode 100644 index a69f2bbd..00000000 --- a/packages/activitypub-core/lib/types/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAoC"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/utilities/addContext.d.ts b/packages/activitypub-core/lib/utilities/addContext.d.ts index 6e4b5439..0698d92e 100644 --- a/packages/activitypub-core/lib/utilities/addContext.d.ts +++ b/packages/activitypub-core/lib/utilities/addContext.d.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function addContext(entity: AP.Entity): AP.Entity & { '@context': unknown; }; diff --git a/packages/activitypub-core/lib/utilities/addContext.js b/packages/activitypub-core/lib/utilities/addContext.js index f2ad4f53..f69ea35f 100644 --- a/packages/activitypub-core/lib/utilities/addContext.js +++ b/packages/activitypub-core/lib/utilities/addContext.js @@ -2,9 +2,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.addContext = void 0; const globals_1 = require("../globals"); -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); function addContext(entity) { - for (const type of Object.values(src_1.AP.ActorTypes)) { + for (const type of Object.values(activitypub_core_types_1.AP.ActorTypes)) { if (type === entity.type) { return { '@context': [ diff --git a/packages/activitypub-core/lib/utilities/addContext.js.map b/packages/activitypub-core/lib/utilities/addContext.js.map index 3138d1df..4e54c30b 100644 --- a/packages/activitypub-core/lib/utilities/addContext.js.map +++ b/packages/activitypub-core/lib/utilities/addContext.js.map @@ -1 +1 @@ -{"version":3,"file":"addContext.js","sourceRoot":"","sources":["../../src/utilities/addContext.ts"],"names":[],"mappings":";;;AAAA,wCAA4E;AAC5E,oDAAgD;AAEhD,SAAgB,UAAU,CAAC,MAAiB;IAG1C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,UAAU,CAAC,EAAE;QAC/C,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,EAAE;YACxB,OAAO;gBACL,UAAU,EAAE;oBACV,IAAI,GAAG,CAAC,iCAAuB,CAAC;oBAChC,IAAI,GAAG,CAAC,+BAAqB,CAAC;iBAC/B;gBACD,GAAG,MAAM;aACV,CAAC;SACH;KACF;IAED,OAAO;QACL,UAAU,EAAE,IAAI,GAAG,CAAC,iCAAuB,CAAC;QAC5C,GAAG,MAAM;KACV,CAAC;AACJ,CAAC;AAnBD,gCAmBC"} \ No newline at end of file +{"version":3,"file":"addContext.js","sourceRoot":"","sources":["../../src/utilities/addContext.ts"],"names":[],"mappings":";;;AAAA,wCAA4E;AAC5E,mEAA4C;AAE5C,SAAgB,UAAU,CAAC,MAAiB;IAG1C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,UAAU,CAAC,EAAE;QAC/C,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,EAAE;YACxB,OAAO;gBACL,UAAU,EAAE;oBACV,IAAI,GAAG,CAAC,iCAAuB,CAAC;oBAChC,IAAI,GAAG,CAAC,+BAAqB,CAAC;iBAC/B;gBACD,GAAG,MAAM;aACV,CAAC;SACH;KACF;IAED,OAAO;QACL,UAAU,EAAE,IAAI,GAAG,CAAC,iCAAuB,CAAC;QAC5C,GAAG,MAAM;KACV,CAAC;AACJ,CAAC;AAnBD,gCAmBC"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/utilities/cleanProps.d.ts b/packages/activitypub-core/lib/utilities/cleanProps.d.ts index 102809b4..5878537c 100644 --- a/packages/activitypub-core/lib/utilities/cleanProps.d.ts +++ b/packages/activitypub-core/lib/utilities/cleanProps.d.ts @@ -1,2 +1,2 @@ -import { AP } from 'activitypub-core-types/src'; -export declare function cleanProps(entity: AP.Entity): import("activitypub-core-types/src/activitypub/Core/Link").BaseLink | AP.Article | AP.Event | AP.Note | AP.Page | AP.Place | AP.Relationship | AP.Tombstone | AP.Profile | AP.Document | AP.Application | AP.Service | AP.Group | AP.Organization | AP.Person | AP.Accept | AP.Follow | AP.Delete | AP.Create | AP.Arrive | AP.Add | AP.Offer | AP.Like | AP.Leave | AP.Ignore | AP.Join | AP.Reject | AP.View | AP.Update | AP.Undo | AP.Remove | AP.Read | AP.Listen | AP.Move | AP.Travel | AP.Announce | AP.Flag | AP.Dislike | AP.Question | AP.Collection | AP.OrderedCollection | AP.CollectionPage | AP.OrderedCollectionPage | import("activitypub-core-types/src/activitypub/Core").Mention; +import { AP } from 'activitypub-core-types'; +export declare function cleanProps(entity: AP.Entity): AP.Article | AP.Event | AP.Note | AP.Page | AP.Place | AP.Relationship | AP.Tombstone | AP.Profile | AP.Document | AP.Application | AP.Service | AP.Group | AP.Organization | AP.Person | AP.Accept | AP.Follow | AP.Delete | AP.Create | AP.Arrive | AP.Add | AP.Offer | AP.Like | AP.Leave | AP.Ignore | AP.Join | AP.Reject | AP.View | AP.Update | AP.Undo | AP.Remove | AP.Read | AP.Listen | AP.Move | AP.Travel | AP.Announce | AP.Flag | AP.Dislike | AP.Question | AP.Collection | AP.OrderedCollection | AP.CollectionPage | AP.OrderedCollectionPage | import("activitypub-core-types/lib/activitypub/Core/Link").BaseLink | import("activitypub-core-types/lib/activitypub/Core").Mention; diff --git a/packages/activitypub-core/lib/utilities/compressEntity.d.ts b/packages/activitypub-core/lib/utilities/compressEntity.d.ts index efa926ba..2e6ab4e6 100644 --- a/packages/activitypub-core/lib/utilities/compressEntity.d.ts +++ b/packages/activitypub-core/lib/utilities/compressEntity.d.ts @@ -1,2 +1,2 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function compressEntity(entity: AP.Entity): AP.Entity; diff --git a/packages/activitypub-core/lib/utilities/convertStringsToUrls.d.ts b/packages/activitypub-core/lib/utilities/convertStringsToUrls.d.ts index 06b63161..494866e5 100644 --- a/packages/activitypub-core/lib/utilities/convertStringsToUrls.d.ts +++ b/packages/activitypub-core/lib/utilities/convertStringsToUrls.d.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare function convertStringsToUrls(originalEntity: { [key: string]: unknown; }): AP.Entity; diff --git a/packages/activitypub-core/lib/utilities/convertUrlsToStrings.d.ts b/packages/activitypub-core/lib/utilities/convertUrlsToStrings.d.ts index 47b0b052..3ca6f653 100644 --- a/packages/activitypub-core/lib/utilities/convertUrlsToStrings.d.ts +++ b/packages/activitypub-core/lib/utilities/convertUrlsToStrings.d.ts @@ -1,2 +1,2 @@ -import { AP } from "activitypub-core-types/src"; +import { AP } from 'activitypub-core-types'; export declare const convertUrlsToStrings: (entity: AP.Entity) => AP.Entity; diff --git a/packages/activitypub-core/lib/utilities/getId.d.ts b/packages/activitypub-core/lib/utilities/getId.d.ts index f80e19f9..4ee308b6 100644 --- a/packages/activitypub-core/lib/utilities/getId.d.ts +++ b/packages/activitypub-core/lib/utilities/getId.d.ts @@ -1,3 +1,3 @@ /// -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare const getId: (entity?: undefined | null | AP.EntityReference | AP.EntityReference[]) => URL | null; diff --git a/packages/activitypub-core/lib/utilities/getTypedEntity.d.ts b/packages/activitypub-core/lib/utilities/getTypedEntity.d.ts index ed9f32ca..53194e00 100644 --- a/packages/activitypub-core/lib/utilities/getTypedEntity.d.ts +++ b/packages/activitypub-core/lib/utilities/getTypedEntity.d.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export declare const getTypedEntity: (entity: { type: string; -}) => import("activitypub-core-types/src/activitypub/Core/Link").BaseLink | AP.Article | AP.Event | AP.Note | AP.Page | AP.Place | AP.Relationship | AP.Tombstone | AP.Profile | AP.Document | AP.Application | AP.Service | AP.Group | AP.Organization | AP.Person | AP.Accept | AP.Follow | AP.Delete | AP.Create | AP.Arrive | AP.Add | AP.Offer | AP.Like | AP.Leave | AP.Ignore | AP.Join | AP.Reject | AP.View | AP.Update | AP.Undo | AP.Remove | AP.Read | AP.Listen | AP.Move | AP.Travel | AP.Announce | AP.Flag | AP.Dislike | AP.Question | AP.Collection | AP.OrderedCollection | AP.CollectionPage | AP.OrderedCollectionPage; +}) => AP.Article | AP.Event | AP.Note | AP.Page | AP.Place | AP.Relationship | AP.Tombstone | AP.Profile | AP.Document | AP.Application | AP.Service | AP.Group | AP.Organization | AP.Person | AP.Accept | AP.Follow | AP.Delete | AP.Create | AP.Arrive | AP.Add | AP.Offer | AP.Like | AP.Leave | AP.Ignore | AP.Join | AP.Reject | AP.View | AP.Update | AP.Undo | AP.Remove | AP.Read | AP.Listen | AP.Move | AP.Travel | AP.Announce | AP.Flag | AP.Dislike | AP.Question | AP.Collection | AP.OrderedCollection | AP.CollectionPage | AP.OrderedCollectionPage | import("activitypub-core-types/lib/activitypub/Core/Link").BaseLink; diff --git a/packages/activitypub-core/lib/utilities/getTypedEntity.js b/packages/activitypub-core/lib/utilities/getTypedEntity.js index 338b1951..868ae3c9 100644 --- a/packages/activitypub-core/lib/utilities/getTypedEntity.js +++ b/packages/activitypub-core/lib/utilities/getTypedEntity.js @@ -1,36 +1,36 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.getTypedEntity = void 0; -const src_1 = require("activitypub-core-types/src"); +const activitypub_core_types_1 = require("activitypub-core-types"); const getTypedEntity = (entity) => { - for (const linkType of Object.values(src_1.AP.LinkTypes)) { + for (const linkType of Object.values(activitypub_core_types_1.AP.LinkTypes)) { if (entity.type === linkType) { return entity; } } - for (const activityType of Object.values(src_1.AP.ActivityTypes)) { + for (const activityType of Object.values(activitypub_core_types_1.AP.ActivityTypes)) { if (entity.type === activityType) { return entity; } } - for (const actorType of Object.values(src_1.AP.ActorTypes)) { + for (const actorType of Object.values(activitypub_core_types_1.AP.ActorTypes)) { if (entity.type === actorType) { return entity; } } - if (entity.type === src_1.AP.CollectionTypes.COLLECTION) { + if (entity.type === activitypub_core_types_1.AP.CollectionTypes.COLLECTION) { return entity; } - if (entity.type === src_1.AP.CollectionTypes.ORDERED_COLLECTION) { + if (entity.type === activitypub_core_types_1.AP.CollectionTypes.ORDERED_COLLECTION) { return entity; } - if (entity.type === src_1.AP.CollectionPageTypes.COLLECTION_PAGE) { + if (entity.type === activitypub_core_types_1.AP.CollectionPageTypes.COLLECTION_PAGE) { return entity; } - if (entity.type === src_1.AP.CollectionPageTypes.ORDERED_COLLECTION_PAGE) { + if (entity.type === activitypub_core_types_1.AP.CollectionPageTypes.ORDERED_COLLECTION_PAGE) { return entity; } - for (const objectType of Object.values(src_1.AP.ExtendedObjectTypes)) { + for (const objectType of Object.values(activitypub_core_types_1.AP.ExtendedObjectTypes)) { if (entity.type === objectType) { return entity; } diff --git a/packages/activitypub-core/lib/utilities/getTypedEntity.js.map b/packages/activitypub-core/lib/utilities/getTypedEntity.js.map index 95301042..b4a297dd 100644 --- a/packages/activitypub-core/lib/utilities/getTypedEntity.js.map +++ b/packages/activitypub-core/lib/utilities/getTypedEntity.js.map @@ -1 +1 @@ -{"version":3,"file":"getTypedEntity.js","sourceRoot":"","sources":["../../src/utilities/getTypedEntity.ts"],"names":[],"mappings":";;;AAAA,oDAAgD;AAEzC,MAAM,cAAc,GAAG,CAAC,MAAwB,EAAE,EAAE;IACzD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,SAAS,CAAC,EAAE;QAClD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC5B,OAAO,MAAiB,CAAC;SAC1B;KACF;IAED,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,aAAa,CAAC,EAAE;QAC1D,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE;YAChC,OAAO,MAAqB,CAAC;SAC9B;KACF;IAED,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,UAAU,CAAC,EAAE;QACpD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;YAC7B,OAAO,MAAkB,CAAC;SAC3B;KACF;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,UAAU,EAAE;QACjD,OAAO,MAAuB,CAAC;KAChC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,QAAE,CAAC,eAAe,CAAC,kBAAkB,EAAE;QACzD,OAAO,MAA8B,CAAC;KACvC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,QAAE,CAAC,mBAAmB,CAAC,eAAe,EAAE;QAC1D,OAAO,MAA2B,CAAC;KACpC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,QAAE,CAAC,mBAAmB,CAAC,uBAAuB,EAAE;QAClE,OAAO,MAAkC,CAAC;KAC3C;IAED,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,QAAE,CAAC,mBAAmB,CAAC,EAAE;QAC9D,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE;YAC9B,OAAO,MAA2B,CAAC;SACpC;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AA1CW,QAAA,cAAc,kBA0CzB"} \ No newline at end of file +{"version":3,"file":"getTypedEntity.js","sourceRoot":"","sources":["../../src/utilities/getTypedEntity.ts"],"names":[],"mappings":";;;AAAA,mEAA4C;AAErC,MAAM,cAAc,GAAG,CAAC,MAAwB,EAAE,EAAE;IACzD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,SAAS,CAAC,EAAE;QAClD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC5B,OAAO,MAAiB,CAAC;SAC1B;KACF;IAED,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,aAAa,CAAC,EAAE;QAC1D,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE;YAChC,OAAO,MAAqB,CAAC;SAC9B;KACF;IAED,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,UAAU,CAAC,EAAE;QACpD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;YAC7B,OAAO,MAAkB,CAAC;SAC3B;KACF;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,UAAU,EAAE;QACjD,OAAO,MAAuB,CAAC;KAChC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAE,CAAC,eAAe,CAAC,kBAAkB,EAAE;QACzD,OAAO,MAA8B,CAAC;KACvC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAE,CAAC,mBAAmB,CAAC,eAAe,EAAE;QAC1D,OAAO,MAA2B,CAAC;KACpC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAE,CAAC,mBAAmB,CAAC,uBAAuB,EAAE;QAClE,OAAO,MAAkC,CAAC;KAC3C;IAED,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,2BAAE,CAAC,mBAAmB,CAAC,EAAE;QAC9D,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE;YAC9B,OAAO,MAA2B,CAAC;SACpC;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AA1CW,QAAA,cAAc,kBA0CzB"} \ No newline at end of file diff --git a/packages/activitypub-core/lib/utilities/stringifyWithContext.d.ts b/packages/activitypub-core/lib/utilities/stringifyWithContext.d.ts index 53bec67e..90e4f638 100644 --- a/packages/activitypub-core/lib/utilities/stringifyWithContext.d.ts +++ b/packages/activitypub-core/lib/utilities/stringifyWithContext.d.ts @@ -1,2 +1,2 @@ -import { AP } from "activitypub-core-types/src"; +import { AP } from 'activitypub-core-types'; export declare function stringifyWithContext(entity: AP.Entity): string; diff --git a/packages/activitypub-core/package-lock.json b/packages/activitypub-core/package-lock.json index 8f1a80a9..d4aee304 100644 --- a/packages/activitypub-core/package-lock.json +++ b/packages/activitypub-core/package-lock.json @@ -1,12 +1,12 @@ { "name": "activitypub-core", - "version": "0.0.35", + "version": "0.0.36", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "activitypub-core", - "version": "0.0.35", + "version": "0.0.36", "license": "MIT", "dependencies": { "activitypub-core-types": "^0.0.35", @@ -919,9 +919,9 @@ } }, "node_modules/activitypub-core-types": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.1.tgz", - "integrity": "sha512-ILbRangWIutnlf612xREVq42o363zTe8tf5O1UuegmsZ8Xs57BBcwG0xODg6gDYI/p7uMyt1hl6lmc40RWqdNg==" + "version": "0.0.35", + "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.35.tgz", + "integrity": "sha512-5uFe79X2S1mUWS5b1QgnAPYRDv1Toay0OfQqrpO+Pcxcp3tm4HCvTepzXpFc298db1wirH0X8PuuQILQlxWu5w==" }, "node_modules/agent-base": { "version": "6.0.2", @@ -4291,9 +4291,9 @@ "requires": {} }, "activitypub-core-types": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.1.tgz", - "integrity": "sha512-ILbRangWIutnlf612xREVq42o363zTe8tf5O1UuegmsZ8Xs57BBcwG0xODg6gDYI/p7uMyt1hl6lmc40RWqdNg==" + "version": "0.0.35", + "resolved": "https://registry.npmjs.org/activitypub-core-types/-/activitypub-core-types-0.0.35.tgz", + "integrity": "sha512-5uFe79X2S1mUWS5b1QgnAPYRDv1Toay0OfQqrpO+Pcxcp3tm4HCvTepzXpFc298db1wirH0X8PuuQILQlxWu5w==" }, "agent-base": { "version": "6.0.2", diff --git a/packages/activitypub-core/package.json b/packages/activitypub-core/package.json index 15d94801..b776f992 100644 --- a/packages/activitypub-core/package.json +++ b/packages/activitypub-core/package.json @@ -1,6 +1,6 @@ { "name": "activitypub-core", - "version": "0.0.35", + "version": "0.0.36", "description": "> TODO: description", "author": "Michael Puckett ", "homepage": "", @@ -35,4 +35,4 @@ "dotenv": "^16.0.3", "typescript": "^4.8.4" } -} +} \ No newline at end of file diff --git a/packages/activitypub-core/src/DatabaseService/expandCollection.ts b/packages/activitypub-core/src/DatabaseService/expandCollection.ts index f52ba140..2d8c3250 100644 --- a/packages/activitypub-core/src/DatabaseService/expandCollection.ts +++ b/packages/activitypub-core/src/DatabaseService/expandCollection.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { getId } from '../utilities/getId'; export async function expandCollection( diff --git a/packages/activitypub-core/src/DatabaseService/expandEntity.ts b/packages/activitypub-core/src/DatabaseService/expandEntity.ts index ffb53aa6..0ffe87de 100644 --- a/packages/activitypub-core/src/DatabaseService/expandEntity.ts +++ b/packages/activitypub-core/src/DatabaseService/expandEntity.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { CONTEXT, PUBLIC_ACTOR } from '../globals'; export async function expandEntity( diff --git a/packages/activitypub-core/src/DatabaseService/fetchEntityById.ts b/packages/activitypub-core/src/DatabaseService/fetchEntityById.ts index 0850da6b..d9987cd9 100644 --- a/packages/activitypub-core/src/DatabaseService/fetchEntityById.ts +++ b/packages/activitypub-core/src/DatabaseService/fetchEntityById.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { ACCEPT_HEADER, ACTIVITYSTREAMS_CONTENT_TYPE, diff --git a/packages/activitypub-core/src/DatabaseService/findAll.ts b/packages/activitypub-core/src/DatabaseService/findAll.ts index d2f5a63b..6603c6be 100644 --- a/packages/activitypub-core/src/DatabaseService/findAll.ts +++ b/packages/activitypub-core/src/DatabaseService/findAll.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export async function findAll( this: DatabaseService, diff --git a/packages/activitypub-core/src/DatabaseService/findEntityById.ts b/packages/activitypub-core/src/DatabaseService/findEntityById.ts index e57e5354..bf224900 100644 --- a/packages/activitypub-core/src/DatabaseService/findEntityById.ts +++ b/packages/activitypub-core/src/DatabaseService/findEntityById.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { getCollectionNameByUrl } from '../utilities/getCollectionNameByUrl'; export async function findEntityById( diff --git a/packages/activitypub-core/src/DatabaseService/findOne.ts b/packages/activitypub-core/src/DatabaseService/findOne.ts index 73057319..14d90f23 100644 --- a/packages/activitypub-core/src/DatabaseService/findOne.ts +++ b/packages/activitypub-core/src/DatabaseService/findOne.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { convertStringsToUrls } from '../utilities/convertStringsToUrls'; export async function findOne( diff --git a/packages/activitypub-core/src/DatabaseService/getActorByToken.ts b/packages/activitypub-core/src/DatabaseService/getActorByToken.ts index 069498c3..d4d5f0d8 100644 --- a/packages/activitypub-core/src/DatabaseService/getActorByToken.ts +++ b/packages/activitypub-core/src/DatabaseService/getActorByToken.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { ServiceAccount } from 'firebase-admin'; export async function getActorByToken( diff --git a/packages/activitypub-core/src/DatabaseService/getCollectionItems.ts b/packages/activitypub-core/src/DatabaseService/getCollectionItems.ts index bfd3ec9c..f7200b09 100644 --- a/packages/activitypub-core/src/DatabaseService/getCollectionItems.ts +++ b/packages/activitypub-core/src/DatabaseService/getCollectionItems.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { getId } from '../utilities/getId'; export async function getCollectionItems( diff --git a/packages/activitypub-core/src/DatabaseService/queryById.ts b/packages/activitypub-core/src/DatabaseService/queryById.ts index abb26f6a..c008c000 100644 --- a/packages/activitypub-core/src/DatabaseService/queryById.ts +++ b/packages/activitypub-core/src/DatabaseService/queryById.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export async function queryById( this: DatabaseService, diff --git a/packages/activitypub-core/src/DatabaseService/saveEntity.ts b/packages/activitypub-core/src/DatabaseService/saveEntity.ts index 8e7a0dd8..b3d2f7ba 100644 --- a/packages/activitypub-core/src/DatabaseService/saveEntity.ts +++ b/packages/activitypub-core/src/DatabaseService/saveEntity.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { cleanProps } from '../utilities/cleanProps'; import { compressEntity } from '../utilities/compressEntity'; import { convertUrlsToStrings } from '../utilities/convertUrlsToStrings'; diff --git a/packages/activitypub-core/src/DeliveryService/broadcast.ts b/packages/activitypub-core/src/DeliveryService/broadcast.ts index 36c0838c..47c56e75 100644 --- a/packages/activitypub-core/src/DeliveryService/broadcast.ts +++ b/packages/activitypub-core/src/DeliveryService/broadcast.ts @@ -1,5 +1,5 @@ import { DeliveryService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { addContext } from '../utilities/addContext'; import { cleanProps } from '../utilities/cleanProps'; import { compressEntity } from '../utilities/compressEntity'; diff --git a/packages/activitypub-core/src/DeliveryService/getPrivateKey.ts b/packages/activitypub-core/src/DeliveryService/getPrivateKey.ts index 049b9099..5ae46ad7 100644 --- a/packages/activitypub-core/src/DeliveryService/getPrivateKey.ts +++ b/packages/activitypub-core/src/DeliveryService/getPrivateKey.ts @@ -1,5 +1,5 @@ import { DeliveryService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export async function getPrivateKey(this: DeliveryService, actor: AP.Actor) { if (!actor.preferredUsername) { diff --git a/packages/activitypub-core/src/DeliveryService/getRecipientInboxUrls.ts b/packages/activitypub-core/src/DeliveryService/getRecipientInboxUrls.ts index 9c87e490..e78262ad 100644 --- a/packages/activitypub-core/src/DeliveryService/getRecipientInboxUrls.ts +++ b/packages/activitypub-core/src/DeliveryService/getRecipientInboxUrls.ts @@ -1,5 +1,5 @@ import { DeliveryService } from '.'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export async function getRecipientInboxUrls( this: DeliveryService, diff --git a/packages/activitypub-core/src/DeliveryService/getRecipientsList.ts b/packages/activitypub-core/src/DeliveryService/getRecipientsList.ts index fc6deb46..60b22df2 100644 --- a/packages/activitypub-core/src/DeliveryService/getRecipientsList.ts +++ b/packages/activitypub-core/src/DeliveryService/getRecipientsList.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { PUBLIC_ACTOR } from '../globals'; import { DeliveryService } from '.'; diff --git a/packages/activitypub-core/src/DeliveryService/signAndSendToForeignActorInbox.ts b/packages/activitypub-core/src/DeliveryService/signAndSendToForeignActorInbox.ts index 1f569712..e53dad44 100644 --- a/packages/activitypub-core/src/DeliveryService/signAndSendToForeignActorInbox.ts +++ b/packages/activitypub-core/src/DeliveryService/signAndSendToForeignActorInbox.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import * as crypto from 'crypto'; import { CONTENT_TYPE_HEADER, diff --git a/packages/activitypub-core/src/endpoints/entity/index.ts b/packages/activitypub-core/src/endpoints/entity/index.ts index 93eaeb1a..ff43a005 100644 --- a/packages/activitypub-core/src/endpoints/entity/index.ts +++ b/packages/activitypub-core/src/endpoints/entity/index.ts @@ -1,6 +1,6 @@ import { IncomingMessage, ServerResponse } from 'http'; import { DatabaseService } from '../../DatabaseService'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { ACTIVITYSTREAMS_CONTENT_TYPE, CONTENT_TYPE_HEADER, diff --git a/packages/activitypub-core/src/endpoints/home/index.ts b/packages/activitypub-core/src/endpoints/home/index.ts index c332377a..718b34f3 100644 --- a/packages/activitypub-core/src/endpoints/home/index.ts +++ b/packages/activitypub-core/src/endpoints/home/index.ts @@ -1,5 +1,5 @@ import { IncomingMessage } from 'http'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { ServiceAccount } from 'firebase-admin'; import { convertUrlsToStrings } from '../../utilities/convertUrlsToStrings'; diff --git a/packages/activitypub-core/src/endpoints/inbox/accept.ts b/packages/activitypub-core/src/endpoints/inbox/accept.ts index 0efcd921..b2f6ad85 100644 --- a/packages/activitypub-core/src/endpoints/inbox/accept.ts +++ b/packages/activitypub-core/src/endpoints/inbox/accept.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getId } from '../../utilities/getId'; diff --git a/packages/activitypub-core/src/endpoints/inbox/announce.ts b/packages/activitypub-core/src/endpoints/inbox/announce.ts index 2478af08..8b7bccea 100644 --- a/packages/activitypub-core/src/endpoints/inbox/announce.ts +++ b/packages/activitypub-core/src/endpoints/inbox/announce.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getId } from '../../utilities/getId'; diff --git a/packages/activitypub-core/src/endpoints/inbox/follow.ts b/packages/activitypub-core/src/endpoints/inbox/follow.ts index e2bfea0d..54238bfa 100644 --- a/packages/activitypub-core/src/endpoints/inbox/follow.ts +++ b/packages/activitypub-core/src/endpoints/inbox/follow.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getTypedEntity } from '../../utilities/getTypedEntity'; import { getGuid } from '../../utilities/getGuid'; diff --git a/packages/activitypub-core/src/endpoints/inbox/index.ts b/packages/activitypub-core/src/endpoints/inbox/index.ts index 63770230..27f94365 100644 --- a/packages/activitypub-core/src/endpoints/inbox/index.ts +++ b/packages/activitypub-core/src/endpoints/inbox/index.ts @@ -1,5 +1,5 @@ import type { NextPageContext } from 'next'; -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { LOCAL_DOMAIN } from '../../globals'; import { DatabaseService } from '../../DatabaseService'; import { getServerSideProps as getEntityPageServerSideProps } from '../entity'; diff --git a/packages/activitypub-core/src/endpoints/inbox/like.ts b/packages/activitypub-core/src/endpoints/inbox/like.ts index cfd96781..477d26c4 100644 --- a/packages/activitypub-core/src/endpoints/inbox/like.ts +++ b/packages/activitypub-core/src/endpoints/inbox/like.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getId } from '../../utilities/getId'; diff --git a/packages/activitypub-core/src/endpoints/inbox/shouldForwardActivity.ts b/packages/activitypub-core/src/endpoints/inbox/shouldForwardActivity.ts index 72bfc80f..d48fd043 100644 --- a/packages/activitypub-core/src/endpoints/inbox/shouldForwardActivity.ts +++ b/packages/activitypub-core/src/endpoints/inbox/shouldForwardActivity.ts @@ -1,5 +1,5 @@ import { DatabaseService } from '../../DatabaseService'; -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { getId } from '../../utilities/getId'; export async function shouldForwardActivity( diff --git a/packages/activitypub-core/src/endpoints/outbox/add.ts b/packages/activitypub-core/src/endpoints/outbox/add.ts index 10648b06..2627069c 100644 --- a/packages/activitypub-core/src/endpoints/outbox/add.ts +++ b/packages/activitypub-core/src/endpoints/outbox/add.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getId } from '../../utilities/getId'; diff --git a/packages/activitypub-core/src/endpoints/outbox/announce.ts b/packages/activitypub-core/src/endpoints/outbox/announce.ts index 92a30667..2ac0980b 100644 --- a/packages/activitypub-core/src/endpoints/outbox/announce.ts +++ b/packages/activitypub-core/src/endpoints/outbox/announce.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getId } from '../../utilities/getId'; diff --git a/packages/activitypub-core/src/endpoints/outbox/create.ts b/packages/activitypub-core/src/endpoints/outbox/create.ts index ef488a72..e2e9d647 100644 --- a/packages/activitypub-core/src/endpoints/outbox/create.ts +++ b/packages/activitypub-core/src/endpoints/outbox/create.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getTypedEntity } from '../../utilities/getTypedEntity'; import { LOCAL_DOMAIN } from '../../globals'; diff --git a/packages/activitypub-core/src/endpoints/outbox/delete.ts b/packages/activitypub-core/src/endpoints/outbox/delete.ts index 83f37256..8a0cd9f9 100644 --- a/packages/activitypub-core/src/endpoints/outbox/delete.ts +++ b/packages/activitypub-core/src/endpoints/outbox/delete.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getId } from '../../utilities/getId'; diff --git a/packages/activitypub-core/src/endpoints/outbox/index.ts b/packages/activitypub-core/src/endpoints/outbox/index.ts index c20c8edd..6eb578dc 100644 --- a/packages/activitypub-core/src/endpoints/outbox/index.ts +++ b/packages/activitypub-core/src/endpoints/outbox/index.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import type { NextPageContext } from 'next'; import { DatabaseService } from '../../DatabaseService'; import { LOCAL_DOMAIN } from '../../globals'; diff --git a/packages/activitypub-core/src/endpoints/outbox/like.ts b/packages/activitypub-core/src/endpoints/outbox/like.ts index 5348d9f1..8fb1e304 100644 --- a/packages/activitypub-core/src/endpoints/outbox/like.ts +++ b/packages/activitypub-core/src/endpoints/outbox/like.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getId } from '../../utilities/getId'; diff --git a/packages/activitypub-core/src/endpoints/outbox/remove.ts b/packages/activitypub-core/src/endpoints/outbox/remove.ts index 6ed09d11..cd348918 100644 --- a/packages/activitypub-core/src/endpoints/outbox/remove.ts +++ b/packages/activitypub-core/src/endpoints/outbox/remove.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getId } from '../../utilities/getId'; diff --git a/packages/activitypub-core/src/endpoints/outbox/update.ts b/packages/activitypub-core/src/endpoints/outbox/update.ts index 5db877ed..a1836888 100644 --- a/packages/activitypub-core/src/endpoints/outbox/update.ts +++ b/packages/activitypub-core/src/endpoints/outbox/update.ts @@ -1,4 +1,4 @@ -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { DatabaseService } from '../../DatabaseService'; import { getId } from '../../utilities/getId'; @@ -51,8 +51,8 @@ export async function handleUpdate( ...activity.object, ...(objectToUpdate.type !== 'Link' && objectToUpdate.type !== 'Mention' ? { - updated: new Date(), - } + updated: new Date(), + } : null), }; diff --git a/packages/activitypub-core/src/endpoints/sharedInbox/index.ts b/packages/activitypub-core/src/endpoints/sharedInbox/index.ts index 68da57ca..d3614653 100644 --- a/packages/activitypub-core/src/endpoints/sharedInbox/index.ts +++ b/packages/activitypub-core/src/endpoints/sharedInbox/index.ts @@ -1,6 +1,6 @@ import { NextApiRequest, NextApiResponse } from 'next'; import { DatabaseService } from '../../DatabaseService'; -import { AP } from '../../types'; +import { AP } from 'activitypub-core-types'; import { convertFromJsonLd } from '../../utilities/convertFromJsonLd'; import { getId } from '../../utilities/getId'; import { streamToString } from '../../utilities/streamToString'; diff --git a/packages/activitypub-core/src/endpoints/user/createServerActor.ts b/packages/activitypub-core/src/endpoints/user/createServerActor.ts index 4b67e74a..56b584c8 100644 --- a/packages/activitypub-core/src/endpoints/user/createServerActor.ts +++ b/packages/activitypub-core/src/endpoints/user/createServerActor.ts @@ -3,7 +3,7 @@ import { SERVER_ACTOR_USERNAME, SHARED_INBOX_ID, } from '../../globals'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { generateKeyPair } from '../../utilities/generateKeyPair'; import { DatabaseService } from '../../DatabaseService'; diff --git a/packages/activitypub-core/src/endpoints/user/createUserActor.ts b/packages/activitypub-core/src/endpoints/user/createUserActor.ts index 97db57c3..299d803e 100644 --- a/packages/activitypub-core/src/endpoints/user/createUserActor.ts +++ b/packages/activitypub-core/src/endpoints/user/createUserActor.ts @@ -2,7 +2,7 @@ import { getGuid } from '../../utilities/getGuid'; import { generateKeyPair } from '../../utilities/generateKeyPair'; import { LOCAL_DOMAIN, SERVER_ACTOR_ID, SHARED_INBOX_ID } from '../../globals'; import { DatabaseService } from '../../DatabaseService'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export async function createUserActor( databaseService: DatabaseService, diff --git a/packages/activitypub-core/src/endpoints/user/index.ts b/packages/activitypub-core/src/endpoints/user/index.ts index b93e8211..49e57ee7 100644 --- a/packages/activitypub-core/src/endpoints/user/index.ts +++ b/packages/activitypub-core/src/endpoints/user/index.ts @@ -4,7 +4,7 @@ import { AppOptions, ServiceAccount } from 'firebase-admin'; import { RESERVED_USERNAMES, SERVER_ACTOR_USERNAME } from '../../globals'; import { createServerActor } from './createServerActor'; import { createUserActor } from './createUserActor'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import type { IncomingMessage, ServerResponse } from 'http'; type Data = { diff --git a/packages/activitypub-core/src/utilities/addContext.ts b/packages/activitypub-core/src/utilities/addContext.ts index 22bcf302..57b6114a 100644 --- a/packages/activitypub-core/src/utilities/addContext.ts +++ b/packages/activitypub-core/src/utilities/addContext.ts @@ -1,5 +1,5 @@ import { ACTIVITYSTREAMS_CONTEXT, W3ID_SECURITY_CONTEXT } from '../globals'; -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export function addContext(entity: AP.Entity): AP.Entity & { '@context': unknown; diff --git a/packages/activitypub-core/src/utilities/cleanProps.ts b/packages/activitypub-core/src/utilities/cleanProps.ts index bcd78a1f..919d4b03 100644 --- a/packages/activitypub-core/src/utilities/cleanProps.ts +++ b/packages/activitypub-core/src/utilities/cleanProps.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { convertStringsToUrls } from './convertStringsToUrls'; export function cleanProps(entity: AP.Entity) { diff --git a/packages/activitypub-core/src/utilities/combineAddresses.ts b/packages/activitypub-core/src/utilities/combineAddresses.ts index 6e2483d1..b1f65f04 100644 --- a/packages/activitypub-core/src/utilities/combineAddresses.ts +++ b/packages/activitypub-core/src/utilities/combineAddresses.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; import { getId } from './getId'; export function combineAddresses(activity: AP.Activity): AP.Activity { diff --git a/packages/activitypub-core/src/utilities/compressEntity.ts b/packages/activitypub-core/src/utilities/compressEntity.ts index 88fa60d0..40148a21 100644 --- a/packages/activitypub-core/src/utilities/compressEntity.ts +++ b/packages/activitypub-core/src/utilities/compressEntity.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export function compressEntity( entity: AP.Entity, diff --git a/packages/activitypub-core/src/utilities/convertStringsToUrls.ts b/packages/activitypub-core/src/utilities/convertStringsToUrls.ts index 51b975df..26e41eac 100644 --- a/packages/activitypub-core/src/utilities/convertStringsToUrls.ts +++ b/packages/activitypub-core/src/utilities/convertStringsToUrls.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export function convertStringsToUrls(originalEntity: { [key: string]: unknown }): AP.Entity { const entity: { [key: string]: unknown } = { ...originalEntity }; diff --git a/packages/activitypub-core/src/utilities/convertUrlsToStrings.ts b/packages/activitypub-core/src/utilities/convertUrlsToStrings.ts index 56274dc7..e79b1b58 100644 --- a/packages/activitypub-core/src/utilities/convertUrlsToStrings.ts +++ b/packages/activitypub-core/src/utilities/convertUrlsToStrings.ts @@ -1,4 +1,4 @@ -import { AP } from "activitypub-core-types/src"; +import { AP } from 'activitypub-core-types'; import { stringify } from 'superjson'; export const convertUrlsToStrings = (entity: AP.Entity): AP.Entity => { diff --git a/packages/activitypub-core/src/utilities/getId.ts b/packages/activitypub-core/src/utilities/getId.ts index f2ebde89..bff256a3 100644 --- a/packages/activitypub-core/src/utilities/getId.ts +++ b/packages/activitypub-core/src/utilities/getId.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export const getId = ( entity?: undefined | null | AP.EntityReference | AP.EntityReference[], diff --git a/packages/activitypub-core/src/utilities/getTypedEntity.ts b/packages/activitypub-core/src/utilities/getTypedEntity.ts index 2b091fd6..62668f25 100644 --- a/packages/activitypub-core/src/utilities/getTypedEntity.ts +++ b/packages/activitypub-core/src/utilities/getTypedEntity.ts @@ -1,4 +1,4 @@ -import { AP } from 'activitypub-core-types/src'; +import { AP } from 'activitypub-core-types'; export const getTypedEntity = (entity: { type: string }) => { for (const linkType of Object.values(AP.LinkTypes)) { diff --git a/packages/activitypub-core/src/utilities/stringifyWithContext.ts b/packages/activitypub-core/src/utilities/stringifyWithContext.ts index 3b206df7..69bd22c1 100644 --- a/packages/activitypub-core/src/utilities/stringifyWithContext.ts +++ b/packages/activitypub-core/src/utilities/stringifyWithContext.ts @@ -1,4 +1,4 @@ -import { AP } from "activitypub-core-types/src"; +import { AP } from 'activitypub-core-types'; import { addContext } from "./addContext"; import { cleanProps } from "./cleanProps"; import { convertUrlsToStrings } from "./convertUrlsToStrings";