From 2cc21583d9c75a36099b55f67d215b9f8300bbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 2 Nov 2016 15:39:16 +0100 Subject: [PATCH] On-create activities are only created for Pillar nodes. This allows Attract to use custom on-create activities. --- pillar/api/nodes/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pillar/api/nodes/__init__.py b/pillar/api/nodes/__init__.py index 268ffd80..5ac28ba6 100644 --- a/pillar/api/nodes/__init__.py +++ b/pillar/api/nodes/__init__.py @@ -10,7 +10,7 @@ from bson import ObjectId from flask import current_app, g, Blueprint, request import pillar.markdown -from pillar.api import file_storage +from pillar.api.node_types import PILLAR_NAMED_NODE_TYPES from pillar.api.activities import activity_subscribe, activity_object_add from pillar.api.utils.algolia import algolia_index_node_delete from pillar.api.utils.algolia import algolia_index_node_save @@ -257,9 +257,13 @@ def after_inserting_nodes(items): else: activity_subscribe(item['user'], 'node', item['_id']) verb = 'commented' - else: + elif item['node_type'] in PILLAR_NAMED_NODE_TYPES: verb = 'posted' activity_subscribe(item['user'], 'node', item['_id']) + else: + # Don't automatically create activities for non-Pillar node types, + # as we don't know what would be a suitable verb (among other things). + continue activity_object_add( item['user'],