elib/rfc4627/rfc4627.erl elib/twitter_client/twitter_client.erl elib/twitter_client/twitter_client.hrl src/components/stats_controller.erl src/components/stats_view.et src/twoorl_stats.erl src/twoorl_twitter.erl @@ -6,3 +6,5 @@ Mnesia.nonode@nohost/ #*# .#* .DS_Store +twoorl.mnesia/ +twoorl_stats .gitignore @@ -1,3 +1,6 @@ {"src/twoorl.erl", [{outdir, "./ebin"}]}. +{"src/twoorl_sup.erl", [{outdir, "./ebin"}]}. +{"src/twoorl_server.erl", [{outdir, "./ebin"}]}. {"src/twoorl_util.erl", [{outdir, "./ebin"}]}. -{"elib/*.erl", [{outdir, "./ebin"}]}. \ No newline at end of file +{"elib/rfc4627/*", [{outdir, "./ebin"}]}. +{"elib/twitter_client/*", [{outdir, "./ebin"}]}. \ No newline at end of file Emakefile @@ -1,7 +1,7 @@ all: code code: clean - erl -s make all load -run twoorl init_mysql -run twoorl compile -s init stop + erl -s make all load -s init stop clean: rm -fv ebin/*.beam twoorl.rel twoorl.script twoorl.boot erl_crash.dump *.log *.access Makefile @@ -10,3 +10,12 @@ To run Twoorl follow the following steps: Cheers! Yariv + +To run in embedded mode: + +$ make clean && make +$ erl -sname twoorlapp -setcookie twoorl -mnesia dir "'twoorl.mnesia'" -yaws embedded true -pa ebin -boot start_sasl +1> [application:start(X) || X <- [inets, crypto, mnesia, twoorl]]. +[ok, ok, ok, ok] + +# Nick Gerakines README.txt @@ -1,14 +1,19 @@ {application, twoorl, [ {description, "Twoorl is an open-source Twitter clone."}, {vsn, "0.3"}, - {modules, [ - twoorl, - twoorl_server, - twoorl_sup - ]}, + {modules, [twoorl, twoorl_server, twoorl_sup]}, {registered, [twoorl]}, - {env, []}, {applications, [kernel, stdlib, sasl, crypto, inets, mnesia]}, {mod, {twoorl, []}}, - {start_phases, []} + {env, [ + {dbconns, [ + {"localhost", "root", "password", "twoorl", 3} + ]}, + {tables, [session]} + ]}, + {start_phases, [ + {mysql, []}, + {mnesia, []}, + {compile, []} + ]} ]}. ebin/twoorl.app @@ -63,23 +63,18 @@ send(A) -> Usr:gravatar_enabled()}, {twitter_status, TwitterStatus}]), Msg1 = Msg:save(), + spawn(twoorl_stats, call, [{record, twoot}]), if TwitterEnabled andalso RecipientNames == [] -> - %% yey concurrency - spawn( - fun() -> - send_tweet(Usr, Msg1) - end); + spawn(twoorl_twitter, send_tweet, [Usr, Msg1]); %% yey concurrency true -> ok end, %% yey concurrency - spawn( - fun() -> - save_replies(Msg1:id(), RecipientNames) - end), - + RecipientIds = usr:find({username, in, lists:usort([Name || Name <- RecipientNames])}), + spawn(reply, save_replies, [Msg1:id(), RecipientIds]), + case proplists:get_value("get_html", Params) of "true" -> Msg2 = msg:created_on( @@ -95,14 +90,6 @@ send(A) -> end end). -save_replies(MsgId, RecipientNames) -> - RecipientNames1 = [Name || Name <- RecipientNames], - Recipients = - usr:find({username, in, lists:usort(RecipientNames1)}), - RecipientIds = - [Recipient:id() || Recipient <- Recipients], - reply:save_replies(MsgId, RecipientIds). - follow(A) -> twoorl_util:auth( A, @@ -162,24 +149,3 @@ follow(A) -> exit(Errs2) end end). - - -send_tweet(Usr, Msg) -> - Username = Usr:twitter_username(), - Password = Usr:twitter_password(), - - Res = twitter:update(Username, Password, Msg:body_raw()), - - UpdateFun = fun(Status) -> - msg:update([{twitter_status, Status}], - {id,'=',Msg:id()}) - end, - case Res of - {ok, {{_Protocol, 200, _},_Headers, _Body}} -> - UpdateFun(?TWITTER_SENT_OK); - _ -> - ?Warn("error sending tweet ~p ~p", [Msg:id(), Res]), - UpdateFun(?TWITTER_SENT_ERR) - end. - - src/components/api_controller.erl @@ -54,7 +54,8 @@ index(A) -> Errs end, if Errs1 == [] -> - do_login(A, Usr); + %% spawn(twoorl_stats, call, [{record, site_login}]), + do_login(Usr); true -> [?Data(A, undefined), {ewc, ui_msgs, [A, Errs1]}] src/components/login_controller.erl @@ -42,6 +42,7 @@ index(A) -> true -> %% todo set cookie Usr = register_usr(Username, Email, Password), + spawn(twoorl_stats, call, [{record, registration}]), login_controller:do_login(Usr) end; _ -> src/components/register_controller.erl @@ -21,11 +21,7 @@ -module(reply). -compile(export_all). - -save_replies(MsgId, RecipientIds) -> - Replies = - [reply:new_with( - [{usr_id, RecipientId}, - {msg_id, MsgId}]) || RecipientId <- - RecipientIds], +save_replies(MsgId, Recipients) -> + Replies = [reply:new_with([{usr_id, Recipient:id()}, {msg_id, MsgId}]) + || Recipient <- Recipients], reply:insert(Replies). src/components/reply.erl @@ -78,7 +78,7 @@ get_validation_fun(true) -> FName = case Field of "twitter_username" -> "Twitter username"; - "twitter_password" -> + "twitter_password" -> "Twitter password" end, {error, {missing_field, FName}}; @@ -91,24 +91,14 @@ get_validation_fun(_) -> ok end. -verify_twitter_credentials(TwitterEnabled, TwitterUsername, TwitterPassword) -> - if (TwitterEnabled andalso not (TwitterUsername == []) - andalso not (TwitterPassword == [])) -> - case twitter:verify_credentials( - TwitterUsername, TwitterPassword) of - ok -> - []; - {error, unauthorized} -> - [twitter_unauthorized]; - {error, Err} -> - ?Error("twitter authorization error: ~p ~p ~p", - [TwitterUsername, TwitterPassword, - Err]), - [twitter_authorization_error] - end; - true -> - [] - end. +verify_twitter_credentials(_, [], _) -> []; +verify_twitter_credentials(_, _, []) -> []; +verify_twitter_credentials(1, Username, Password) -> + case twitter_client:account_verify_credentials(Username, Password, []) of + true -> []; + false -> [twitter_unauthorized] + end; +verify_twitter_credentials(_, _, _) -> []. update_settings(Usr, TwitterUsername, TwitterPassword, TwitterEnabled, GravatarEnabled, Background, Language) -> src/components/settings_controller.erl @@ -26,13 +26,54 @@ start(_Type, _Args) -> twoorl_sup:start_link([]). -start() -> - application:start(inets), - init_mnesia(), - TablesInfo = [{session, [{attributes, record_info(fields, session)}]}], - create_mnesia_tables(TablesInfo), - init_mysql(), - compile(). +start_phase(mysql, _, _) -> + {ok, DBConfig} = application:get_env(twoorl, dbconns), + [begin + mysql_connect(PoolSize, Hostname, User, Password, Database, true) + end || {Hostname, User, Password, Database, PoolSize} <- DBConfig], + ok; + +start_phase(compile, _, _) -> + twoorl:compile(), + ok; + +%% Having the mnesia store on a separate but connected node with a module +%% to handle its maintenance would move a lot of this foo out of the +%% application stack. Eventually that really needs to happen. -- nkg +start_phase(mnesia, _, _) -> + %% Mnesia should have been started already, because of that the schema + %% is in memory if the schema doesn't already exist on disc. If so we + %% change the type so that it writes to the mnesia dir we set. -- nkg + case mnesia:table_info(schema, storage_type) of + ram_copies -> + mnesia:change_table_copy_type(schema, node(), disc_copies); + _ -> + ok + end, + ExistingTables = mnesia:system_info(tables) -- [schema], + {ok, Tables} = application:get_env(twoorl, tables), + [begin + create_table(session) + end || Table <- Tables, not lists:member(Table, ExistingTables)], + ok. + +create_table(session) -> + mnesia:create_table(session, [{attributes, record_info(fields, session)}]), + ok. + +mysql_connect(0, _, _, _, _, _) -> ok; +mysql_connect(PoolSize, Hostname, User, Password, Database, true) -> + erlydb:start(mysql, [ + {hostname, Hostname}, + {username, User}, + {password, Password}, + {database, Database}, + {logfun, fun twoorl_util:log/4} + ]), + mysql_connect(PoolSize - 1, Hostname, User, Password, Database, false); +mysql_connect(PoolSize, Hostname, User, Password, Database, false) -> + mysql:connect(erlydb_mysql, Hostname, undefined, User, Password, Database, true), + mysql_connect(PoolSize - 1, Hostname, User, Password, Database, false). compile() -> compile([]). @@ -47,12 +88,25 @@ compile(Opts) -> erlyweb:compile(compile_dir(default), [{erlydb_driver, mysql}, {erlydb_timeout, 20000} | Opts]). +compile_dir(auto) -> + {ok, CWD} = file:get_cwd(), CWD; +compile_dir(default) -> + ?APP_PATH; +compile_dir(appconfig) -> + {ok, CDir} = application:get_env(twoorl, compile_dir), + CDir; compile_dir(Dir) -> - case Dir of - auto -> {ok, CWD} = file:get_cwd(), CWD; - default -> ?APP_PATH; - _ -> Dir - end. + Dir. + +%% --- The rest of these functions will be deprecated --- %% + +start() -> + application:start(inets), + init_mnesia(), + TablesInfo = [{session, [{attributes, record_info(fields, session)}]}], + create_mnesia_tables(TablesInfo), + init_mysql(), + compile(). init_mnesia() -> ?L("creating schema"), @@ -98,7 +152,6 @@ create_table(Table, Def) -> exit(Err2) end. - init_mysql() -> erlydb:start(mysql, [{hostname, ?DB_HOSTNAME}, src/twoorl.erl @@ -28,5 +28,5 @@ start_link(Args) -> init(Args) -> {ok, {{one_for_one, 10, 10}, [ - {twoorl_yaws, {twoorl_server, start_link, [Args]}, permanent, 2000, worker, [twoorl_server]} + {twoorl_yaws, {twoorl_server, start_link, [Args]}, permanent, 20000, worker, [twoorl_server]} ]}}. src/twoorl_sup.erl @@ -376,7 +376,7 @@ get_bundle(A) -> Usr -> Lang = Usr:language(), case lists:keysearch(Lang, 1, bundles()) of - none -> + false -> ?Warn("undefined language: ~p ~p", [Usr:username(), Lang]), twoorl_eng; src/twoorl_util.erl fe7f92ea1eff9de6f22a50880fdbac1cb7768521 Yariv Sadan yarivvv@gmail.com http://github.com/yariv/twoorl/commit/ede429e2dab0ac2c552349d5220fbc8f08510b52 ede429e2dab0ac2c552349d5220fbc8f08510b52 2008-06-17T20:58:12-07:00 2008-06-17T20:58:12-07:00 Merge branch 'my-ngerakines' Conflicts: .gitignore src/components/login_controller.erl src/components/settings_controller.erl src/twitter.erl a3d71b1a0331e5abb62bdc2298c0f94ce5c7b0b8 Yariv Sadan yarivvv@gmail.com