diff options
author | Roger Planas <roger.planas@isode.com> | 2017-01-17 14:42:38 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2017-01-27 16:17:52 (GMT) |
commit | f3e46add7f512180833f91c3442ee9fb059b5f0c (patch) | |
tree | c20ba2d617be8c1c7092e598b3f879b0565cdb57 /Sluift/SluiftClient.cpp | |
parent | fa068e62cbf70d93296de7887cbcfdda5d36d2b2 (diff) | |
download | swift-f3e46add7f512180833f91c3442ee9fb059b5f0c.zip swift-f3e46add7f512180833f91c3442ee9fb059b5f0c.tar.bz2 |
Sluift: Add handling of block/unblock events
Swiften handles blocklist event notifications, but those were
not passed to Sluift, so a Sluift client, when querying events,
would not be aware if an XMPP server pushes block/unblock.
This patch adds an extra event type to Sluift so that method
for_each_event reports block/unblock notifications, in addition
to a new API 'get_block_list' to retrieve the blocklist from
the server.
Test-information:
Used Sluift client to retrieve blocklist and it is as expected.
Also used client to retrieve all items after adding, removing and
removing all items in the blocklist, and Sluift clients can now
see these events.
Change-Id: I0b76289ebd9e63505ff8a99cd9c0aa0e93af0c22
Diffstat (limited to 'Sluift/SluiftClient.cpp')
-rw-r--r-- | Sluift/SluiftClient.cpp | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/Sluift/SluiftClient.cpp b/Sluift/SluiftClient.cpp index f1c0191..4680d4b 100644 --- a/Sluift/SluiftClient.cpp +++ b/Sluift/SluiftClient.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016 Isode Limited. + * Copyright (c) 2013-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -9,6 +9,7 @@ #include <boost/numeric/conversion/cast.hpp> #include <Swiften/Client/Client.h> +#include <Swiften/Client/ClientBlockListManager.h> #include <Swiften/Client/ClientXMLTracer.h> #include <Swiften/Elements/Message.h> #include <Swiften/Elements/Presence.h> @@ -37,6 +38,8 @@ SluiftClient::SluiftClient( client->onPresenceReceived.connect(boost::bind(&SluiftClient::handleIncomingPresence, this, _1)); client->getPubSubManager()->onEvent.connect(boost::bind(&SluiftClient::handleIncomingPubSubEvent, this, _1, _2)); client->getRoster()->onInitialRosterPopulated.connect(boost::bind(&SluiftClient::handleInitialRosterPopulated, this)); + client->getClientBlockListManager()->getBlockList()->onItemAdded.connect(boost::bind(&SluiftClient::handleIncomingBlockEvent, this, _1)); + client->getClientBlockListManager()->getBlockList()->onItemRemoved.connect(boost::bind(&SluiftClient::handleIncomingUnblockEvent, this, _1)); } SluiftClient::~SluiftClient() { @@ -46,12 +49,14 @@ SluiftClient::~SluiftClient() { void SluiftClient::connect() { rosterReceived = false; + blockListReceived = false; disconnectedError = boost::optional<ClientError>(); client->connect(options); } void SluiftClient::connect(const std::string& host, int port) { rosterReceived = false; + blockListReceived = false; options.manualHostname = host; options.manualPort = port; disconnectedError = boost::optional<ClientError>(); @@ -126,6 +131,26 @@ boost::optional<SluiftClient::Event> SluiftClient::getNextEvent( } } +std::vector<JID> SluiftClient::getBlockList(int timeout) { + Watchdog watchdog(timeout, networkFactories->getTimerFactory()); + if (!blockListReceived) { + // If we haven't requested it yet, request it for the first time + client->getClientBlockListManager()->requestBlockList(); + + // Wait for new events + while (!watchdog.getTimedOut() && client->getClientBlockListManager()->getBlockList()->getState() != BlockList::Available) { + eventLoop->runUntilEvents(); + } + + // Throw an error if we're timed out + if (watchdog.getTimedOut()) { + throw Lua::Exception("Timeout while requesting blocklist"); + } + } + blockListReceived = true; + return client->getClientBlockListManager()->getBlockList()->getItems(); +} + std::vector<XMPPRosterItem> SluiftClient::getRoster(int timeout) { Watchdog watchdog(timeout, networkFactories->getTimerFactory()); if (!rosterReceived) { @@ -161,6 +186,14 @@ void SluiftClient::handleIncomingPubSubEvent(const JID& from, std::shared_ptr<Pu pendingEvents.push_back(Event(from, event)); } +void SluiftClient::handleIncomingBlockEvent(const JID& item) { + pendingEvents.push_back(Event(item, Event::BlockEventType)); +} + +void SluiftClient::handleIncomingUnblockEvent(const JID& item) { + pendingEvents.push_back(Event(item, Event::UnblockEventType)); +} + void SluiftClient::handleInitialRosterPopulated() { rosterReceived = true; } |