Merge branch 'patch-8' of https://github.com/Deventual/PyMISP into Deventual-patch-8

pymisp/api.py

@@ -378,12 +378,28 @@ class PyMISP(object):
             eid = e.id
         return self.update_event(eid, e)
     
-    def publish(self, event):
+    def publish(self, event, alert=True):
-        e = self._make_mispevent(event)
+        """Publish event (with or without alert email)
-        if e.published:
+        :param event: pass event or event id (as string or int) to publish
+        :param alert: set to True by default (send alerting email) if False will not send alert
+        :return publish status
+        """
+        if type(event) is int or type(event) is str:
+            full_event = self._make_mispevent(self.get_event(event))
+            event_id = event
+        else:
+            full_event = self._make_mispevent(event)
+            event_id = full_event.id
+        if full_event.published:
             return {'error': 'Already published'}
-        e.publish()
+        session = self.__prepare_session()
-        return self.update(e)
+        if not alert:
+            url = urljoin(self.root_url, 'events/publish/{}'.format(event_id))
+        else:
+            url = urljoin(self.root_url, 'events/alert/{}'.format(event_id))
+        response = session.post(url)
+        return self._check_response(response)
+
         
     def change_threat_level(self, event, threat_level_id):
         e = self._make_mispevent(event)