nsarchive 1.1.7__py3-none-any.whl → 1.2.0__py3-none-any.whl

nsarchive/__init__.py

@@ -56,7 +56,7 @@ class EntityInstance:
 
             entity.xp = _data['xp']
             entity.boosts = _data['boosts']
-            
+
             if _votes is None:
                 entity.votes = []
             else:
@@ -65,14 +65,28 @@ class EntityInstance:
             entity = Organization(id)
 
             entity.owner = self.get_entity(NSID(_data['owner_id']))
-            
+
             for _member in _data['members']:
                 member = GroupMember(_member['id'])
-                member.permissions.__dict__ = _member['permissions']
+                member.group_permissions.__dict__ = _member['permissions']
+
+                _member_profile = self.get_entity(member.id)
+
+                member.set_name(_member_profile.name)
+                member.legalPosition = _member_profile.legalPosition
+                member.registerDate = _member_profile.registerDate
+
+                member.xp = _member_profile.xp
+                member.boosts = _member_profile.boosts
+
+                member.permissions = _member_profile.permissions
+                member.votes = _member_profile.votes
+
+                entity.append(member)
 
             try:
                 entity.avatar = self.avatars.get(id).read()
-            except: 
+            except:
                 entity.avatar = None
 
             entity.certifications = _data['certifications']
@@ -126,7 +140,8 @@ class EntityInstance:
             for vote in entity.votes:
                 _votes.append(NSID(vote))
 
-        self.electors.put({ "votes": _votes }, entity.id, expire_in = 112 * 84600) # Données supprimées après 16 semaines d'inactivité
+            self.electors.put({ "votes": _votes }, entity.id, expire_in = 112 * 84600) # Données supprimées après 16 semaines d'inactivité
+
         _base.put(_data, entity.id, expire_in = 3 * 31536000) # Pareil après 3 ans
 
     def delete_entity(self, entity: Entity) -> None:

nsarchive/cls/entities.py

@@ -99,11 +99,12 @@ class MemberPermissions:
         for perm in permissions.values():
             self.__setattr__(*perm)
 
-class GroupMember():
+class GroupMember(User):
     def __init__(self, id: str | NSID) -> None:
-        self.id: NSID = NSID(id)
-        self.permissions: MemberPermissions = MemberPermissions()
-        self.position: str = 'membre'
+        super().__init__(id)
+
+        self.group_permissions: MemberPermissions = MemberPermissions()
+        self.group_position: str = 'membre'
 
 class Official:
     def __init__(self, id: str | NSID) -> None:
@@ -137,11 +138,15 @@ class Organization(Entity):
         self.certifications[certif] = round(time.time())
 
     def add_member(self, member: GroupMember) -> None:
+        if not isinstance(member, GroupMember):
+            raise TypeError("Le membre doit être de type GroupMember")
+        
         self.members.append(member)
 
     def remove_member(self, member: GroupMember) -> None:
-        if member in self.members:
-            self.members.remove(member)
+        for _member in self.members:
+            if _member.id == member.id:
+                self.members.remove(_member)
 
     def set_owner(self, member: User) -> None:
         self.owner = member

{nsarchive-1.1.7.dist-info → nsarchive-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsarchive
-Version: 1.1.7
+Version: 1.2.0
 Summary: 
 License: GPL-3.0
 Author: happex

{nsarchive-1.1.7.dist-info → nsarchive-1.2.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
-nsarchive/__init__.py,sha256=HYV9gnAlM6EXu8DnF7L0c_T2FY7gl49JisrBtqQvUKA,24694
+nsarchive/__init__.py,sha256=WaRNIlNiko1r3IuJtGmVKcWWKsW0CeqhIdnoHkIU474,25209
 nsarchive/assets/default_avatar.png,sha256=n-4vG_WPke8LvbY3ZU6oA-H-OtRoIu7woKnRq9DCIlI,51764
 nsarchive/cls/archives.py,sha256=Nmt3C0Zq9oGQdCXSzm_wo70VbNq89SY3dx9KKqEpoCg,2182
 nsarchive/cls/base.py,sha256=z7NTvrtbeaUF1T_o-J7PL2N8axkmJek9EoKcQ8fTF9I,715
 nsarchive/cls/economy.py,sha256=RjFu3VzNunazslbd4Ia5p1Jr-jJP5CvIcbVOzkDTwTU,549
-nsarchive/cls/entities.py,sha256=o5_zqkRFuXBF6zuFDsuOI8g0dxoL6rG2EUa0hj-lAhE,5816
+nsarchive/cls/entities.py,sha256=LcL0Ky19lqYQdnYqtF_84-CdlVS1sie05l8vV2yJLyw,6010
 nsarchive/cls/exceptions.py,sha256=QN6Qn7cxTkGoC4lO50hBAq4gZCgo7scQvCkb-xKl6Xs,692
 nsarchive/cls/republic.py,sha256=6eut6OsFoOm9TVhA41fM3NlMEA3Uhg9TCuXgl46vFko,1985
 nsarchive/utils/assets.py,sha256=hd0STSpa0yT-OJlUyI_wCYXJqcBiUMQds2pZTXNNg9c,382
-nsarchive-1.1.7.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
-nsarchive-1.1.7.dist-info/METADATA,sha256=aGll_1Ks4q0E4jrMP-fRw-YrXwhlvrtj5LoeZvZn_nU,5629
-nsarchive-1.1.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nsarchive-1.1.7.dist-info/RECORD,,
+nsarchive-1.2.0.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
+nsarchive-1.2.0.dist-info/METADATA,sha256=UYjUtZxdeV0JBDH6wFFSUm8IhiXgPopShAoPDQKP_qI,5629
+nsarchive-1.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nsarchive-1.2.0.dist-info/RECORD,,