nsarchive 0.1b0__py3-none-any.whl → 0.1b2__py3-none-any.whl

nsarchive/__init__.py

@@ -33,9 +33,10 @@ class EntityInstance:
             entity = Organization(id)
 
             entity.owner = self.get_entity(_data['owner_id'].upper())
-            entity.members = [
-                self.get_entity(_id) for _id in _data['members']
-            ]
+            
+            for _member in _data['members']:
+                member = GroupMember(_member['id'])
+                member.permissions.__dict__ = _member['permissions']
 
             entity.avatar = self.avatars.get(id).read()
 
@@ -60,9 +61,17 @@ class EntityInstance:
 
         if type(entity) == Organization:
             _data['owner_id'] = entity.owner.id.upper() if entity.owner else "0"
-            _data['members'] = [ member.id.upper() for member in entity.members ] if entity.members else []
+            _data['members'] = []
             _data['certifications'] = entity.certifications
 
+            for member in entity.members:
+                _member = {
+                    'id': member.id,
+                    'permissions': member.permissions.__dict__.copy()
+                }
+
+                _data['members'] += _member                
+
             self.avatars.put(name = entity.id, data = entity.avatar)
         elif type(entity) == User:
             _data['xp'] = entity.xp
@@ -205,8 +214,8 @@ class RepublicInstance:
         archives = self.mandate if current_mandate else self.archives
 
         _contributions = archives.fetch({'author': id, 'type': 'contrib'}).items
-        _mandates = archives.fetch({'target': id, 'type': 'election'}).items()\
-                    + archives.fetch({'target': id, 'type': 'promotion'}).items()
+        _mandates = archives.fetch({'target': id, 'type': 'election'}).items\
+                    + archives.fetch({'target': id, 'type': 'promotion'}).items
 
         user = FunctionalUser(id)
         for mandate in _mandates:
@@ -283,7 +292,7 @@ class RepublicInstance:
         self.functions.put(key = 'MIN_OUT', data = { 'users': [ institutions.government.outer_minister.id ] })
 
     def new_mandate(self, institutions: Institutions, weeks: int = 4):
-        for item in self.mandate.fetch().items():
+        for item in self.mandate.fetch().items:
             if item['date'] >= round(time.time()) - weeks * 604800:
                 self.mandate.delete(item['id'])
         

nsarchive/cls/entities.py

@@ -56,11 +56,11 @@ class MemberPermissions:
         for perm in permissions.values():
             self.__setattr__(*perm)
 
-class GroupMember(User):
+class GroupMember():
     def __init__(self, id: str) -> None:
-        super().__init__(id)
-
+        self.id = id
         self.permissions: MemberPermissions = MemberPermissions()
+        self.position: str = 'membre'
 
 class FunctionalUser:
     def __init__(self, id: str) -> None:

{nsarchive-0.1b0.dist-info → nsarchive-0.1b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsarchive
-Version: 0.1b0
+Version: 0.1b2
 Summary: 
 License: GPL-3.0
 Author: happex
@@ -11,6 +11,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Requires-Dist: deta (>=1.2,<2.0)
+Requires-Dist: pillow (>=10.4,<11.0)
 Description-Content-Type: text/markdown
 
 # nsarchive

{nsarchive-0.1b0.dist-info → nsarchive-0.1b2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-nsarchive/__init__.py,sha256=Y-I47MuPc8FIHIhvt8RZ-t5TXAi7APD0XlfEjqevfjk,15273
+nsarchive/__init__.py,sha256=bZvn2TDKBxMmPst7PJY8SqYIYUxRTeDA6QLDI7JJpss,15528
 nsarchive/assets/default_avatar.png,sha256=n-4vG_WPke8LvbY3ZU6oA-H-OtRoIu7woKnRq9DCIlI,51764
 nsarchive/cls/archives.py,sha256=5C66pXuXAANRXNDqNTvIepRtUrXIWOL7ymmYiBHsHAY,1720
 nsarchive/cls/bank.py,sha256=OactEpRn8PGv7BwnBUbMpzgHqrvv4yx526AMzh9uBO8,220
-nsarchive/cls/entities.py,sha256=u5u46HzHJp2H_DngLALLgedHaLXlJpjhmxU_Ggozp3Q,3474
+nsarchive/cls/entities.py,sha256=Gv6nNEmLXyUokQfoQgNUIjq0kLTTlPT0Wmdpw83z7gY,3499
 nsarchive/cls/exceptions.py,sha256=UZ7G7AFUN5OkKAGpNl1OT7jauF1jC7WW8wWXVFt5sMs,539
 nsarchive/cls/republic.py,sha256=aY79B5PZF5IErwzEjn9ito6T8gXA4trm6LmIeYu6XLM,1821
 nsarchive/utils/assets.py,sha256=hd0STSpa0yT-OJlUyI_wCYXJqcBiUMQds2pZTXNNg9c,382
-nsarchive-0.1b0.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
-nsarchive-0.1b0.dist-info/METADATA,sha256=rvpiq-iES71BGQ2r4pUmSPeItUkt0KW6u-XqZExWNXk,5559
-nsarchive-0.1b0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nsarchive-0.1b0.dist-info/RECORD,,
+nsarchive-0.1b2.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
+nsarchive-0.1b2.dist-info/METADATA,sha256=EXX1Thjma4a5aH4IZIVO5yKb3qexLml59ryC_C8YOj8,5629
+nsarchive-0.1b2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nsarchive-0.1b2.dist-info/RECORD,,