Skip to content

Commit

Permalink
Merge pull request #11 from tjkessler/dev
Browse files Browse the repository at this point in the history 
Bug fixes for GET operations
  • Loading branch information
@tjkessler
tjkessler authored Jul 4, 2023
2 parents cdfe35f + 9b7d0f8 commit 7a8ae0a
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 25 deletions.
56 changes: 32 additions & 24 deletions plemmy/lemmyhttp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,8 @@ def get_banned_persons(self) -> requests.Response:
"""

form = {"auth": self.key}
return get_handler(f"{self._api_url}/user/banned", self._headers, form)
return get_handler(f"{self._api_url}/user/banned", self._headers,
None, params=form)

def get_captcha(self) -> requests.Response:
""" get_captcha: get captcha for current user
Expand All @@ -832,7 +833,7 @@ def get_captcha(self) -> requests.Response:
"""

return get_handler(f"{self._api_url}/user/get_captcha",
self._headers, {})
self._headers, None, None)

def get_comment(self, id: int) -> requests.Response:
""" get_comment: obtain a comment by ID
Expand All @@ -845,7 +846,8 @@ def get_comment(self, id: int) -> requests.Response:
"""

form = {"id": id, "auth": self.key}
return get_handler(f"{self._api_url}/comment", self._headers, form)
return get_handler(f"{self._api_url}/comment", self._headers,
None, params=form)

def get_comments(self, community_id: int = None,
community_name: str = None, limit: int = None,
Expand Down Expand Up @@ -878,7 +880,7 @@ def get_comments(self, community_id: int = None,
form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/comment/list",
self._headers, form)
self._headers, None, params=form)

def get_community(self, id: int = None,
name: str = None) -> requests.Response:
Expand Down Expand Up @@ -909,7 +911,7 @@ def get_federated_instances(self) -> requests.Response:

form = {"auth": self.key}
return get_handler(f"{self._api_url}/federated_instances",
self._headers, form)
self._headers, None, params=form)

def get_modlog(self, type_: str, community_id: int = None,
limit: int = None, mod_person_id: int = None,
Expand Down Expand Up @@ -937,7 +939,8 @@ def get_modlog(self, type_: str, community_id: int = None,

form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/modlog", self._headers, form)
return get_handler(f"{self._api_url}/modlog", self._headers,
None, params=form)

def get_person_details(self, community_id: int = None, limit: int = None,
page: int = None, person_id: int = None,
Expand All @@ -963,7 +966,8 @@ def get_person_details(self, community_id: int = None, limit: int = None,

form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/user", self._headers, form)
return get_handler(f"{self._api_url}/user", self._headers,
None, params=form)

def get_person_mentions(self, limit: int = None, page: int = None,
sort: str = None,
Expand All @@ -985,7 +989,7 @@ def get_person_mentions(self, limit: int = None, page: int = None,
form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/user/mention",
self._headers, form)
self._headers, None, params=form)

def get_post(self, comment_id: int = None,
id: int = None) -> requests.Response:
Expand All @@ -1001,7 +1005,8 @@ def get_post(self, comment_id: int = None,

form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/post", self._headers, form)
return get_handler(f"{self._api_url}/post", self._headers,
None, params=form)

def get_posts(self, community_id: int = None, community_name: str = None,
limit: int = None, page: int = None, saved_only: bool = None,
Expand All @@ -1027,7 +1032,8 @@ def get_posts(self, community_id: int = None, community_name: str = None,

form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/post/list", self._headers, form)
return get_handler(f"{self._api_url}/post/list", self._headers,
None, params=form)

def get_private_messages(self, limit: int = None, page: int = None,
unread_only: bool = None) -> requests.Response:
Expand All @@ -1046,7 +1052,7 @@ def get_private_messages(self, limit: int = None, page: int = None,
form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/private_message/list",
self._headers, form)
self._headers, None, params=form)

def get_replies(self, limit: int = None, page: int = None,
sort: str = None,
Expand All @@ -1067,7 +1073,7 @@ def get_replies(self, limit: int = None, page: int = None,
form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/user/replies",
self._headers, form)
self._headers, None, params=form)

def get_report_count(self, community_id: int = None) -> requests.Response:
""" get_report_count: number of reports
Expand All @@ -1082,7 +1088,7 @@ def get_report_count(self, community_id: int = None) -> requests.Response:
form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/user/report_count",
self._headers, form)
self._headers, None, params=form)

def get_site(self) -> requests.Response:
""" get_site: return site info
Expand All @@ -1095,7 +1101,8 @@ def get_site(self) -> requests.Response:
"""

form = {"auth": self.key}
return get_handler(f"{self._api_url}/site", self._headers, form)
return get_handler(f"{self._api_url}/site", self._headers,
None, params=form)

def get_site_metadata(self, url: str) -> requests.Response:
""" get_site_metadata: return an instance's metadata
Expand All @@ -1109,7 +1116,7 @@ def get_site_metadata(self, url: str) -> requests.Response:

form = {"url": url}
return get_handler(f"{self._api_url}/post/site_metadata",
self._headers, form)
self._headers, None, params=form)

def get_unread_count(self) -> requests.Response:
""" get_unread_count: get number of unread notifications
Expand All @@ -1123,7 +1130,7 @@ def get_unread_count(self) -> requests.Response:

form = {"auth": self.key}
return get_handler(f"{self._api_url}/user/unread_count",
self._headers, form)
self._headers, None, params=form)

def get_unread_registration_application_count(self) -> requests.Response:
""" get_unread_registration_application_count: number of unread
Expand All @@ -1139,7 +1146,7 @@ def get_unread_registration_application_count(self) -> requests.Response:
form = {"auth": self.key}
return get_handler(
f"{self._api_url}/admin/registration_application/count",
self._headers, form
self._headers, None, params=form
)

def leave_admin(self) -> requests.Response:
Expand Down Expand Up @@ -1206,7 +1213,7 @@ def list_comment_reports(self, community_id: int = None, limit: int = None,
form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/comment/report/list",
self._headers, form)
self._headers, None, params=form)

def list_communities(self, limit: int = None, page: int = None,
sort: str = None,
Expand All @@ -1228,7 +1235,7 @@ def list_communities(self, limit: int = None, page: int = None,
form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/community/list",
self._headers, form)
self._headers, None, params=form)

def list_post_reports(self, community_id: int = None, limit: int = None,
page: int = None, unresolved_only: bool = None
Expand All @@ -1249,7 +1256,7 @@ def list_post_reports(self, community_id: int = None, limit: int = None,
form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/post/report/list",
self._headers, form)
self._headers, None, params=form)

def list_private_message_reports(self, limit: int = None, page: int = None,
unresolved_only: bool = None
Expand All @@ -1270,7 +1277,7 @@ def list_private_message_reports(self, limit: int = None, page: int = None,
form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/private_message/report/list",
self._headers, form)
self._headers, None, params=form)

def list_registration_applications(self, limit: int = None,
page: int = None,
Expand All @@ -1293,7 +1300,7 @@ def list_registration_applications(self, limit: int = None,
form["auth"] = self.key
return get_handler(
f"{self._api_url}/admin/registration_application/list",
self._headers, form
self._headers, None, params=form
)

def lock_post(self, locked: bool, post_id: int) -> requests.Response:
Expand Down Expand Up @@ -1618,7 +1625,7 @@ def resolve_object(self, q: str) -> requests.Response:

form = {"q": q, "auth": self.key}
return get_handler(f"{self._api_url}/resolve_object",
self._headers, form)
self._headers, None, params=form)

def resolve_post_report(self, report_id: int,
resolved: bool) -> requests.Response:
Expand Down Expand Up @@ -1767,7 +1774,8 @@ def search(self, q: str, community_id: int = None,

form = create_form(locals())
form["auth"] = self.key
return get_handler(f"{self._api_url}/search", self._headers, form)
return get_handler(f"{self._api_url}/search", self._headers,
None, params=form)

def transfer_community(self, community_id: int,
person_id: int) -> requests.Response:
Expand Down
2 changes: 1 addition & 1 deletion plemmy/version.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION = (0, 2, 5, "beta")
VERSION = (0, 2, 6, "beta")
__version__ = ".".join(map(str, VERSION[:-1]))
__release__ = ".".join(map(str, VERSION))

0 comments on commit 7a8ae0a

Please sign in to comment.