diff options
author | mathieui <mathieui@mathieui.net> | 2020-12-12 22:51:34 +0100 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2021-01-28 19:03:54 +0100 |
commit | 08f48b0c8be7535754ba9494d13276f69485bd44 (patch) | |
tree | fae56a438190475259347cd1f30e1dc42808b972 /poezio/core/core.py | |
parent | e1720c8e2378dfae3a165cf250036e3443dd7174 (diff) | |
download | poezio-08f48b0c8be7535754ba9494d13276f69485bd44.tar.gz poezio-08f48b0c8be7535754ba9494d13276f69485bd44.tar.bz2 poezio-08f48b0c8be7535754ba9494d13276f69485bd44.tar.xz poezio-08f48b0c8be7535754ba9494d13276f69485bd44.zip |
Move get_error_message to common
Diffstat (limited to 'poezio/core/core.py')
-rw-r--r-- | poezio/core/core.py | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/poezio/core/core.py b/poezio/core/core.py index 2151600f..c79750de 100644 --- a/poezio/core/core.py +++ b/poezio/core/core.py @@ -45,6 +45,7 @@ from poezio import timed_events from poezio import windows from poezio.bookmarks import BookmarkList +from poezio.common import get_error_message from poezio.config import config, firstrun from poezio.contact import Contact, Resource from poezio.daemon import Executor @@ -66,8 +67,6 @@ from poezio.core.handlers import HandlerCore from poezio.core.structs import ( Command, Status, - DEPRECATED_ERRORS, - ERROR_AND_STATUS_CODES, POSSIBLE_SHOW, ) @@ -989,42 +988,6 @@ class Core: for jid in jids: self.invite(jid, room) - def get_error_message(self, stanza, deprecated: bool = False): - """ - Takes a stanza of the form <message type='error'><error/></message> - and return a well formed string containing error information - """ - sender = stanza['from'] - msg = stanza['error']['type'] - condition = stanza['error']['condition'] - code = stanza['error']['code'] - body = stanza['error']['text'] - if not body: - if deprecated: - if code in DEPRECATED_ERRORS: - body = DEPRECATED_ERRORS[code] - else: - body = condition or 'Unknown error' - else: - if code in ERROR_AND_STATUS_CODES: - body = ERROR_AND_STATUS_CODES[code] - else: - body = condition or 'Unknown error' - if code: - message = '%(from)s: %(code)s - %(msg)s: %(body)s' % { - 'from': sender, - 'msg': msg, - 'body': body, - 'code': code - } - else: - message = '%(from)s: %(msg)s: %(body)s' % { - 'from': sender, - 'msg': msg, - 'body': body - } - return message - ####################### Tab logic-related things ############################## ### Tab getters ### @@ -2125,7 +2088,7 @@ class Core: tab = self.tabs.by_name_and_class(room_name, tabs.MucTab) if not tab: return - error_message = self.get_error_message(error) + error_message = get_error_message(error) tab.add_message( Message( error_message, |