Got the subscription event scope parameter added.

SubscriptionManager.cpp

@@ -1,5 +1,6 @@
 #include "SubscriptionManager.h"
 #include "Log.h"
+#include <algorithm>
 
 namespace core {
 
@@ -13,15 +14,23 @@ namespace core {
    int SubscriptionManager::removeSessionSubscriptions(TCPSession &session) {
       int countSubscribed = 0;
       int countPublished = 0;
-      for(auto subscription = subscriptions.begin(); subscription != subscriptions.end();) {
-         countSubscribed += (*subscription).second->unsubscribe(session);
-         if((*subscription).second->owner == &session) {
-            subscription = subscriptions.erase(subscription);
-//            delete (*subscription).second;
-            ++countPublished;
-         } else
-           ++subscription;
 
+      std::string temp = "";
+      for(auto [key, subscription] : subscriptions) {
+         if(temp != "") {
+            subscriptions.erase(temp);
+            temp = "";
+         }
+         countSubscribed += subscription->unsubscribe(session);
+         if(subscription->owner == &session) {
+            temp = key;
+            delete subscription;
+            ++countPublished;
+         } 
+      }
+      if(temp != "") {
+         subscriptions.erase(temp);
+         temp = "";
       }
       coreutils::Log(coreutils::LOG_DEBUG_2) << "Removed session from " << countSubscribed << " subscription(s).";
       coreutils::Log(coreutils::LOG_DEBUG_2) << "Cancelled " << countPublished << " channel(s) for session.";
@@ -30,15 +39,13 @@ namespace core {
 
    int SubscriptionManager::processCommand(coreutils::ZString &request, TCPSession &session) {
       if(request[0].equals("publish")) {
-         Subscription *newSubscription = new Subscription(request[1].str(), session);
+         Subscription *newSubscription = new Subscription(request[1].str(), session, request[2].str());
          subscriptions.insert(std::make_pair(request[1].str(), newSubscription));
 	      return 1;
       } else if(request[0].equals("catalog")) {
       	session.out << ":catalog:";
          for(auto const& [key, subscription] : subscriptions) {
-	  	      session.out << subscription->id << "|";
-//            subscription->processCommand(request, session);
-     	      session.out << (";");
+	  	      session.out << subscription->id << ";";
          }
  	      session.out << std::endl;
       	return 1;
@@ -51,19 +58,29 @@ namespace core {
 	         subscriptions.erase(request[1].str());
          } else if(request[0].equals("subscribe")) {
    	      subscription->subscribe(session);
+            return 1;
          } else if(request[0].equals("unsubscribe")) {
 	         subscription->unsubscribe(session);
+            return 1;
          } else if(request[0].equals("event")) {
-//            coreutils::Log(coreutils::LOG_DEBUG_2) << "request: [" << request << "].";
-            if(subscription->owner == &session) {
-               std::stringstream out;
-               subscription->process(request, out);
+            std::stringstream out;
+            subscription->process(request, out);
+            if(subscription->mode == "*ANYONE") {
 	            subscription->event(out);
+               return 1;
+            } else if(subscription->mode == "*SUBSCRIBERS") {
+               if(subscription->ifSubscriber(session)) {
+	               subscription->event(out);
+                  return 1;
+               }
+            } else if(subscription->mode == "*AUTHOR") {
+               if(subscription->owner == &session) {
+	               subscription->event(out);
+                  return 1;
+               }
             }
-            else
-              return 0;
          }
-         return 1;
+         return 0;
       }
       return 0;
    }