Mercurial > libervia-backend
diff sat/plugins/plugin_comp_ap_gateway/events.py @ 4037:524856bd7b19
massive refactoring to switch from camelCase to snake_case:
historically, Libervia (SàT before) was using camelCase as allowed by PEP8 when using a
pre-PEP8 code, to use the same coding style as in Twisted.
However, snake_case is more readable and it's better to follow PEP8 best practices, so it
has been decided to move on full snake_case. Because Libervia has a huge codebase, this
ended with a ugly mix of camelCase and snake_case.
To fix that, this patch does a big refactoring by renaming every function and method
(including bridge) that are not coming from Twisted or Wokkel, to use fully snake_case.
This is a massive change, and may result in some bugs.
author | Goffi <goffi@goffi.org> |
---|---|
date | Sat, 08 Apr 2023 13:54:42 +0200 |
parents | 26c3e1bc7fb7 |
children |
line wrap: on
line diff
--- a/sat/plugins/plugin_comp_ap_gateway/events.py Fri Apr 07 15:18:39 2023 +0200 +++ b/sat/plugins/plugin_comp_ap_gateway/events.py Sat Apr 08 13:54:42 2023 +0200 @@ -113,12 +113,12 @@ """ if not event_data.get("id"): event_data["id"] = shortuuid.uuid() - ap_account = await self.apg.getAPAccountFromJidAndNode( + ap_account = await self.apg.get_ap_account_from_jid_and_node( author_jid, self._events.namespace ) - url_actor = self.apg.buildAPURL(TYPE_ACTOR, ap_account) - url_item = self.apg.buildAPURL(TYPE_ITEM, ap_account, event_data["id"]) + url_actor = self.apg.build_apurl(TYPE_ACTOR, ap_account) + url_item = self.apg.build_apurl(TYPE_ITEM, ap_account, event_data["id"]) ap_object = { "actor": url_actor, "attributedTo": url_actor, @@ -246,7 +246,7 @@ """ is_activity = self.apg.is_activity(ap_item) if is_activity: - ap_object = await self.apg.apGetObject(ap_item, "object") + ap_object = await self.apg.ap_get_object(ap_item, "object") if not ap_object: log.warning(f'No "object" found in AP item {ap_item!r}') raise exceptions.DataError @@ -257,7 +257,7 @@ if "_repeated" in ap_item: # if the event is repeated, we use the original one ID repeated_uri = ap_item["_repeated"]["uri"] - parsed_uri = uri.parseXMPPUri(repeated_uri) + parsed_uri = uri.parse_xmpp_uri(repeated_uri) object_id = parsed_uri["item"] else: object_id = ap_object.get("id") @@ -268,10 +268,10 @@ raise exceptions.DataError("AP Object is not an event") # author - actor = await self.apg.apGetSenderActor(ap_object) + actor = await self.apg.ap_get_sender_actor(ap_object) - account = await self.apg.getAPAccountFromId(actor) - author_jid = self.apg.getLocalJIDFromAccount(account).full() + account = await self.apg.get_ap_account_from_id(actor) + author_jid = self.apg.get_local_jid_from_account(account).full() # name, start, end event_data = { @@ -370,7 +370,7 @@ # comments if ap_object.get("commentsEnabled"): - __, comments_node = await self.apg.getCommentsNodes(object_id, None) + __, comments_node = await self.apg.get_comments_nodes(object_id, None) event_data["comments"] = { "service": author_jid, "node": comments_node,