nsarchive 3.0.0a2__tar.gz → 3.0.0a3__tar.gz

{nsarchive-3.0.0a2 → nsarchive-3.0.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsarchive
-Version: 3.0.0a2
+Version: 3.0.0a3
 Summary: API-wrapper pour récupérer des données liées à Nation
 License: GPL-3.0
 Author: happex

{nsarchive-3.0.0a2 → nsarchive-3.0.0a3}/nsarchive/__init__.py

@@ -1,7 +1,7 @@
 """
 nsarchive - API-wrapper pour récupérer des données liées à Nation.
 
-Version: 3.0.0a2
+Version: 3.0.0a3
 License: GPL-3.0
 Auteur : happex <110610727+okayhappex@users.noreply.github.com>
 

{nsarchive-3.0.0a2 → nsarchive-3.0.0a3}/nsarchive/cls/entities.py

@@ -1,7 +1,8 @@
 import requests
 import time
 import typing
-import urllib.parse
+import urllib
+import warnings
 
 from .base import NSID
 
@@ -37,6 +38,7 @@ class PositionPermissions:
         self.items = Permission("---r") # APPEND = vendre, MANAGE = gérer des items dont on n'est pas propriétaire (hors marketplace), EDIT = gérer des items dont on n'est pas propriétaire (dans le marketplace), READ = accéder au marketplace
         self.laws = Permission() # APPEND = proposer un texte de loi, MANAGE = accepter ou refuser une proposition, EDIT = modifier un texte, READ = /
         self.members = Permission("---r") # APPEND = créer des entités, MANAGE = modérer des entités (hors Discord), EDIT = modifier des entités, READ = voir le profil des entités
+        self.money = Permission("---r") # APPEND = créer des entités, MANAGE = modérer des entités (hors Discord), EDIT = modifier des entités, READ = voir le profil des entités
         self.national_channel = Permission() # APPEND = prendre la parole sur la chaîne nationale, MANAGE = voir qui peut prendre la parole, EDIT = modifier le planning de la chaîne nationale, READ = /
         self.organizations = Permission("---r") # APPEND = créer une nouvelle organisation, MANAGE = exécuter des actions administratives sur les organisations, EDIT = modifier des organisations, READ = voir le profil de n'importe quelle organisation
         self.reports = Permission() # APPEND = déposer plainte, MANAGE = accépter ou refuser une plainte, EDIT = /, READ = accéder à des infos supplémentaires pour une plainte
@@ -170,7 +172,13 @@ class User(Entity):
 
         self.xp: int = 0
         self.boosts: dict[str, int] = {}
-        self.groups: list[NSID] = []
+        self.votes: list[NSID] = []
+
+    def _load(self, _data: dict):
+        self.xp = _data['xp']
+        self.boosts = _data['boosts']
+
+        self.votes = [ NSID(vote) for vote in _data['votes'] ]
 
     def get_level(self) -> None:
         i = 0
@@ -255,37 +263,6 @@ class GroupInvite:
         self.level: str = 0
         self._expires: int = round(time.time()) + 604800
 
-class Share:
-    """
-    Action d'une entreprise
-
-    ## Attributs
-    - owner: `NSID`\n
-        Identifiant du titulaire de l'action
-    - price: `int`\n
-        Prix de l'action
-    """
-
-    def __getstate__(self) -> dict:
-        return {
-            "owner": self.owner,
-            "price": self.price
-        }
-
-    def __setstate__(self, state: dict):
-        self.owner: NSID = state['owner']
-        self.price: int = state['price']
-
-    def __init__(self, owner: NSID = NSID(0x0), price: int = 10):
-        self.owner: NSID = owner
-        self.price: int = price
-
-    def assign_owner(self, owner: NSID):
-        self.owner = owner
-
-    def set_price(self, price: int):
-        self.price = price
-
 class Organization(Entity):
     """
     Entité collective
@@ -314,7 +291,21 @@ class Organization(Entity):
         self.members: list[GroupMember] = []
         self.invites: dict[GroupInvite] = []
 
-        self.parts: list[Share] = 50 * [ Share(self.owner.id, 0) ]
+    def _load(self, _data: dict):
+        res = requests.get(f"{self._url}/avatar")
+
+        if res.status_code == 200:
+            self.avatar = res.content
+        else:
+            warnings.warn(f"Failed to get avatar for {self.id}")
+
+        for _member in _data['members']:
+            member = GroupMember(_member['id'])
+            member.permission_level = _member['level']
+
+            self.members.append(member)
+
+        self.certifications = _data['certifications']
 
     def add_certification(self, certification: str, __expires: int = 2419200) -> None:
         res = requests.post(f"{self._url}/add_certification?name={certification}&duration={__expires}", headers = default_headers)
@@ -364,27 +355,6 @@ class Organization(Entity):
     def get_members_by_attr(self, attribute: str = "id") -> list[str]:
         return [ member.__getattribute__(attribute) for member in self.members ]
 
-    def get_shares(self, include_worth: bool = False) -> dict[str, int] | dict[str, dict[str, int]]:
-        shares = {}
-
-        for share in self.parts:
-            if include_worth:
-                if share.owner in shares.keys():
-                    shares[share.owner]['count'] += 1
-                    shares[share.owner]['worth'] += share.price
-                else:
-                    shares[share.owner] = {
-                        'count': 1,
-                        'worth': share.price
-                    }
-            else:
-                if share.owner in shares.keys():
-                    shares[share.owner] += 1
-                else:
-                    shares[share.owner] = 1
-
-        return shares
-
     def save_avatar(self, data: bytes = None):
         if not data:
             return

{nsarchive-3.0.0a2 → nsarchive-3.0.0a3}/nsarchive/instances/_entities.py

@@ -53,7 +53,7 @@ class EntityInstance(Instance):
             return None
         elif "xp" in _data.keys():
             _data['_type'] = 'user'
-        elif "parts" in _data.keys():
+        elif "members" in _data.keys():
             _data['_type'] = 'organization'
         else:
             _data['_type'] = 'entity'
@@ -62,37 +62,13 @@ class EntityInstance(Instance):
             entity = User(id)
             entity._url = f"{self.url}/model/individuals/{id}"
 
-            entity.xp = _data['xp']
-            entity.boosts = _data['boosts']
-
-            entity.votes = [ NSID(vote) for vote in _data['votes'] ]
-            entity.groups = [ NSID(group) for group in _data['groups'] ]
+            entity._load(_data)
         elif _data['_type'] == 'organization':
             entity = Organization(id)
             entity._url = f"{self.url}/model/organizations/{id}"
+            entity.owner = self.get_entity(_data["owner_id"])
 
-            res = requests.get(f"{entity._url}/avatar")
-
-            if res.status_code == 200:
-                entity.avatar = res.content
-            else:
-                warnings.warn(f"Failed to get avatar for {id}")
-
-            entity.owner = self.get_entity(NSID(_data['owner_id']))
-
-            for _member in _data['members']:
-                member = GroupMember(_member['id'])
-                member.permission_level = _member['level']
-
-                entity.append(member)
-
-            entity.parts = []
-
-            for attrs in _data['parts']:
-                owner = attrs["owner"]
-                entity.parts.extend(attrs['count'] * [ Share(NSID(owner), attrs['worth'] // attrs['count']) ])
-
-            entity.certifications = _data['certifications']
+            entity._load(_data)
         else: 
             entity = Entity(id)
 
@@ -108,6 +84,16 @@ class EntityInstance(Instance):
 
         return entity
 
+    def get_entity_groups(self, entity: User) -> list[Organization]:
+        print(entity._url)
+        res = requests.get(f"{entity._url}/groups", headers = self.default_headers)
+
+        if res.status_code == 200:
+            return res.json()
+        else:
+            res.raise_for_status()
+            return []
+
     def save_entity(self, entity: Entity):
         """
         Fonction permettant de créer ou modifier une entité.
@@ -137,7 +123,6 @@ class EntityInstance(Instance):
             _data['owner_id'] = NSID(entity.owner.id) if entity.owner else NSID("0")
             _data['members'] = []
             _data['certifications'] = entity.certifications
-            _data['parts'] = entity.get_shares(True)
 
             for member in entity.members:
                 _member = {
@@ -151,7 +136,7 @@ class EntityInstance(Instance):
         elif type(entity) == User:
             _data['xp'] = entity.xp
             _data['boosts'] = entity.boosts
-            # _data['votes'] = [ NSID(vote) for vote in entity.votes]
+            _data['votes'] = [ NSID(vote) for vote in entity.votes]
         else:
             return
 

{nsarchive-3.0.0a2 → nsarchive-3.0.0a3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nsarchive"
-version = "3.0.0a2"
+version = "3.0.0a3"
 description = "API-wrapper pour récupérer des données liées à Nation"
 authors = ["happex <110610727+okayhappex@users.noreply.github.com>"]
 license = "GPL-3.0"