rename users module

src/acls.erl

@@ -60,7 +60,7 @@ check_access(#user{username = AId, type = AType}, {feature, _Feature} = R) ->
     check(Query);
 
 check_access(UId, {feature, _Feature} = Resource) ->
-    case users:get_user(UId) of
+    case kvs_users:get_user(UId) of
         {ok, User} -> check_access(User, Resource);
         E -> E
     end.

src/feed_server_api.erl

@@ -173,13 +173,13 @@ handle_notice(["feed", "user", UId, "count_entry_in_statistics"] = Route,
             kvs:put(UEC#user_etries_count{
                 entries = UEC#user_etries_count.entries+1
             }),
-            users:attempt_active_user_top(UId, UEC#user_etries_count.entries+1);
+            kvs_users:attempt_active_user_top(UId, UEC#user_etries_count.entries+1);
         {error, notfound} ->
             kvs:put(#user_etries_count{
                 user_id = UId,
                 entries = 1
             }),
-            users:attempt_active_user_top(UId, 1)
+            kvs_users:attempt_active_user_top(UId, 1)
     end,
     {noreply, State};
 
@@ -242,7 +242,7 @@ handle_notice(["system", "create_group"] = Route,
                               feed = FId},
     kvs:put(Group),
     mqs:notify([group, init], {GId, FId}),
-    users:init_mq(Group),
+    kvs_users:init_mq(Group),
 
 
     {noreply, State};
@@ -283,8 +283,8 @@ handle_notice(["db", "group", GId, "remove_group"] = Route,
             kvs:delete(group, GId),
             % unbind exchange
             {ok, Channel} = mqs:open([]),
-            Routes = users:rk_group_feed(GId),
-            users:unbind_group_exchange(Channel, GId, Routes),
+            Routes = kvs_users:rk_group_feed(GId),
+            kvs_users:unbind_group_exchange(Channel, GId, Routes),
             mqs_channel:close(Channel)
     end,
     {noreply, State};
@@ -311,7 +311,7 @@ handle_notice(["subscription", "user", UId, "add_to_group"] = Route,
 
 %    add_to_group(Who, GId, UType),
     ?INFO("add ~p to group ~p with Type ~p by ~p", [Who, GId,UType,UId]),
-    users:subscribemq(group, add, Who, GId),
+    kvs_users:subscribemq(group, add, Who, GId),
     {noreply, State};
 
 handle_notice(["subscription", "user", UId, "remove_from_group"] = Route,
@@ -319,7 +319,7 @@ handle_notice(["subscription", "user", UId, "remove_from_group"] = Route,
     ?INFO("queue_action(~p): remove_from_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
     {GId} = Message,
     ?INFO("remove ~p from group ~p", [UId, GId]),
-    users:remove_subscription_mq(group, UId, GId),
+    kvs_users:remove_subscription_mq(group, UId, GId),
 
     kvs:delete(group_subs, {UId, GId}),
     {R, Group} = kvs:get(group, GId),
@@ -363,42 +363,42 @@ handle_notice(["subscription", "user", UId, "subscribe"] = Route,
     Message, #state{owner = Owner, type =Type} = State) ->
     ?INFO(" queue_action(~p): subscribe_user: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
     {Whom} = Message,
-    users:subscribe(UId, Whom),
+    kvs_users:subscribe(UId, Whom),
     {noreply, State};
 
 handle_notice(["subscription", "user", UId, "unsubscribe"] = Route,
     Message, #state{owner = Owner, type =Type} = State) ->
     ?INFO(" queue_action(~p): remove_subscribe: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
     {Whom} = Message,
-    users:unsubscribe(UId, Whom),
+    kvs_users:unsubscribe(UId, Whom),
     {noreply, State};
 
 handle_notice(["subscription", "user", _UId, "update"] = Route,
     Message, #state{owner = Owner, type =Type} = State) ->
     ?INFO(" queue_action(~p): update_user: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
     {NewUser} = Message,
-    users:update_user(NewUser),
+    kvs_users:update_user(NewUser),
     {noreply, State};
 
 handle_notice(["gifts", "user", UId, "buy_gift"] = Route,
     Message, #state{owner = Owner, type =Type} = State) ->
     ?INFO(" queue_action(~p): buy_gift: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
     {GId} = Message,
-    users:buy_gift(UId, GId),
+    kvs_users:buy_gift(UId, GId),
     {noreply, State};
 
 handle_notice(["gifts", "user", UId, "give_gift"] = Route,
     Message, #state{owner = Owner, type =Type} = State) ->
     ?INFO(" queue_action(~p): give_gift: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
     {GId} = Message,
-    users:give_gift(UId, GId),
+    kvs_users:give_gift(UId, GId),
     {noreply, State};
 
 handle_notice(["gifts", "user", UId, "mark_gift_as_deliving"] = Route,
     Message, #state{owner = Owner, type =Type} = State) ->
     ?INFO(" queue_action(~p): mark_gift_as_deliving: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
     {GId, GTimestamp} = Message,
-    users:mark_gift_as_deliving(UId, GId, GTimestamp),
+    kvs_users:mark_gift_as_deliving(UId, GId, GTimestamp),
     {noreply, State};
 
 
@@ -406,7 +406,7 @@ handle_notice(["login", "user", UId, "update_after_login"] = Route,
     Message, #state{owner = Owner, type =Type} = State) ->
     ?INFO("queue_action(~p): update_after_login: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
     Update =
-        case users:user_status(UId) of
+        case kvs_users:user_status(UId) of
             {error, status_info_not_found} ->
                 #user_status{username = UId,
                              last_login = erlang:now()};

src/feeds.erl

@@ -188,9 +188,9 @@ get_user_likes(UserId, {Page, PageAmount}) ->
     end.
 
 % we have same in user? Why?
-is_subscribed_user(UserUidWho, UserUidWhom) -> users:is_user_subscr(UserUidWho, UserUidWhom).
-user_subscription_count(UserUid) -> length(users:list_subscr(UserUid)).
-user_friends_count(UserUid) -> length(users:list_subscr_me(UserUid)).
+is_subscribed_user(UserUidWho, UserUidWhom) -> kvs_users:is_user_subscr(UserUidWho, UserUidWhom).
+user_subscription_count(UserUid) -> length(kvs_users:list_subscr(UserUid)).
+user_friends_count(UserUid) -> length(kvs_users:list_subscr_me(UserUid)).
 
 get_comments_entries(UserUid, _, _Page, _PageAmount) ->
     Pids = [Eid || #comment{entry_id=Eid} <- kvs:select(comment,

src/groups.erl

@@ -28,7 +28,7 @@ create_group_directly_to_db(UId, GId, Name, Desc, Publicity) ->
                       created = CTime,
                       owner = UId,
                      feed = FId}),
-    users:init_mq_for_group(GId),
+    kvs_users:init_mq_for_group(GId),
     add_to_group_directly_to_db(UId, GId, member),
     GId.
 
@@ -51,8 +51,8 @@ delete_group(GId) ->
             kvs:delete(group, GId),
             % unbind exchange
             {ok, Channel} = mqs:open([]),
-            Routes = users:rk_group_feed(GId),
-            users:unbind_group_exchange(Channel, GId, Routes),
+            Routes = kvs_users:rk_group_feed(GId),
+            kvs_users:unbind_group_exchange(Channel, GId, Routes),
             mqs_channel:close(Channel)
     end.
 

src/kvs.erl

@@ -131,7 +131,7 @@ add_sample_users() ->
       end || Me <- UserList],
     ?INFO("adding users to groups"),
     [ begin
-          users:init_mq(Me#user.username, [GId1, GId2]),
+          kvs_users:init_mq(Me#user.username, [GId1, GId2]),
           groups:add_to_group_directly_to_db(Me#user.username, GId1, member),
           groups:add_to_group_directly_to_db(Me#user.username, GId2, member)
       end || Me <- UserList ],
@@ -140,7 +140,7 @@ add_sample_users() ->
     ?INFO("making all users each other friends"),
     [[case Me == Her of
         true -> ok;
-        false -> userss:subscr_user(Me#user.username, Her#user.username)
+        false -> kvs_users:subscr_user(Me#user.username, Her#user.username)
     end || Her <- UserList] || Me <- UserList].
 
 add_sample_packages() -> membership_packages:add_sample_data().

src/users.erl → src/kvs_users.erl

@@ -1,4 +1,4 @@
--module(users).
+-module(kvs_users).
 -include_lib("kvs/include/users.hrl").
 -include_lib("kvs/include/groups.hrl").
 -include_lib("kvs/include/accounts.hrl").
@@ -9,7 +9,7 @@
 register(#user{username=U, email=Email, facebook_id = FbId} = RegisterData0) ->
     FindUser = case check_username(U, FbId) of
         {error, E} -> {error, E};
-        {ok, NewName} -> case users:get({email, Email}) of
+        {ok, NewName} -> case kvs_users:get({email, Email}) of
             {error, _} -> {ok, NewName};
             {ok, _} -> {error, email_taken} end end,
 
@@ -43,13 +43,13 @@ process_register(#user{username=U} = RegisterData0) ->
     {ok, U}.
 
 check_username(Name, FbId) ->
-    case users:get(Name) of
+    case kvs_users:get(Name) of
         {error, notfound} -> {ok, Name};
         {ok, User} when FbId =/= undefined -> check_username(User#user.username  ++ integer_to_list(crypto:rand_uniform(0,10)), FbId);
         {ok, _}-> {error, username_taken} end.
 
 delete(UserName) ->
-    case users:get(UserName) of
+    case kvs_users:get(UserName) of
         {ok, User} -> GIds = groups:list_groups_per_user(UserName),
                       [nsx_msg:notify(["subscription", "user", UserName, "remove_from_group"], {GId}) || GId <- GIds],
                       F2U = [ {MeId, FrId} || #subscription{who = MeId, whom = FrId} <- subscriptions(User) ],
@@ -183,7 +183,7 @@ rk(List) -> mqs_lib:list_to_key(List).
 
 retrieve_connections(Id,Type) ->
     Friends = case Type of 
-                  user -> users:list_subscr_usernames(Id);
+                  user -> kvs_users:list_subscr_usernames(Id);
                      _ -> groups:list_group_members(Id) end,
     case Friends of
 	[] -> [];
@@ -191,7 +191,7 @@ retrieve_connections(Id,Type) ->
                 case Sub of
                      [] -> [];
                       _ -> Data = [begin case kvs:get(user,Who) of
-                                       {ok,User} -> RealName = users:user_realname_user(User),
+                                       {ok,User} -> RealName = kvs_users:user_realname_user(User),
                                                     Paid = accounts:user_paid(Who),
                                                     {Who,Paid,RealName};
 				               _ -> undefined end end || Who <- Sub],

src/store_riak.erl

@@ -21,7 +21,7 @@ start() -> ok.
 stop() -> stopped.
 
 initialize() ->
-    C = riak:client_connect('node_runner@127.0.0.1'),
+    C = riak:client_connect("n2o@127.0.0.1"),
     ets:new(config, [named_table,{keypos,#config.key}]),
     ets:insert(config, #config{ key = "riak_client", value = C}),
     ok.
@@ -525,7 +525,7 @@ join_tournament(UserId, TournamentId) ->
             Q = case accounts:balance(UserId,  quota) of
                      {ok, AS4} -> AS4;
                      {error, _} -> 0 end,
-            RN = users:user_realname(UserId),
+            RN = kvs_users:user_realname(UserId),
             kvs:put(#play_record{
                  who = UserId,
                  tournament = TournamentId,