diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..f775ec646 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +@transfem-org:registry=https://activitypub.software/api/v4/packages/npm/ diff --git a/packages/pl-api/lib/entities/status.ts b/packages/pl-api/lib/entities/status.ts index eecac5ae7..d10a5f5b6 100644 --- a/packages/pl-api/lib/entities/status.ts +++ b/packages/pl-api/lib/entities/status.ts @@ -65,11 +65,11 @@ const baseStatusSchema = v.object({ language: v.fallback(v.nullable(v.string()), null), text: v.fallback(v.nullable(v.string()), null), edited_at: v.fallback(v.nullable(datetimeSchema), null), - favourited: v.pipe(v.unknown(), v.transform(Boolean)), - reblogged: v.pipe(v.unknown(), v.transform(Boolean)), - muted: v.pipe(v.unknown(), v.transform(Boolean)), - bookmarked: v.pipe(v.unknown(), v.transform(Boolean)), - pinned: v.pipe(v.unknown(), v.transform(Boolean)), + favourited: v.fallback(v.pipe(v.unknown(), v.transform(Boolean)), false), + reblogged: v.fallback(v.pipe(v.unknown(), v.transform(Boolean)), false), + muted: v.fallback(v.pipe(v.unknown(), v.transform(Boolean)), false), + bookmarked: v.fallback(v.pipe(v.unknown(), v.transform(Boolean)), false), + pinned: v.fallback(v.pipe(v.unknown(), v.transform(Boolean)), false), filtered: filteredArray(filterResultSchema), approval_status: v.fallback(v.nullable(v.picklist(['pending', 'approval', 'rejected'])), null), group: v.fallback(v.nullable(groupSchema), null), @@ -103,6 +103,8 @@ const baseStatusSchema = v.object({ disliked: v.fallback(v.pipe(v.unknown(), v.transform(Boolean)), false), interaction_policy: interactionPolicySchema, + + content_type: v.fallback(v.nullable(v.string()), null), }); const preprocess = (status: any) => { diff --git a/packages/pl-api/package.json b/packages/pl-api/package.json index b457e2c92..832163e1c 100644 --- a/packages/pl-api/package.json +++ b/packages/pl-api/package.json @@ -1,6 +1,6 @@ { "name": "pl-api", - "version": "1.0.0-rc.67", + "version": "1.0.0-rc.68", "type": "module", "homepage": "https://github.com/mkljczk/pl-fe/tree/develop/packages/pl-api", "repository": { diff --git a/packages/pl-fe/package.json b/packages/pl-fe/package.json index 2e1a72ff0..ec1fb103e 100644 --- a/packages/pl-fe/package.json +++ b/packages/pl-fe/package.json @@ -68,6 +68,7 @@ "@tailwindcss/typography": "^0.5.16", "@tanstack/react-query": "^5.62.11", "@tanstack/react-virtual": "^3.13.0", + "@transfem-org/sfm-js": "^0.24.6", "@twemoji/svg": "^15.0.0", "@uidotdev/usehooks": "^2.4.1", "@vitejs/plugin-react": "^4.3.4", @@ -104,7 +105,7 @@ "multiselect-react-dropdown": "^2.0.25", "mutative": "^1.1.0", "path-browserify": "^1.0.1", - "pl-api": "^1.0.0-rc.67", + "pl-api": "^1.0.0-rc.68", "postcss": "^8.5.3", "process": "^0.11.10", "punycode": "^2.1.1", diff --git a/packages/pl-fe/yarn.lock b/packages/pl-fe/yarn.lock index 353cd62d1..1546e44a4 100644 --- a/packages/pl-fe/yarn.lock +++ b/packages/pl-fe/yarn.lock @@ -2340,11 +2340,23 @@ resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd" integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ== +"@transfem-org/sfm-js@^0.24.6": + version "0.24.6" + resolved "https://activitypub.software/api/v4/projects/2/packages/npm/@transfem-org/sfm-js/-/@transfem-org/sfm-js-0.24.6.tgz#eedf939027773d993e45b6eb19b67f88cb36cbba" + integrity sha1-7t+TkCd3PZk+RbbrGbZ/iMs2y7o= + dependencies: + "@twemoji/parser" "15.0.0" + "@trysound/sax@0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== +"@twemoji/parser@15.0.0": + version "15.0.0" + resolved "https://registry.yarnpkg.com/@twemoji/parser/-/parser-15.0.0.tgz#8ae9749659ef524b5f0e6ee1412d0e48865e77bf" + integrity sha512-lh9515BNsvKSNvyUqbj5yFu83iIDQ77SwVcsN/SnEGawczhsKU6qWuogewN1GweTi5Imo5ToQ9s+nNTf97IXvg== + "@twemoji/svg@^15.0.0": version "15.0.0" resolved "https://registry.yarnpkg.com/@twemoji/svg/-/svg-15.0.0.tgz#0e3828c654726f1848fe11f31ef4e8a75854cc7f" @@ -6863,10 +6875,10 @@ pkg-dir@^4.1.0: dependencies: find-up "^4.0.0" -pl-api@^1.0.0-rc.67: - version "1.0.0-rc.67" - resolved "https://registry.yarnpkg.com/pl-api/-/pl-api-1.0.0-rc.67.tgz#e1a98e7f94bcedef7f0cf89295b917f2050ca42e" - integrity sha512-IrAVsUMuY/vhye8jPYQuHtyycexfheU6hj1ithFYyVhOfoctqkNACVQ8WpvPRXh68T+0o+uASMhzRFvdVDSLnA== +pl-api@^1.0.0-rc.68: + version "1.0.0-rc.68" + resolved "https://registry.yarnpkg.com/pl-api/-/pl-api-1.0.0-rc.68.tgz#c334e710e349403bebcd89e42dbc87efc0b4d612" + integrity sha512-CMSlxTsKL965J03Y4OfwQq/uV4hSh/daBcsVw2Tzx0KTtR/nnUE+hwfw0E0PypMFxZojPuZEGbxpuoT1JXgPSQ== dependencies: blurhash "^2.0.5" http-link-header "^1.1.3"