libtransport.git Changeset - c83fd4c4b188

Changeset - c83fd4c4b188

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Jan Kaluza - 10 years ago 2015-11-11 08:01:19
jkaluza@redhat.com

Support only libcommuni >= 3.0.0

5 files changed with 26 insertions and 41 deletions:

CMakeLists.txt

backends/libcommuni/session.cpp

backends/libcommuni/session.h

cmake_modules/CommuniConfig.cmake

packaging/fedora/spectrum2.spec

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -343,13 +343,13 @@ if (PROTOBUF_FOUND) @@
 		if(ENABLE_PURPLE)
 			message("  libev eventloop : no (install libev-devel)")
 		endif()
 	endif()
 	if(IRC_FOUND)
-		ADD_DEFINITIONS(-DCOMMUNI_SHARED)
+		ADD_DEFINITIONS(-DIRC_SHARED)
 		message("IRC plugin        : yes")
 		include_directories(${QT_QTNETWORK_INCLUDE_DIR})
 		include_directories(${IRC_INCLUDE_DIR})
 		include(${QT_USE_FILE})
 	else()
 		if(ENABLE_IRC)

backends/libcommuni/session.cpp

➞

Show inline comments

@@ @@ -20,29 +20,26 @@ @@
 #include "session.h"
 #include <QtCore>
 #include <iostream>
 #include <IrcCommand>
 #include <IrcMessage>
 #if COMMUNI_VERSION < 0x020000
 #include <IrcUtil>
 #endif
 #include "backports.h"
 #include "ircnetworkplugin.h"
 #define FROM_UTF8(WHAT) QString::fromUtf8((WHAT).c_str(), (WHAT).size())
 #define TO_UTF8(WHAT) std::string((WHAT).toUtf8().data(), (WHAT).toUtf8().size())
 #include "transport/logging.h"
-DEFINE_LOGGER(logger, "IRCSession");
+DEFINE_LOGGER(logger, "IRCConnection");
 static bool sentList;
-MyIrcSession::MyIrcSession(const std::string &user, IRCNetworkPlugin *np, const std::string &suffix, QObject* parent) : IrcSession(parent)
+MyIrcSession::MyIrcSession(const std::string &user, IRCNetworkPlugin *np, const std::string &suffix, QObject* parent) : IrcConnection(parent)
+{
 	this->np = np;
 	this->user = user;
 	this->suffix = suffix;
 	m_connected = false;
 	rooms = 0;
+	}
 	return flags;
+}
 void MyIrcSession::on_joined(IrcMessage *message) {
 	IrcJoinMessage *m = (IrcJoinMessage *) message;
-	std::string nickname = TO_UTF8(m->sender().name());
+	std::string nickname = TO_UTF8(m->nick());
 	bool op = correctNickname(nickname);
 	getIRCBuddy(TO_UTF8(m->channel().toLower()), nickname).setOp(op);
 	np->handleParticipantChanged(user, nickname, TO_UTF8(m->channel().toLower()) + suffix, op, pbnetwork::STATUS_ONLINE);
 	LOG4CXX_INFO(logger, user << ": " << nickname << " joined " << TO_UTF8(m->channel().toLower()) + suffix);
+}
 void MyIrcSession::on_parted(IrcMessage *message) {
 	IrcPartMessage *m = (IrcPartMessage *) message;
-	std::string nickname = TO_UTF8(m->sender().name());
+	std::string nickname = TO_UTF8(m->nick());
 	bool op = correctNickname(nickname);
 	removeIRCBuddy(TO_UTF8(m->channel().toLower()), nickname);
 	LOG4CXX_INFO(logger, user << ": " << nickname << " parted " << TO_UTF8(m->channel().toLower()) + suffix);
 	np->handleParticipantChanged(user, nickname, TO_UTF8(m->channel().toLower()) + suffix, op, pbnetwork::STATUS_NONE, TO_UTF8(m->reason()));
+}
 void MyIrcSession::on_quit(IrcMessage *message) {
 	IrcQuitMessage *m = (IrcQuitMessage *) message;
-	std::string nickname = TO_UTF8(m->sender().name());
+	std::string nickname = TO_UTF8(m->nick());
 	bool op = correctNickname(nickname);
 	for(AutoJoinMap::iterator it = m_autoJoin.begin(); it != m_autoJoin.end(); it++) {
 		if (!hasIRCBuddy(it->second->getChannel(), nickname)) {
 			continue;
+		}
@@ @@ -168,13 +165,13 @@ void MyIrcSession::on_quit(IrcMessage *message) { @@
 		np->handleParticipantChanged(user, nickname, it->second->getChannel() + suffix, op, pbnetwork::STATUS_NONE, TO_UTF8(m->reason()));
+	}
+}
 void MyIrcSession::on_nickChanged(IrcMessage *message) {
 	IrcNickMessage *m = (IrcNickMessage *) message;
-	std::string nickname = TO_UTF8(m->sender().name());
+	std::string nickname = TO_UTF8(m->nick());
 	correctNickname(nickname);
 	for(AutoJoinMap::iterator it = m_autoJoin.begin(); it != m_autoJoin.end(); it++) {
 		if (!hasIRCBuddy(it->second->getChannel(), nickname)) {
 			continue;
+		}
@@ @@ -211,30 +208,30 @@ void MyIrcSession::on_modeChanged(IrcMessage *message) { @@
 	LOG4CXX_INFO(logger, user << ": " << nickname << " changed mode to " << mode << " in " << TO_UTF8(m->target().toLower()));
+}
 void MyIrcSession::on_topicChanged(IrcMessage *message) {
 	IrcTopicMessage *m = (IrcTopicMessage *) message;
-	std::string nickname = TO_UTF8(m->sender().name());
+	std::string nickname = TO_UTF8(m->nick());
 	correctNickname(nickname);
 	LOG4CXX_INFO(logger, user << ": " << nickname << " topic changed to " << TO_UTF8(m->topic()));
 	np->handleSubject(user, TO_UTF8(m->channel().toLower()) + suffix, TO_UTF8(m->topic()), nickname);
+}
 void MyIrcSession::on_messageReceived(IrcMessage *message) {
 	IrcPrivateMessage *m = (IrcPrivateMessage *) message;
 	if (m->isRequest()) {
-		QString request = m->message().split(" ", QString::SkipEmptyParts).value(0).toUpper();
+		QString request = m->content().split(" ", QString::SkipEmptyParts).value(0).toUpper();
 		if (request == "PING" || request == "TIME" || request == "VERSION") {
 			LOG4CXX_INFO(logger, user << ": " << TO_UTF8(request) << " received and has been answered");
 			return;
+		}
+	}
-	QString msg = m->message();
+	QString msg = m->content();
 	if (m->isAction()) {
 		msg = QString("/me ") + msg;
+	}
 	QString html = "";//msg;
 	CommuniBackport::toPlainText(msg);
 // 		html = IrcUtil::messageToHtml(html);
 // 	}
 	std::string target = TO_UTF8(m->target().toLower());
 	LOG4CXX_INFO(logger, user << ": Message from " << target);
 	if (target.find("#") == 0) {
-		std::string nickname = TO_UTF8(m->sender().name());
+		std::string nickname = TO_UTF8(m->nick());
 		correctNickname(nickname);
 		np->handleMessage(user, target + suffix, TO_UTF8(msg), nickname, TO_UTF8(html));
+	}
 	else {
-		std::string nickname = TO_UTF8(m->sender().name());
+		std::string nickname = TO_UTF8(m->nick());
 		correctNickname(nickname);
 		if (m_pms.find(nickname) != m_pms.end()) {
 			if (hasIRCBuddy(m_pms[nickname], nickname)) {
 				LOG4CXX_INFO(logger, nickname);
 				np->handleMessage(user, m_pms[nickname] + suffix, TO_UTF8(msg), nickname, TO_UTF8(html), "", false, true);
 				return;
@@ @@ -390,25 +387,25 @@ void MyIrcSession::awayTimeout() { @@
+		}
+	}
+}
 void MyIrcSession::on_noticeMessageReceived(IrcMessage *message) {
 	IrcNoticeMessage *m = (IrcNoticeMessage *) message;
-	LOG4CXX_INFO(logger, user << ": NOTICE " << TO_UTF8(m->message()));
+	LOG4CXX_INFO(logger, user << ": NOTICE " << TO_UTF8(m->content()));
-	QString msg = m->message();
+	QString msg = m->content();
 	CommuniBackport::toPlainText(msg);
 	std::string target = TO_UTF8(m->target().toLower());
 	if (target.find("#") == 0) {
-		std::string nickname = TO_UTF8(m->sender().name());
+		std::string nickname = TO_UTF8(m->nick());
 		correctNickname(nickname);
 		np->handleMessage(user, target + suffix, TO_UTF8(msg), nickname);
+	}
 	else {
-		std::string nickname = TO_UTF8(m->sender().name());
+		std::string nickname = TO_UTF8(m->nick());
 		correctNickname(nickname);
 		if (nickname.find(".") != std::string::npos) {
 			return;
+		}
 		if (m_pms.find(nickname) != m_pms.end()) {
 			if (hasIRCBuddy(m_pms[nickname], nickname)) {

backends/libcommuni/session.h

➞

Show inline comments

@@ @@ -19,24 +19,24 @@ @@
  */
 #ifndef SESSION_H
 #define SESSION_H
 #ifndef Q_MOC_RUN
-#include <IrcSession>
+#include <IrcConnection>
 #include <transport/networkplugin.h>
 #include "Swiften/Swiften.h"
 #include <boost/smart_ptr/make_shared.hpp>
 #include <QTimer>
 #endif
 using namespace Transport;
 class IRCNetworkPlugin;
-class MyIrcSession : public IrcSession
+class MyIrcSession : public IrcConnection
+{
     Q_OBJECT
 public:
 	class AutoJoinChannel {
 		public:

cmake_modules/CommuniConfig.cmake

➞

Show inline comments

 find_package(Qt4)
 include( ${QT_USE_FILE} )
 FIND_LIBRARY(IRC_LIBRARY NAMES Communi PATHS ${QT_LIBRARY_DIR})
 FIND_PATH(IRC_INCLUDE_DIR NAMES "ircglobal.h" PATHS ${QT_INCLUDE_DIR} PATH_SUFFIXES Communi)
 FIND_LIBRARY(IRC_LIBRARY NAMES IrcCore PATHS ${QT_LIBRARY_DIR})
 FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${QT_INCLUDE_DIR} PATH_SUFFIXES Communi)
 # message( STATUS ${IRC_LIBRARY})
 if( IRC_LIBRARY AND IRC_INCLUDE_DIR )
     message( STATUS "Found libCommuni ${IRC_LIBRARY}, ${IRC_INCLUDE_DIR}")
     set( IRC_FOUND 1 )
 	set(IRC_INCLUDE_DIR ${IRC_INCLUDE_DIR}/IrcCore ${IRC_INCLUDE_DIR}/IrcUtil ${IRC_INCLUDE_DIR}/IrcModel)
 	message( STATUS "Found libCommuni ${IRC_LIBRARY}, ${IRC_INCLUDE_DIR}")
 	set( IRC_FOUND 1 )
 else()
-    message( STATUS "Could NOT find libCommuni" )
+	message( STATUS "Could NOT find libCommuni" )
 endif()

packaging/fedora/spectrum2.spec

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ BuildRequires: protobuf-devel @@
 BuildRequires: protobuf-compiler
 BuildRequires: popt-devel
 BuildRequires: libidn-devel
 BuildRequires: expat-devel
 BuildRequires: avahi-devel
 BuildRequires: log4cxx-devel
-#BuildRequires: swiften-devel
 BuildRequires: swiften-devel
 BuildRequires: libcommuni-devel
 Requires:      libtransport%{?_isa} = %{version}-%{release}
 %description
 Spectrum 2 is an XMPP transport/gateway and also simple XMPP server.
@@ @@ -55,13 +55,13 @@ getent passwd %{username} >/dev/null || \ @@
         -s /sbin/nologin \
         -c "spectrum XMPP transport" %{username}
 exit 0
 %files
 %defattr(-, root, root,-)
 %doc README
+%doc README.md
 %{_bindir}/spectrum2
 %{_bindir}/spectrum2_manager
 /etc/spectrum2/*
 %{_initddir}/spectrum2
 %attr(700, %{username}, %{groupname}) %{_localstatedir}/lib/spectrum2/
 %attr(700, %{username}, %{groupname}) %{_localstatedir}/run/spectrum2/
@@ @@ -132,25 +132,12 @@ Requires: libtransport%{?_isa} = %{version}-%{release} @@
 Spectrum2 Swiften backend
 %files swiften-backend
 %defattr(-, root, root,-)
 /usr/bin/spectrum2_swiften_backend
 %package libyahoo2-backend
 Summary:    Libtransport
 Group:      Development/Libraries
 Requires:   boost
 Requires:   libtransport%{?_isa} = %{version}-%{release}
 %description libyahoo2-backend
 Spectrum2 libyahoo2 backend
 %files libyahoo2-backend
 %defattr(-, root, root,-)
 /usr/bin/spectrum2_libyahoo2_backend
 %package twitter-backend
 Summary:    Libtransport
 Group:      Development/Libraries
 Requires:   boost
 Requires:   libtransport%{?_isa} = %{version}-%{release}

0 comments (0 inline, 0 general)