3 files changed, 87 insertions, 0 deletions
diff --git a/Swiften/Events/MessageEvent.h b/Swiften/Events/MessageEvent.h
new file mode 100644
index 0000000..43174a1
--- /dev/null
+++ b/Swiften/Events/MessageEvent.h
@@ -0,0 +1,33 @@
+#ifndef SWIFTEN_MessageEvent_H
+#define SWIFTEN_MessageEvent_H
+
+#include <cassert>
+
+#include <boost/signals.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include "Swiften/Events/StanzaEvent.h"
+#include "Swiften/Elements/Message.h"
+
+namespace Swift {
+	class MessageEvent : public StanzaEvent {
+		public:
+			MessageEvent(boost::shared_ptr<Message> stanza) : stanza_(stanza){};
+			virtual ~MessageEvent(){};
+			boost::shared_ptr<Message> getStanza() {return stanza_;}
+
+			bool isReadable() {
+				return getStanza()->isError() || !getStanza()->getBody().isEmpty();
+			}
+
+			void read() {
+				assert (isReadable());
+				conclude();
+			}
+
+		private:
+			boost::shared_ptr<Message> stanza_;
+	};
+}
+
+#endif
diff --git a/Swiften/Events/StanzaEvent.h b/Swiften/Events/StanzaEvent.h
new file mode 100644
index 0000000..b1dc537
--- /dev/null
+++ b/Swiften/Events/StanzaEvent.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <boost/signals.hpp>
+#include <boost/shared_ptr.hpp>
+
+namespace Swift {
+	class StanzaEvent {
+		public:
+			StanzaEvent(){concluded_ = false;};
+			virtual ~StanzaEvent() {};
+			void conclude() {concluded_ = true; onConclusion();};
+			/** Do not call this directly from outside the class */
+			boost::signal<void()> onConclusion;
+			bool getConcluded() {return concluded_;};
+		private:
+			bool concluded_;
+	};
+}
diff --git a/Swiften/Events/SubscriptionRequestEvent.h b/Swiften/Events/SubscriptionRequestEvent.h
new file mode 100644
index 0000000..ed063d7
--- /dev/null
+++ b/Swiften/Events/SubscriptionRequestEvent.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cassert>
+
+#include <boost/signals.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include "Swiften/Events/StanzaEvent.h"
+#include "Swiften/Base/String.h"
+#include "Swiften/JID/JID.h"
+
+namespace Swift {
+	class SubscriptionRequestEvent : public StanzaEvent {
+		public:
+			SubscriptionRequestEvent(const JID& jid, const String& reason) : jid_(jid), reason_(reason){};
+			virtual ~SubscriptionRequestEvent(){};
+			const JID& getJID() const {return jid_;};
+			const String& getReason() const {return reason_;};
+			boost::signal<void()> onAccept;
+			boost::signal<void()> onDecline;
+			void accept() {
+				onAccept();
+				conclude();
+			};
+
+			void decline() {
+				onDecline();
+				conclude();
+			};
+
+		private:
+			JID jid_;
+			String reason_;
+	};
+}
+