Fix #5

pyflarum/client/extensions/flarum/Malago_Achievements.py

@@ -144,6 +144,7 @@ def get_all_achievements(self) -> t.List[Achievement]:
 class AchievementsExtension(ExtensionMixin):
     AUTHOR = 'malago'
     NAME = 'achievements'
+    ID = f"{AUTHOR}-{NAME}"
 
     SOFT_DEPENDENCIES = [AdminExtension]
 

pyflarum/client/flarum/core/filters.py

@@ -54,7 +54,7 @@ def to_dict(self) -> dict:
 
         if self.query:
             __data["filter[q]"] = self.query
-        
+
         if self.ids:
             __data["filter[id]"] = ','.join(map(str, self.ids))
 

pyflarum/client/session.py

@@ -20,7 +20,7 @@
 from .flarum.core.filters import Filter
 
 
-from ..error_handler import parse_request
+from ..error_handler import parse_request, FlarumError
 from ..datetime_conversions import datetime_to_flarum
 
 
@@ -54,6 +54,7 @@ def __init__(self, forum_url: 'str', username_or_email: t.Optional[str]=None, pa
         self.api_endpoint = api_endpoint
         self.username_or_email = username_or_email
         self.session = session_object
+        self.user_id = None
 
         self.session.headers.update({
             "User-Agent": user_agent
@@ -85,7 +86,13 @@ def authenticate(self, username_or_email: t.Optional[str]=None, password: t.Opti
             identification_data = {"identification": username_or_email, "password": password}
 
             raw = self.session.post(url=f'{self.forum_url}/api/token', json=identification_data)
-            token_data = parse_request(raw)
+
+            try:
+                token_data = parse_request(raw)
+
+            except FlarumError as e:
+                raise FlarumError(f"Failed to login. Are your credentials correct/does your account exist? The status code was: {e.status}") from e
+
 
             token = token_data.get("token", None)
             user_id = token_data.get("userId", None)
@@ -100,6 +107,8 @@ def authenticate(self, username_or_email: t.Optional[str]=None, password: t.Opti
             else:
                 self.is_authenticated = False
 
+            self.user_id = user_id
+
         else:
             self.session.headers.update({
                 "Authorization": None,
@@ -173,30 +182,14 @@ def _fetch_user_data(self) -> t.Optional[dict]:
             Fetches your user's JSON data.
         """
 
-        if self.username_or_email:
-            filter = Filter(limit=1)
-
-            if '@' in self.username_or_email:
-                filter.query = f'email:{self.username_or_email}'
-
-            else:
-                filter.query = self.username_or_email
-
-
-            raw = self.session.get(f"{self.api_urls['users']}", params=filter.to_dict)
-            json = parse_request(raw)
-
-            for possible_user in json.get("data", [{}]):
-                if '@' in self.username_or_email:
-                    if possible_user.get("attributes", {}).get("email", None) == self.username_or_email:
-                        return possible_user
+        if self.user_id is None:
+            return None
 
-                else:
-                    if possible_user.get("attributes", {}).get("username", None) == self.username_or_email:
-                        return possible_user
 
+        raw = self.session.get(f"{self.api_urls['users']}/{self.user_id}")
+        json = parse_request(raw)
 
-        return None
+        return json.get('data', {})
 
 
     def _update_user_data(self, new_data: dict) -> t.Union['FlarumUser', User]:

pyflarum/error_handler.py

@@ -35,7 +35,7 @@ def parse_request(response: 'Response') -> t.Union[dict, t.NoReturn]:
         Parses the request as JSON, raises `FlarumError` if something went wrong.
     """
 
-    if not 200 <= response.status_code <= 204:
+    if not (200 <= response.status_code <= 204):
         return handle_errors(status_code=response.status_code)
 
     try:
@@ -56,44 +56,43 @@ def parse_request(response: 'Response') -> t.Union[dict, t.NoReturn]:
     return json
 
 
-def handle_errors(errors: t.Optional[t.List[t.Dict[str, str]]]=None, status_code: t.Optional[str]=None) -> t.NoReturn:
+def handle_errors(errors: t.Optional[t.List[t.Dict[str, str]]]=[{}], status_code: t.Optional[str]=None):
     """
         Handles Flarum & request related errors.
         Returns `FlarumError` if an error was found, `True` otherwise.
     """
 
-    if errors:
-        for error in errors:
-            if status_code:
-                status = status_code
+    for error in errors:
+        if status_code:
+            status = status_code
 
-            else:
-                s = error.get('status', None)
-
-                if s:
-                    status = int(s)
+        else:
+            s = error.get('status', None)
 
-                else:
-                    status = 'Unknown'
+            if s:
+                status = int(s)
 
-            code = error.get('code', 0)
-            details = error.get("detail", "No further details.")
+            else:
+                status = 'Unknown'
 
+        code = error.get('code', 0)
+        details = error.get("detail", "No further details.")
 
-            if status == 400:
-                if code == 'invalid_parameter':
-                    raise FlarumError(f'Error {status}: Invalid parameter. This usually happens when you provide an invalid filter when filtering data. {details}', status=status, code=code, details=details)
 
-                else:
-                    raise FlarumError(f'Error {status}: {code} - {details}', status=status, code=code, details=details)
+        if status == 400:
+            if code == 'invalid_parameter':
+                raise FlarumError(f'Error {status}: Invalid parameter. This usually happens when you provide an invalid filter when filtering data. {details}', status=status, code=code, details=details)
 
+            else:
+                raise FlarumError(f'Error {status}: {code} - {details}', status=status, code=code, details=details)
 
-            if status == 401:
-                if code == 'not_authenticated':
-                    raise FlarumError(f'Error {status}: Not authenticated. Please, check whether your authentication details (username & password) are correct and try again. {details}', status=status, code=code, details=details)
 
-                else:
-                    raise FlarumError(f'Error {status}: {code} - {details}', status=status, code=code, details=details)
+        if status == 401:
+            if code == 'not_authenticated':
+                raise FlarumError(f'Error {status}: Not authenticated. Please, check whether your authentication details (username & password) are correct and try again. {details}', status=status, code=code, details=details)
 
             else:
                 raise FlarumError(f'Error {status}: {code} - {details}', status=status, code=code, details=details)
+
+        else:
+            raise FlarumError(f'Error {status}: {code} - {details}', status=status, code=code, details=details)

setup.py

@@ -11,7 +11,7 @@
 __copyright__   = "Copyright (c) 2021, SKevo"
 __credits__     = ["SKevo"]
 __license__     = "MIT"
-__version__     = "v1.0.0"
+__version__     = "v1.0.1"
 __maintainer__  = "SKevo"
 __email__       = "[email protected]"
 __status__      = "4 - Beta"

tests/client/test_absolutely_all_posts.py

@@ -16,7 +16,7 @@ def test_absolutely_all_posts():
     discussion = USER.get_discussion_by_id(7585)
 
     for number, posts in enumerate(USER.get_all_posts_from_discussion(discussion)):
-        if number > 3: # 3 batches of posts
+        if number > 3: # only first 3 batches of posts
             break
 
         for post in posts:

tests/client/test_forum_data.py

@@ -21,7 +21,7 @@ def test_forum_data():
 
     print("Groups:")
     for group in USER.get_groups():
-        print(f" • {group.nameSingular}")
+        print(f"• {group.nameSingular}")
 
 
 if __name__ == "__main__":

tests/client/test_upload.py

@@ -20,11 +20,6 @@ def test_upload():
     updated_user = USER.upload_user_avatar(birb_image)
     print(updated_user.data.avatarUrl)
 
-    # ...or for someone else:
-    _user = USER.get_user_by_id(3)
-    USER.upload_user_avatar(birb_image, user=_user)
-    print(USER.data.id)
-
     # Also, why not upload it as logo?
     USER.upload_logo(birb_image)