diff --git a/docker/Dockerfile b/docker/Dockerfile index 9d196b7a6..f9b3efb33 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM praekeltfoundation/python-base MAINTAINER Praekelt Foundation -ENV VUMI_VERSION "0.6.9" +ENV VUMI_VERSION "0.6.10" RUN pip install vumi==$VUMI_VERSION COPY ./vumi-entrypoint.sh /app/vumi-entrypoint.sh diff --git a/docs/conf.py b/docs/conf.py index 602100c22..a33a90c18 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,7 +53,7 @@ # The short X.Y version. version = '0.6' # The full version, including alpha/beta/rc tags. -release = '0.6.9' +release = '0.6.10' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 9e8f09a21..d14170c0a 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -11,6 +11,12 @@ this will almost certainly not break the majority of things built on vumi, old code or code that relies too heavily on the details of worker setup may need to be fixed. +:Version: 0.6.10 +:Date released: 27 July 2016 + +* Update Dmark transport to send null content at the start of a USSD session + rather than sending the USSD code. + :Version: 0.6.9 :Date released: 27 July 2016 diff --git a/setup.py b/setup.py index cf9a7aee2..4a117a1cb 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name="vumi", - version="0.6.9", + version="0.6.10", url='http://github.com/praekelt/vumi', license='BSD', description="Super-scalable messaging engine for the delivery of SMS, " diff --git a/vumi/__init__.py b/vumi/__init__.py index 5c7142f51..0b67bd52f 100644 --- a/vumi/__init__.py +++ b/vumi/__init__.py @@ -2,4 +2,4 @@ Vumi scalable text messaging engine. """ -__version__ = "0.6.9" +__version__ = "0.6.10" diff --git a/vumi/transports/dmark/dmark_ussd.py b/vumi/transports/dmark/dmark_ussd.py index d2228c56a..96e06ab0f 100644 --- a/vumi/transports/dmark/dmark_ussd.py +++ b/vumi/transports/dmark/dmark_ussd.py @@ -152,12 +152,15 @@ def handle_raw_inbound_message(self, request_id, request): to_addr = values["ussdServiceCode"] from_addr = values["msisdn"] + content = values["ussdRequestString"] session_event = yield self.session_event_for_transaction( values["transactionId"]) + if session_event == TransportUserMessage.SESSION_NEW: + content = None yield self.publish_message( message_id=request_id, - content=values["ussdRequestString"], + content=content, to_addr=to_addr, from_addr=from_addr, provider='dmark', diff --git a/vumi/transports/dmark/tests/test_dmark_ussd.py b/vumi/transports/dmark/tests/test_dmark_ussd.py index 7ba9688de..e47636d7e 100644 --- a/vumi/transports/dmark/tests/test_dmark_ussd.py +++ b/vumi/transports/dmark/tests/test_dmark_ussd.py @@ -89,13 +89,13 @@ def assert_nack(self, nack, reply, reason): @inlineCallbacks def test_inbound_begin(self): - user_content = "Who are you?" + user_content = "SHOULD BE IGNORED" d = self.tx_helper.mk_request(ussdRequestString=user_content) [msg] = yield self.tx_helper.wait_for_dispatched_inbound(1) self.assert_inbound_message( msg, session_event=TransportUserMessage.SESSION_NEW, - content=user_content) + content=None) reply_content = "We are the Knights Who Say ... Ni!" reply = msg.reply(reply_content)