Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add methods for requesting VCard of a MIX channel participant #80

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add methods for requesting VCard of a MIX channel participant #80

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ea47f3
Add Channel Join and Leave capability to MIX
tarun018 Jul 7, 2017
a720137
Add methods for requesting VCard of a channel participant
tarun018 Jul 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add methods for requesting VCard of a channel participant 
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.

Test-Information:
Tests added for requesting VCard as in XEP-0369, which passes.
Tested on Ubuntu 16.04 LTS.

Change-Id: I08f550c71066e373955439ca81d61a26b7c254d9
  • Loading branch information
@tarun018
tarun018 committed Jul 18, 2017
commit a720137b36309d74202788d8fdac1bc1be895320
5 changes: 5 additions & 0 deletions Swiften/MIX/MIX.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <Swiften/JID/JID.h>
#include <Swiften/Elements/MIXJoin.h>
#include <Swiften/Elements/MIXLeave.h>
#include <Swiften/Elements/VCard.h>
#include <Swiften/Elements/ErrorPayload.h>

namespace Swift {
Expand All @@ -34,10 +35,14 @@ namespace Swift {

virtual void leaveChannel() = 0;

virtual void requestVCard(const JID &participant) = 0;

public:
boost::signals2::signal<void (MIXJoin::ref /* joinResponse */)> onJoinComplete;
boost::signals2::signal<void (ErrorPayload::ref /* joinError */)> onJoinFailed;
boost::signals2::signal<void (MIXLeave::ref /* leaveResponse */)> onLeaveComplete;
boost::signals2::signal<void (ErrorPayload::ref /* leaveError */)> onLeaveFailed;
boost::signals2::signal<void (VCard::ref /* vCard */)> onVCardReceived;
boost::signals2::signal<void (ErrorPayload::ref /* vCardRequestError */)> onVCardRequestFailed;
};
}
16 changes: 15 additions & 1 deletion Swiften/MIX/MIXImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include <Swiften/MIX/MIXImpl.h>

#include <Swiften/Client/StanzaChannel.h>
#include <Swiften/Elements/IQ.h>
#include <Swiften/Queries/GenericRequest.h>
#include <Swiften/Queries/IQRouter.h>
Expand Down Expand Up @@ -60,4 +59,19 @@ void MIXImpl::handleLeaveResponse(MIXLeave::ref payload, ErrorPayload::ref error
}
}

void MIXImpl::requestVCard(const JID &participant) {
auto vCardPayload = std::make_shared<VCard>();
auto request = std::make_shared<GenericRequest<VCard> >(IQ::Get, participant, vCardPayload, iqRouter_);
request->onResponse.connect(boost::bind(&MIXImpl::handleVCardReceived, this, _1, _2));
request->send();
}

void MIXImpl::handleVCardReceived(VCard::ref payload, ErrorPayload::ref error) {
if (error) {
onVCardRequestFailed(error);
} else {
onVCardReceived(payload);
}
}

}
3 changes: 3 additions & 0 deletions Swiften/MIX/MIXImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ namespace Swift {

virtual void leaveChannel() override;

virtual void requestVCard(const JID &participant) override;

private:
void handleJoinResponse(MIXJoin::ref, ErrorPayload::ref);
void handleLeaveResponse(MIXLeave::ref, ErrorPayload::ref);
void handleVCardReceived(VCard::ref payload, ErrorPayload::ref error);

private:
JID ownJID_;
Expand Down
28 changes: 28 additions & 0 deletions Swiften/MIX/UnitTest/MIXImplTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class MIXImplTest : public ::testing::Test {
auto mix = std::make_shared<MIXImpl>(ownJID_, channelJID_, router_);
mix->onJoinComplete.connect(boost::bind(&MIXImplTest::handleJoinComplete, this, _1));
mix->onLeaveComplete.connect(boost::bind(&MIXImplTest::handleLeaveComplete, this, _1));
mix->onVCardReceived.connect(boost::bind(&MIXImplTest::handleVCard, this, _1));
return mix;
}

Expand All @@ -50,6 +51,11 @@ class MIXImplTest : public ::testing::Test {
ASSERT_EQ(static_cast<int>(0), subscribedNodes_.size());
}

void handleVCard(VCard::ref payload) {
ASSERT_TRUE(payload);
vCardResult_ = payload;
}

IQ::ref createJoinResult(const std::unordered_set<std::string>& nodes) {
auto joinResultPayload = std::make_shared<MIXJoin>();
for (auto node : nodes) {
Expand All @@ -72,12 +78,23 @@ class MIXImplTest : public ::testing::Test {
return std::find(subscribedNodes_.begin(), subscribedNodes_.end(), value) != subscribedNodes_.end();
}

IQ::ref createVCardResult() {
auto vCard = std::make_shared<VCard>();
vCard->setFullName("Peter Saint-Andre");
vCard->setFamilyName("Saint-Andre");
vCard->setGivenName("Peter");
vCard->setNickname("stpeter");
vCard->addURL("http://www.xmpp.org/xsf/people/stpeter.shtml");
return IQ::createResult(ownJID_, channel_->sentStanzas[0]->getTo(), channel_->sentStanzas[0]->getID(), vCard);
}

JID ownJID_;
JID channelJID_;
DummyStanzaChannel* channel_;
IQRouter* router_;
int successfulJoins_;
std::unordered_set<std::string> subscribedNodes_;
VCard::ref vCardResult_;
};

TEST_F(MIXImplTest, testJoinChannelOnly) {
Expand Down Expand Up @@ -182,3 +199,14 @@ TEST_F(MIXImplTest, testLeaveChannel) {

channel_->onIQReceived(createLeaveResult());
}

TEST_F(MIXImplTest, testRequestVCard) {
MIX::ref testling = createMIXClient();
testling->requestVCard(JID("989898#coven@mix.shakespeare.example"));
ASSERT_EQ(1, static_cast<int>(channel_->sentStanzas.size()));
ASSERT_TRUE(channel_->isRequestAtIndex<VCard>(0, JID("989898#coven@mix.shakespeare.example"), IQ::Get));

channel_->onIQReceived(createVCardResult());
ASSERT_TRUE(vCardResult_);
ASSERT_EQ(vCardResult_->getFullName(), std::string("Peter Saint-Andre"));
}