Philipp Hörist pushed to branch master at gajim / python-nbxmpp

Commits:

2 changed files:

Changes:

  • nbxmpp/modules/delay.py
    ... ... @@ -57,7 +57,11 @@ class Delay:
    57 57 
                 else:
    58 58 
                     jids = [self._client.get_bound_jid().getDomain()]
    59 59
    60 
    -            properties.timestamp = parse_delay(stanza, from_=jids)
    60 
    +            server_delay = parse_delay(stanza, from_=jids)
    61 
    +            if server_delay is not None:
    62 
    +                properties.has_server_delay = True
    63 
    +                properties.timestamp = server_delay
    64 
    +
    61 65 
                 properties.user_timestamp = parse_delay(stanza, not_from=jids)
    62 66
    63 67 
         @staticmethod

  • nbxmpp/structs.py
    ... ... @@ -162,6 +162,7 @@ class MessageProperties:
    162 162 
             self.thread = None
    163 163 
             self.user_timestamp = None
    164 164 
             self.timestamp = time.time()
    165 
    +        self.has_server_delay = False
    165 166 
             self.error = None
    166 167 
             self.eme = None
    167 168 
             self.http_auth = None
    ... ... @@ -184,6 +185,10 @@ class MessageProperties:
    184 185 
             self.omemo = None
    185 186 
             self.encrypted = None
    186 187
    188 
    +    @property
    189 
    +    def has_user_delay(self):
    190 
    +        return self.user_timestamp is not None
    191 
    +
    187 192 
         @property
    188 193 
         def is_encrypted(self):
    189 194 
             return self.encrypted is not None

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.