Mercurial > libervia-backend
comparison sat_frontends/quick_frontend/quick_app.py @ 2829:649cb3fd7711
quick frontend(app): avoid sending empty messages
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 01 Mar 2019 17:42:28 +0100 |
parents | 0b7ce5daee9b |
children | 42380a4f6433 |
comparison
equal
deleted
inserted
replaced
2828:08b54bf77c54 | 2829:649cb3fd7711 |
---|---|
726 | 726 |
727 def messageStateHandler(self, uid, status, profile): | 727 def messageStateHandler(self, uid, status, profile): |
728 for widget in self.widgets.getWidgets(quick_chat.QuickChat, profiles=(profile,)): | 728 for widget in self.widgets.getWidgets(quick_chat.QuickChat, profiles=(profile,)): |
729 widget.onMessageState(uid, status, profile) | 729 widget.onMessageState(uid, status, profile) |
730 | 730 |
731 def messageSend( | 731 def messageSend(self, to_jid, message, subject=None, mess_type="auto", extra=None, callback=None, errback=None, profile_key=C.PROF_KEY_NONE): |
732 self, | 732 if not subject and not extra and (not message or message == {u'': u''}): |
733 to_jid, | 733 log.debug(u"Not sending empty message") |
734 message, | 734 return |
735 subject=None, | 735 |
736 mess_type="auto", | |
737 extra=None, | |
738 callback=None, | |
739 errback=None, | |
740 profile_key=C.PROF_KEY_NONE, | |
741 ): | |
742 if subject is None: | 736 if subject is None: |
743 subject = {} | 737 subject = {} |
744 if extra is None: | 738 if extra is None: |
745 extra = {} | 739 extra = {} |
746 if callback is None: | 740 if callback is None: |
751 if errback is None: | 745 if errback is None: |
752 errback = lambda failure: self.showDialog( | 746 errback = lambda failure: self.showDialog( |
753 failure.fullname, failure.message, "error" | 747 failure.fullname, failure.message, "error" |
754 ) | 748 ) |
755 | 749 |
756 if not self.trigger.point( | 750 if not self.trigger.point("messageSendTrigger", to_jid, message, subject, mess_type, extra, callback, errback, profile_key=profile_key): |
757 "messageSendTrigger", | |
758 to_jid, | |
759 message, | |
760 subject, | |
761 mess_type, | |
762 extra, | |
763 callback, | |
764 errback, | |
765 profile_key=profile_key, | |
766 ): | |
767 return | 751 return |
768 | 752 |
769 self.bridge.messageSend( | 753 self.bridge.messageSend( |
770 unicode(to_jid), | 754 unicode(to_jid), |
771 message, | 755 message, |