Mercurial > libervia-web
diff libervia/pages/chat/page_meta.py @ 1509:106bae41f5c8
massive refactoring from camelCase -> snake_case. See backend commit log for more details
author | Goffi <goffi@goffi.org> |
---|---|
date | Sat, 08 Apr 2023 13:44:11 +0200 |
parents | ce879da7fcf7 |
children |
line wrap: on
line diff
--- a/libervia/pages/chat/page_meta.py Fri Apr 07 15:20:40 2023 +0200 +++ b/libervia/pages/chat/page_meta.py Sat Apr 08 13:44:11 2023 +0200 @@ -19,13 +19,13 @@ def parse_url(self, request): - rdata = self.getRData(request) + rdata = self.get_r_data(request) try: - target_jid_s = self.nextPath(request) + target_jid_s = self.next_path(request) except IndexError: # not chat jid, we redirect to jid selection page - self.pageRedirect("chat_select", request) + self.page_redirect("chat_select", request) try: target_jid = jid.JID(target_jid_s) @@ -35,7 +35,7 @@ log.warning( _("bad chat jid entered: {jid} ({msg})").format(jid=target_jid, msg=e) ) - self.pageError(request, C.HTTP_BAD_REQUEST) + self.page_error(request, C.HTTP_BAD_REQUEST) else: rdata["target"] = target_jid @@ -43,18 +43,18 @@ @defer.inlineCallbacks def prepare_render(self, request): # Â FIXME: bug on room filtering (currently display messages from all rooms) - session = self.host.getSessionData(request, session_iface.IWebSession) + session = self.host.get_session_data(request, session_iface.IWebSession) template_data = request.template_data - rdata = self.getRData(request) + rdata = self.get_r_data(request) target_jid = rdata["target"] profile = session.profile profile_jid = session.jid - disco = yield self.host.bridgeCall("discoInfos", target_jid.host, "", True, profile) + disco = yield self.host.bridge_call("disco_infos", target_jid.host, "", True, profile) if "conference" in [i[0] for i in disco[1]]: chat_type = C.CHAT_GROUP - join_ret = yield self.host.bridgeCall( - "mucJoin", target_jid.userhost(), "", "", profile + join_ret = yield self.host.bridge_call( + "muc_join", target_jid.userhost(), "", "", profile ) (already_joined, room_jid_s, @@ -73,9 +73,9 @@ rdata["chat_type"] = chat_type template_data["own_jid"] = own_jid - self.registerSignal(request, "messageNew") - history = yield self.host.bridgeCall( - "historyGet", + self.register_signal(request, "message_new") + history = yield self.host.bridge_call( + "history_get", profile_jid.userhost(), target_jid.userhost(), 20, @@ -86,8 +86,8 @@ authors = {m[2] for m in history} identities = session.identities for author in authors: - id_raw = yield self.host.bridgeCall( - "identityGet", author, [], True, profile) + id_raw = yield self.host.bridge_call( + "identity_get", author, [], True, profile) identities[author] = data_format.deserialise(id_raw) template_data["messages"] = data_objects.Messages(history) @@ -97,8 +97,8 @@ def on_data(self, request, data): - session = self.host.getSessionData(request, session_iface.IWebSession) - rdata = self.getRData(request) + session = self.host.get_session_data(request, session_iface.IWebSession) + rdata = self.get_r_data(request) target = rdata["target"] data_type = data.get("type", "") if data_type == "msg": @@ -109,8 +109,8 @@ else C.MESS_TYPE_CHAT ) log.debug("message received: {}".format(message)) - self.host.bridgeCall( - "messageSend", + self.host.bridge_call( + "message_send", target.full(), {"": message}, {},