polfan-server-js-client 0.1.99925 → 0.1.99926

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

package/.idea/php.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="highlightLevel" value="WARNING" />
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+</project>

package/.idea/workspace.xml

@@ -4,7 +4,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="831dae43-0da1-47fd-a5f7-33dd5eec2992" name="Changes" comment="Emoticon permissions support" />
+    <list default="true" id="831dae43-0da1-47fd-a5f7-33dd5eec2992" name="Changes" comment="Emoticon permissions support">
+      <change afterPath="$PROJECT_DIR$/src/types/src/schemes/PermissionOverwritesTarget.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/state-tracker/PermissionsManager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/state-tracker/PermissionsManager.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/types" beforeDir="false" afterPath="$PROJECT_DIR$/src/types" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/types/src/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/index.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/types/src/schemes/commands/GetPermissionOverwrites.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/schemes/commands/GetPermissionOverwrites.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/types/src/schemes/commands/SetPermissionOverwrites.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/schemes/commands/SetPermissionOverwrites.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/types/src/schemes/events/PermissionOverwrites.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/schemes/events/PermissionOverwrites.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/types/src/schemes/events/PermissionOverwritesUpdated.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/schemes/events/PermissionOverwritesUpdated.ts" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -25,9 +35,9 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="ROOT_SYNC" value="DONT_SYNC" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 5
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 5
+}</component>
   <component name="ProjectId" id="2sDo2WKPRcvk6nDGnMA2OIWpAcR" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -65,7 +75,9 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1737999300590</updated>
-      <workItem from="1737999301306" duration="8717000" />
+      <workItem from="1737999301306" duration="16008000" />
+      <workItem from="1738661852731" duration="2057000" />
+      <workItem from="1738919042657" duration="2954000" />
     </task>
     <task id="LOCAL-00001" summary="Emoticons objects">
       <option name="closed" value="true" />
@@ -147,7 +159,15 @@
       <option name="project" value="LOCAL" />
       <updated>1738413231680</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="Emoticon permissions support">
+      <option name="closed" value="true" />
+      <created>1738413358814</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1738413358814</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

package/build/index.js

@@ -3075,12 +3075,11 @@ function PermissionsManager_toPrimitive(input, hint) { if (PermissionsManager_ty
 
 
 
-var getOvId = function getOvId(location, target, targetId) {
-  var _location$spaceId, _location$roomId, _location$topicId;
-  return ((_location$spaceId = location.spaceId) !== null && _location$spaceId !== void 0 ? _location$spaceId : '') + ((_location$roomId = location.roomId) !== null && _location$roomId !== void 0 ? _location$roomId : '') + ((_location$topicId = location.topicId) !== null && _location$topicId !== void 0 ? _location$topicId : '') + (target !== null && target !== void 0 ? target : '') + (targetId !== null && targetId !== void 0 ? targetId : '');
+var getOvId = function getOvId(location, target) {
+  return [location.spaceId, location.roomId, location.topicId, target.type, target.userId, target.roleId].filter(Boolean).join('/');
 };
 var getOvIdByObject = function getOvIdByObject(overwrites) {
-  return getOvId(overwrites.location, overwrites.target, overwrites.targetId);
+  return getOvId(overwrites.location, overwrites.target);
 };
 var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
   PermissionsManager_inherits(PermissionsManager, _EventTarget);
@@ -3130,7 +3129,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
   PermissionsManager_createClass(PermissionsManager, [{
     key: "getOverwrites",
     value: function () {
-      var _getOverwrites = PermissionsManager_asyncToGenerator( /*#__PURE__*/PermissionsManager_regeneratorRuntime().mark(function _callee2(location, target, targetId) {
+      var _getOverwrites = PermissionsManager_asyncToGenerator( /*#__PURE__*/PermissionsManager_regeneratorRuntime().mark(function _callee2(location, target) {
         var _this2 = this;
         var id;
         return PermissionsManager_regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -3138,7 +3137,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 this.validateLocation(location);
-                id = getOvId(location, target, targetId);
+                id = getOvId(location, target);
                 if (this.overwritesPromises.notExist(id)) {
                   this.overwritesPromises.registerByFunction( /*#__PURE__*/PermissionsManager_asyncToGenerator( /*#__PURE__*/PermissionsManager_regeneratorRuntime().mark(function _callee() {
                     var result;
@@ -3149,8 +3148,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
                             _context.next = 2;
                             return _this2.tracker.client.send('GetPermissionOverwrites', {
                               location: location,
-                              target: target,
-                              targetId: targetId
+                              target: target
                             });
                           case 2:
                             result = _context.sent;
@@ -3180,7 +3178,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
           }
         }, _callee2, this);
       }));
-      function getOverwrites(_x, _x2, _x3) {
+      function getOverwrites(_x, _x2) {
         return _getOverwrites.apply(this, arguments);
       }
       return getOverwrites;
@@ -3228,7 +3226,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
           }
         }, _callee3, this);
       }));
-      function check(_x4, _x5) {
+      function check(_x3, _x4) {
         return _check.apply(this, arguments);
       }
       return check;
@@ -3258,7 +3256,10 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
                 userRoles = [].concat(PermissionsManager_toConsumableArray((_spaceMember$roles = spaceMember === null || spaceMember === void 0 ? void 0 : spaceMember.roles) !== null && _spaceMember$roles !== void 0 ? _spaceMember$roles : []), PermissionsManager_toConsumableArray((_roomMember$roles = roomMember === null || roomMember === void 0 ? void 0 : roomMember.roles) !== null && _roomMember$roles !== void 0 ? _roomMember$roles : []));
                 promises = [
                 // Global user overwrites
-                this.getOverwrites({}, 'User', userId).then(function (v) {
+                this.getOverwrites({}, {
+                  type: 'User',
+                  userId: userId
+                }).then(function (v) {
                   return v.overwrites;
                 })];
                 _context4.t0 = location.spaceId;
@@ -3294,7 +3295,10 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
                   spaceId: location.spaceId
                 };
                 promises.push(this.collectRoleOverwrites(filterLocation, userRoles));
-                promises.push(this.getOverwrites(filterLocation, 'User', userId).then(function (v) {
+                promises.push(this.getOverwrites(filterLocation, {
+                  type: 'User',
+                  userId: userId
+                }).then(function (v) {
                   return v.overwrites;
                 }));
               case 28:
@@ -3334,7 +3338,10 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
                 if (userRoles.length) {
                   promises.push(this.collectRoleOverwrites(_filterLocation, userRoles));
                 }
-                promises.push(this.getOverwrites(_filterLocation, 'User', userId).then(function (v) {
+                promises.push(this.getOverwrites(_filterLocation, {
+                  type: 'User',
+                  userId: userId
+                }).then(function (v) {
                   return v.overwrites;
                 }));
               case 44:
@@ -3370,7 +3377,10 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
                 if (userRoles.length) {
                   promises.push(this.collectRoleOverwrites(location, userRoles));
                 }
-                promises.push(this.getOverwrites(location, 'User', userId).then(function (v) {
+                promises.push(this.getOverwrites(location, {
+                  type: 'User',
+                  userId: userId
+                }).then(function (v) {
                   return v.overwrites;
                 }));
               case 59:
@@ -3387,7 +3397,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
           }
         }, _callee4, this);
       }));
-      function calculatePermissions(_x6) {
+      function calculatePermissions(_x5) {
         return _calculatePermissions.apply(this, arguments);
       }
       return calculatePermissions;
@@ -3434,7 +3444,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
           }
         }, _callee5, this);
       }));
-      function handleRoomDeleted(_x7) {
+      function handleRoomDeleted(_x6) {
         return _handleRoomDeleted.apply(this, arguments);
       }
       return handleRoomDeleted;
@@ -3452,7 +3462,10 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
       var _this$overwritesPromi4;
       var ids = this.deleteOverwritesByIdPrefix(getOvId({
         spaceId: ev.spaceId
-      }, 'Role', ev.id));
+      }, {
+        type: 'Role',
+        roleId: ev.id
+      }));
       (_this$overwritesPromi4 = this.overwritesPromises).forget.apply(_this$overwritesPromi4, PermissionsManager_toConsumableArray(ids));
     }
   }, {
@@ -3503,7 +3516,10 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
               case 0:
                 _context6.next = 2;
                 return Promise.all(userRoles.map(function (roleId) {
-                  return _this4.getOverwrites(location, 'Role', roleId);
+                  return _this4.getOverwrites(location, {
+                    type: 'Role',
+                    roleId: roleId
+                  });
                 }));
               case 2:
                 roleOverwrites = _context6.sent;
@@ -3515,7 +3531,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
           }
         }, _callee6, this);
       }));
-      function collectRoleOverwrites(_x8, _x9) {
+      function collectRoleOverwrites(_x7, _x8) {
         return _collectRoleOverwrites.apply(this, arguments);
       }
       return collectRoleOverwrites;
@@ -3535,7 +3551,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
               case 3:
                 roles = _context7.sent;
                 sortedOverwrites = overwrites.sort(function (a, b) {
-                  return roles.get(a.targetId).priority - roles.get(b.targetId).priority;
+                  return roles.get(a.target.roleId).priority - roles.get(b.target.roleId).priority;
                 }); // Max length of bit word
                 permissionsLength = overwrites.reduce(function (previousValue, currentValue) {
                   var _currentValue$overwri, _currentValue$overwri2, _currentValue$overwri3, _currentValue$overwri4;
@@ -3569,7 +3585,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
           }
         }, _callee7, this);
       }));
-      function resolveOverwritesFromRolesByOrder(_x10, _x11) {
+      function resolveOverwritesFromRolesByOrder(_x9, _x10) {
         return _resolveOverwritesFromRolesByOrder.apply(this, arguments);
       }
       return resolveOverwritesFromRolesByOrder;
@@ -3643,7 +3659,7 @@ var PermissionsManager = /*#__PURE__*/function (_EventTarget) {
           }
         }, _callee8, this);
       }));
-      function fetchMembersOrFail(_x12) {
+      function fetchMembersOrFail(_x11) {
         return _fetchMembersOrFail.apply(this, arguments);
       }
       return fetchMembersOrFail;