migrations/9.sql @@ -61,7 +61,8 @@ send(A) -> Usr:email())}, {usr_gravatar_enabled, Usr:gravatar_enabled()}, - {twitter_status, TwitterStatus}]), + {twitter_status, TwitterStatus}, + {spam, Usr:spammer()}]), Msg1 = Msg:save(), %% twoorl_stats:cast({record, twoorl}), src/components/api_controller.erl @@ -26,7 +26,7 @@ index(A) -> FeedUrl = <<"/feeds/main/rss">>, {response, [{body, [?Data(A, twoorl_util:get_feed_link(FeedUrl, <<"RSS">>)), - {ewc, timeline, show, [A]}]}, + {ewc, timeline, show, [A, undefined, [{filter_spam, true}]]}]}, {phased_vars, [{header_items, [{feed_link, <<"rss+xml">>, src/components/main_controller.erl @@ -40,21 +40,25 @@ show(A, UserIds) -> show(A, UserIds, Opts) -> OrderBy = {order_by, {created_on, desc}}, + Where = case proplists:get_value(filter_spam, Opts) of + true -> + {'not', {spam,'=',1}}; + _ -> + undefined + end, %% this function is a prime optimization candidate - Total = + Where1 = if UserIds =/= undefined -> - msg:count('*', {usr_id, in, UserIds}); + {'and', [{usr_id, in, UserIds}, Where]}; true -> - msg:count('*') + Where end, + Total = msg:count('*', Where1), + {replace, {ewc, paging, [A, fun(Limit) -> - if UserIds =/= undefined -> - msg:find({usr_id,in,UserIds}, [OrderBy, Limit]); - true -> - msg:find_with([OrderBy, Limit]) - end + msg:find(Where1, [OrderBy, Limit]) end, fun(Msgs) -> {ewc, timeline, show_msgs, [A, Msgs, Opts]} src/components/timeline_controller.erl @@ -37,3 +37,12 @@ m8() -> msg:update([{body, Body1}], {id,'=',Msg:id()}) end, Msgs). + +m9() -> + Users = usr:find({spammer,'=',1}), + lists:foreach( + fun(Usr) -> + msg:update([{spam, 1}], {usr_id,'=',Usr:id()}) + end, Users). + + src/twoorl_migrations.erl d7d3fd64e9d8e2de5d16f96326737a587b703ce2 Yariv Sadan yarivvv@gmail.com http://github.com/yariv/twoorl/commit/6b3c0dcf858fc135a85eaf8dbb19ee2fd879eb17 6b3c0dcf858fc135a85eaf8dbb19ee2fd879eb17 2008-06-22T11:05:07-07:00 2008-06-22T11:05:07-07:00 added spam filtering df39dd044b375399fbcd4698f20c948dc68cd66d Yariv Sadan yarivvv@gmail.com