@dcl/content-validator 2.0.1-20220617180237.commit-003ca41 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/validations/access-checker/profiles.d.ts.map +1 -1
- package/dist/validations/access-checker/profiles.js +2 -2
- package/dist/validations/access-checker/profiles.js.map +1 -1
- package/dist/validations/profile.d.ts +1 -0
- package/dist/validations/profile.d.ts.map +1 -1
- package/dist/validations/profile.js +4 -3
- package/dist/validations/profile.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../../../src/validations/access-checker/profiles.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,UAAU,EAAoB,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../../../src/validations/access-checker/profiles.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,UAAU,EAAoB,MAAM,aAAa,CAAA;AAM9D;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,UA4DtB,CAAA"}
|
|
@@ -5,6 +5,7 @@ const schemas_1 = require("@dcl/schemas");
|
|
|
5
5
|
const types_1 = require("../../types");
|
|
6
6
|
const urn_resolver_1 = require("@dcl/urn-resolver");
|
|
7
7
|
const index_1 = require("../index");
|
|
8
|
+
const profile_1 = require("../profile");
|
|
8
9
|
/**
|
|
9
10
|
* Validate that the pointers are valid, and that the Ethereum address has write access to them
|
|
10
11
|
* @public
|
|
@@ -45,7 +46,6 @@ const allClaimedNames = (entity) => entity.metadata.avatars
|
|
|
45
46
|
.map((avatar) => avatar.name)
|
|
46
47
|
.filter((name) => name && name.trim().length > 0);
|
|
47
48
|
const isBaseAvatar = (wearable) => wearable.includes('base-avatars');
|
|
48
|
-
const isOldEmote = (wearable) => /^[a-z]+$/i.test(wearable);
|
|
49
49
|
const translateWearablesIdFormat = async (wearableId) => {
|
|
50
50
|
if (!wearableId.startsWith('dcl://')) {
|
|
51
51
|
return wearableId;
|
|
@@ -57,7 +57,7 @@ const allWearablesUrns = async (entity) => {
|
|
|
57
57
|
const allWearablesInProfilePromises = [];
|
|
58
58
|
for (const avatar of entity.metadata.avatars) {
|
|
59
59
|
for (const wearableId of avatar.avatar.wearables) {
|
|
60
|
-
if (!isBaseAvatar(wearableId) && !isOldEmote(wearableId)) {
|
|
60
|
+
if (!isBaseAvatar(wearableId) && !(0, profile_1.isOldEmote)(wearableId)) {
|
|
61
61
|
allWearablesInProfilePromises.push(translateWearablesIdFormat(wearableId));
|
|
62
62
|
}
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../../src/validations/access-checker/profiles.ts"],"names":[],"mappings":";;;AAAA,0CAAiD;AACjD,uCAA8D;AAC9D,oDAA4C;AAE5C,oCAA2C;
|
|
1
|
+
{"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../../src/validations/access-checker/profiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":"AAGA,OAAO,EAAM,UAAU,EAAoB,MAAM,UAAU,CAAA;AAM3D,eAAO,MAAM,aAAa,EAAE,UAmD3B,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":"AAGA,OAAO,EAAM,UAAU,EAAoB,MAAM,UAAU,CAAA;AAM3D,eAAO,MAAM,UAAU,aAAc,MAAM,KAAG,OAClB,CAAA;AAE5B,eAAO,MAAM,aAAa,EAAE,UAmD3B,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,UAkB1B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,OAAO,EAAE,UAMrB,CAAA"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.profile = exports.wearableUrns = exports.faceThumbnail = void 0;
|
|
6
|
+
exports.profile = exports.wearableUrns = exports.faceThumbnail = exports.isOldEmote = void 0;
|
|
7
7
|
const schemas_1 = require("@dcl/schemas");
|
|
8
8
|
const sharp_1 = __importDefault(require("sharp"));
|
|
9
9
|
const _1 = require(".");
|
|
@@ -11,6 +11,8 @@ const types_1 = require("../types");
|
|
|
11
11
|
const urn_resolver_1 = require("@dcl/urn-resolver");
|
|
12
12
|
/** Validate that given profile deployment includes a face256 thumbnail with valid size */
|
|
13
13
|
const defaultThumbnailSize = 256;
|
|
14
|
+
const isOldEmote = (wearable) => /^[a-z]+$/i.test(wearable);
|
|
15
|
+
exports.isOldEmote = isOldEmote;
|
|
14
16
|
exports.faceThumbnail = {
|
|
15
17
|
validate: async ({ externalCalls }, deployment) => {
|
|
16
18
|
if (deployment.entity.timestamp < _1.ADR_45_TIMESTAMP)
|
|
@@ -52,11 +54,10 @@ exports.wearableUrns = {
|
|
|
52
54
|
validate: async (components, deployment) => {
|
|
53
55
|
if (deployment.entity.timestamp < _1.ADR_75_TIMESTAMP)
|
|
54
56
|
return types_1.OK;
|
|
55
|
-
const isOldEmote = (wearable) => /^[a-z]+$/i.test(wearable);
|
|
56
57
|
const allAvatars = deployment.entity.metadata?.avatars ?? [];
|
|
57
58
|
for (const avatar of allAvatars) {
|
|
58
59
|
for (const pointer of avatar.avatar.wearables) {
|
|
59
|
-
if (isOldEmote(pointer))
|
|
60
|
+
if ((0, exports.isOldEmote)(pointer))
|
|
60
61
|
continue;
|
|
61
62
|
const parsed = await (0, urn_resolver_1.parseUrn)(pointer);
|
|
62
63
|
if (!parsed)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAyC;AACzC,kDAAyB;AACzB,wBAAqE;AACrE,oCAA2D;AAC3D,oDAA4C;AAE5C,0FAA0F;AAC1F,MAAM,oBAAoB,GAAG,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/content-validator",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "Catalyst content validations",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"files": [
|
|
60
60
|
"dist"
|
|
61
61
|
],
|
|
62
|
-
"commit": "
|
|
62
|
+
"commit": "ef47fea4635fe429aae20445e4adb1c351a9df36"
|
|
63
63
|
}
|