jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XEP-0461: fix character counting

Browse Source 
Turns out we need to include the fallback/end code point,
unlike python slicing conventions
This commit is contained in:
nicoco 2022-11-28 07:15:26 +01:00
parent 9b89401b36
commit fdca7d82c4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slixmpp/plugins/xep_0461/stanza.py
View File

@ -23,8 +23,8 @@ class FeatureFallBack(ElementBase):
start = self["fallback_body"]["start"] start = self["fallback_body"]["start"]
end = self["fallback_body"]["end"] end = self["fallback_body"]["end"]
body = self.parent()["body"] body = self.parent()["body"]
if start < end < len(body): if start <= end:
return body[start:end] return body[start:end+1]
else: else:
return "" return ""
@ -33,7 +33,7 @@ class FeatureFallBack(ElementBase):
start = self["fallback_body"]["start"] start = self["fallback_body"]["start"]
end = self["fallback_body"]["end"] end = self["fallback_body"]["end"]
body = self.parent()["body"] body = self.parent()["body"]
if start < end < len(body): if start <= end < len(body):
return body[:start] + body[end:] return body[:start] + body[end:]
else: else:
return body return body
@ -44,7 +44,7 @@ class FeatureFallBack(ElementBase):
msg["body"] = quoted + msg["body"] msg["body"] = quoted + msg["body"]
msg["feature_fallback"]["for"] = NS msg["feature_fallback"]["for"] = NS
msg["feature_fallback"]["fallback_body"]["start"] = 0 msg["feature_fallback"]["fallback_body"]["start"] = 0
msg["feature_fallback"]["fallback_body"]["end"] = len(quoted) msg["feature_fallback"]["fallback_body"]["end"] = len(quoted) - 1
class FallBackBody(ElementBase): class FallBackBody(ElementBase):

4
tests/test_stanza_xep_0461.py
View File

@ -33,7 +33,7 @@ class TestReply(SlixTest):
self.check( self.check(
message, message,
""" """
<message xmlns="jabber:client"> <message xmlns="jabber:client">M
<body>12345\nrealbody</body> <body>12345\nrealbody</body>
<fallback xmlns='urn:xmpp:feature-fallback:0' for='NS'> <fallback xmlns='urn:xmpp:feature-fallback:0' for='NS'>
<body start="0" end="6" /> <body start="0" end="6" />
@ -55,7 +55,7 @@ class TestReply(SlixTest):
<message xmlns="jabber:client" type="normal"> <message xmlns="jabber:client" type="normal">
<body>> Anna wrote:\n> Hi, how are you?\nGreat</body> <body>> Anna wrote:\n> Hi, how are you?\nGreat</body>
<fallback xmlns="urn:xmpp:feature-fallback:0" for="urn:xmpp:reply:0"> <fallback xmlns="urn:xmpp:feature-fallback:0" for="urn:xmpp:reply:0">
<body start='0' end='33' /> <body start='0' end='32' />
</fallback> </fallback>
</message> </message>
""" """