add guard process flag

include/groups.hrl

@@ -1,7 +1,7 @@
 -include("types.hrl").
 -include("kvs.hrl").
 
--record(group,{?ITERATOR(feed),
+-record(group,{?ITERATOR(feed, true),
         name,
         description,
         scope :: public | private,

include/kvs.hrl

@@ -9,7 +9,8 @@
 -define(FEED(Type), case Type of user -> ?USR_FEED; product -> ?PRD_FEED; group -> ?GRP_FEED; entry-> ?ENT_FEED; comment-> ?CMT_FEED;_-> undefined end).
 
 -define(CONTAINER, id, top, entries_count=0).
--define(ITERATOR(Container), id, container=Container, feed_id, prev, next, feeds=[]).
+-define(ITERATOR(Container, Guard), id, container=Container, feed_id, prev, next, feeds=[], guard=Guard).
+-define(ITERATOR(Container), ?ITERATOR(Container, false)).
 -define(CONTAINERS, [
     {feed,              record_info(fields, feed)},
     {acl,               record_info(fields, acl)},

include/products.hrl

@@ -12,7 +12,7 @@
         retailer_price,
         user_price }).
 
--record(product, {?ITERATOR(feed),
+-record(product, {?ITERATOR(feed, true),
         ext_id                 :: term(),    % ext
         vendor_id              :: integer(), % auto
         categories             :: list(integer()), % admin

include/users.hrl

@@ -1,7 +1,7 @@
 -include("types.hrl").
 -include("kvs.hrl").
 
--record(user, {?ITERATOR(feed),
+-record(user, {?ITERATOR(feed, true),
         email,
         username :: username_type() | '_', %% Dialyzer and record MatchSpec warnings http://j.mp/vZ8670
         display_name,

src/kvs_feed.erl

@@ -112,11 +112,6 @@ user_likes(UserId, {Page, PageAmount}) ->
 
 %% MQ API
 
-handle_notice([kvs_feed,_,Owner,entry,_,add], [#entry{feed_id=undefined}=E|_], #state{owner=Owner}=S)->
-    GE = E#entry{id={E#entry.entry_id, ?FEED(entry)}, feed_id=undefined, feeds=[comments]},
-    error_logger:info_msg("=> entry to generic feed: ~p", [GE#entry.id]),
-    kvs:add(GE),
-    {noreply, S};
 handle_notice([kvs_feed, _, Owner, entry, Eid, add],
               [#entry{feed_id=Fid}=Entry|_],
               #state{owner=Owner} = S) ->
@@ -150,11 +145,6 @@ handle_notice([kvs_feed,_, Owner, entry, {_,Fid}, delete],
     {_,_} -> error_logger:info_msg("REMOVE from FID ~p", [Fid]),kvs:remove(entry, Id) end,
   {noreply, State};
 
-handle_notice([kvs_feed,_,Owner,comment,Cid,add],
-              [#comment{feed_id=undefined, entry_id={Eid,EFid}}=C,_,_],
-              #state{owner=Owner}=S) ->
-    kvs:add(C#comment{id={Cid, {Eid, EFid}}, feed_id=?FEED(comments)}),
-    {noreply, S};
 handle_notice([kvs_feed,_,Owner,comment,_,add],
               [#comment{entry_id={_,EFid}}=C,_,_],
               #state{owner=Owner, feeds=Feeds} = S) ->