elib/rfc4627/rfc4627.erl elib/twitter_client/twitter_client.erl elib/twitter_client/twitter_client.hrl migrations/8.sql migrations/9.sql src/bundles/twoorl_deu.erl src/bundles/twoorl_fra.erl src/bundles/twoorl_kor.erl src/bundles/twoorl_pol.erl src/bundles/twoorl_por_br.erl src/bundles/twoorl_spa.erl src/components/language_select_controller.erl src/components/language_select_view.et src/components/stats_controller.erl src/components/stats_view.et src/twoorl_stats.erl src/twoorl_twitter.erl @@ -1,3 +1,6 @@ {"src/twoorl.erl", [{outdir, "./ebin"}]}. -{"src/twoorl_util.erl", [{outdir, "./ebin"}]}. -{"elib/*.erl", [{outdir, "./ebin"}]}. \ No newline at end of file +{"src/twoorl_sup.erl", [{outdir, "./ebin"}]}. +{"src/twoorl_server.erl", [{outdir, "./ebin"}, + {i, "/Users/yariv/yaws/include"}]}. +{"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 @@ -1,8 +1,26 @@ +%% This file is part of Twoorl. +%% +%% Twoorl is free software: you can redistribute it and/or modify +%% it under the terms of the GNU General Public License as published by +%% the Free Software Foundation, either version 3 of the License, or +%% (at your option) any later version. +%% +%% Twoorl is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. +%% +%% You should have received a copy of the GNU General Public License +%% along with Twoorl. If not, see <http://www.gnu.org/licenses/>. + -module(twoorl_eng). -export([bundle/1]). bundle(Tag) -> case Tag of + + language -> <<"english">>; + %% layout login -> <<"login">>; register -> <<"register">>; @@ -12,7 +30,7 @@ bundle(Tag) -> get_source -> <<"Get the <a href=\"http://code.google.com/p/twoorl\">" "source code</a>">>; - + %% navbar home -> <<"home">>; replies -> <<"replies">>; @@ -27,25 +45,25 @@ bundle(Tag) -> login_submit -> <<"login">>; %% register page + % note: 'username', 'password' and 'Login_cap' are taken from + % login page section register_cap -> <<"Register">>; - username -> <<"username">>; email -> <<"email">>; - password -> <<"password">>; password2 -> <<"re-enter password">>; already_member -> <<"Already a member?">>; - login_cap -> <<"Login">>; %% home page upto -> <<"What are you up to?">>; twitter_msg -> <<"Automatic posting to Twitter enabled for " "non-replies">>; + send -> <<"send">>; %% main page public_timeline -> <<"Public timeline">>; %% users page {no_user, Username} -> - [<<"The user '">>, Username, <<" doesn't exist">>]; + [<<"The user '">>, Username, <<"' doesn't exist">>]; {timeline_of, Username} -> [Username, <<"'s timeline">>]; following -> <<"following">>; @@ -85,7 +103,7 @@ bundle(Tag) -> %% error messages {missing_field, Field} -> [<<"The ">>, Field, <<" field is required">>]; - {username, Val} -> + {username_taken, Val} -> [<<"The username '">>, Val, <<"' is taken">>]; {invalid_username, Val} -> [<<"The username '">>, Val, @@ -108,5 +126,11 @@ bundle(Tag) -> %% confirmation messages settings_updated -> - [<<"Your settings have been updated successfully">>] + [<<"Your settings have been updated successfully">>]; + + %% miscellaneous + {seconds_ago, Val} -> [Val, <<" seconds ago">>]; + {minutes_ago, Val} -> [Val, <<" minutes ago">>]; + {hours_ago, Val} -> [Val, <<" hours ago">>]; + {days_ago, Val} -> [Val, <<" days ago">>] end. src/bundles/twoorl_eng.erl @@ -1,3 +1,18 @@ +%% This file is part of Twoorl. +%% +%% Twoorl is free software: you can redistribute it and/or modify +%% it under the terms of the GNU General Public License as published by +%% the Free Software Foundation, either version 3 of the License, or +%% (at your option) any later version. +%% +%% Twoorl is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. +%% +%% You should have received a copy of the GNU General Public License +%% along with Twoorl. If not, see <http://www.gnu.org/licenses/>. + -module(twoorl_rus). -export([bundle/1]). @@ -28,15 +43,12 @@ bundle(Tag) -> %% register page register_cap -> <<"Регистрация">>; - username -> <<"имя">>; email -> <<"email">>; - password -> <<"пароль">>; password2 -> <<"пароль (подтверждение)">>; already_member -> <<"Уже зарегистрировались?">>; - login_cap -> <<"Вход">>; %% home page - upto -> <<"Чем занимаешся?">>; + upto -> <<"Чем занимаешься?">>; twitter_msg -> <<"Автоматическое копирование на Twitter работает для обычных сообщений," " не ответов">>; @@ -45,7 +57,7 @@ bundle(Tag) -> %% users page {no_user, Username} -> - [<<"Пользователь '">>, Username, <<" не существует">>]; + [<<"Пользователь '">>, Username, <<"' не существует">>]; {timeline_of, Username} -> [<<"Лента ">>, Username]; following -> <<"друзей">>; @@ -85,7 +97,7 @@ bundle(Tag) -> %% error messages {missing_field, Field} -> [Field, <<" обязательное поле">>]; - {username, Val} -> + {username_taken, Val} -> [<<"Имя '">>, Val, <<"' уже занято">>]; {invalid_username, Val} -> [<<"Имя '">>, Val, src/bundles/twoorl_rus.erl @@ -19,7 +19,7 @@ %% @copyright Yariv Sadan, 2008 -module(api_controller). --export([send/1, follow/1]). +-export([send/1, follow/1, toggle_twitter/1]). -include("twoorl.hrl"). send(A) -> @@ -61,23 +61,26 @@ 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}), + if TwitterEnabled andalso RecipientNames == [] -> - %% yey concurrency - spawn( - fun() -> - send_tweet(Usr, Msg1) - end); + spawn(twoorl_twitter, send_tweet, [Usr, Msg1]); true -> ok end, - %% yey concurrency spawn( fun() -> - save_replies(Msg1:id(), RecipientNames) + RecipientIds = + usr:find( + {username, in, + lists:usort( + [Name || Name <- RecipientNames])}), + reply:save_replies(Msg1:id(), RecipientIds) end), case proplists:get_value("get_html", Params) of @@ -95,14 +98,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, @@ -163,23 +158,21 @@ follow(A) -> end end). +toggle_twitter(A) -> + twoorl_util:auth( + A, + fun(Usr) -> + Params = yaws_api:parse_post(A), + Enabled = + case proplists:get_value("value", Params) of + "true" -> 1; + "false" -> 0; + %% TODO need better error handling + Val -> exit({unexpected_value, Val}) + end, + Usr1 = usr:twitter_enabled(Usr, Enabled), + twoorl_util:update_session(A, Usr1), + usr:update([{twitter_enabled, Enabled}], {id,'=',Usr:id()}), + {response, [{html, <<"ok">>}]} + 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 @@ -1,3 +1,3 @@ <%@ send(Data) %><% Data %> - <%@ follow(Data) %><% Data %> +<%@ toggle_twitter(Data) %><% Data %> src/components/api_view.et @@ -27,6 +27,10 @@ index(A) -> A, fun(Usr) -> Ids = usr:get_timeline_usr_ids(Usr), - [?Data(A, {Usr:username(), Usr:twitter_enabled() == 1}), + HasTwitter = ( + Usr:twitter_username() =/= undefined andalso + Usr:twitter_password() =/= undefined), + [?Data(A, {Usr:username(), HasTwitter, + Usr:twitter_enabled() == 1}), {ewc, timeline, show, [A, Ids]}] end). src/components/home_controller.erl @@ -1,18 +1,18 @@ -<%@ index([{B, {Username,TwitterEnabled}}, Timeline]) %> +<%@ index([{B, {Username, HasTwitter, TwitterEnabled}}, Timeline]) %> <table id="txt_table"> <tr> - <td width="100%"><div class="t1"><% B(upto) %></div></td> - <td align="right"><div id="chars">140<div></td> + <td><div class="t1"><% B(upto) %></div></td> + <td align="right"><div id="chars">140</div></td> </tr> <tr> <td colspan="2" align="center"> <form action="/api/send" method="post" id="txt_form"> <fieldset> <textarea rows="3" cols="70" id="txt" name="msg"></textarea> - <% if TwitterEnabled -> twitter_msg(B); true ->[] end %> + <% if HasTwitter -> twitter_msg(B, TwitterEnabled); true ->[] end %> </fieldset> </form> - <input type="button" id="submit" value="send" onclick="send()"/> + <input type="button" id="submit" value="<% B(send) %>" onclick="send()"/> </td> </tr> </table> @@ -20,5 +20,7 @@ <% Timeline %> -<%@ twitter_msg(B) %><div id="twitter_msg"><% B(twitter_msg) %></div> +<%@ twitter_msg(B, TwitterEnabled) %> +<div id="twitter_msg"><input onchange="toggle_twitter(this);" type="checkbox" <% if TwitterEnabled -> <<"checked=\"checked\"">>; + true -> [] end %>/><% B(twitter_msg) %></div> src/components/home_view.et @@ -1,11 +1,13 @@ <%@ index([{Background, HeaderItems}, Data]) %> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>Twoorl</title> <link rel="stylesheet" href="/static/style.css" type="text/css"/> <meta http-equiv="Content-type" content="text/html; charset=utf-8"/> - <style> + <style type="text/css"> body { background-image: url('<% Background %>'); } src/components/html_container_view.et @@ -33,4 +33,4 @@ index(A, Ewc) -> true -> {undefined, {data, []}} end, - [?Data(A, Username), Navbar, Ewc]. + [?Data(A, Username), Navbar, Ewc, {ewc, language_select, [A]}]. src/components/layout_controller.erl @@ -1,4 +1,4 @@ -<%@ index([{B, Username}, Navbar, Ewc]) %> +<%@ index([{B, Username}, Navbar, Ewc, LanguageSelect]) %> <table id="top" class="section1"> <tr> <td id="logo"><a href="/">Twoorl</a></td> @@ -7,6 +7,7 @@ </table> <% Navbar %> <% Ewc %> +<% LanguageSelect %> <div id="footer"><% B(get_source) %></div> <%@ header(B, undefined) %><a href="/login"><% B(login) %></a> | <a href="/register"><% B(register) %></a> src/components/layout_view.et @@ -43,6 +43,7 @@ index(A) -> end), Errs1 = if Errs == [] -> +%% twoorl_stats:cast({record, site_login}), Hash = crypto:sha([usr:username(Usr), Password]), case usr:password(Usr) of Hash -> @@ -54,7 +55,7 @@ index(A) -> Errs end, if Errs1 == [] -> - do_login(Usr); + do_login(A, Usr); true -> [?Data(A, undefined), {ewc, ui_msgs, [A, Errs1]}] @@ -71,8 +72,42 @@ get_usr(Username) -> {ok, Usr} end. -do_login(Usr) -> +do_login(A, Usr) -> Key = twoorl_util:gen_key(), - twoorl_util:update_session_by_key(Usr, Key), - usr:update([{session_key, Key}], {id,'=',usr:id(Usr)}), - {response, [yaws_api:setcookie("key", Key), ewr]}. + LangCookie = erlyweb_util:get_cookie("lang", A), + Usr1 = case LangCookie of + undefined -> + Usr; + Lang -> + LangBin = list_to_binary(Lang), + case Usr:language() of + LangBin -> + Usr; + _ -> + spawn(fun() -> + usr:update([{language, Lang}], + {id,'=',Usr:id()}) + end), + usr:language(Usr, Lang) + end + end, + + twoorl_util:update_session(A, Usr1, Key), + spawn(fun() -> + usr:update([{session_key, Key}], {id,'=',usr:id(Usr1)}) + end), + Response = [twoorl_util:cookie("key", Key)], + + %% set the language cookie for the session if it's not defined + Response1 = if LangCookie == undefined -> + case Usr1:language() of + undefined -> + Response; + Other -> + [twoorl_util:cookie("lang", Other) | Response] + end; + true -> + Response + end, + {response, [{ewr, home} | Response1]}. + src/components/login_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 @@ -95,7 +95,7 @@ get_gravatar_id(Msg) -> Other -> Other end; - 0 -> + _ -> ?DEFAULT_GRAVATAR_ID end. src/components/msg.erl @@ -107,7 +107,15 @@ get_links(A, NumPages, Page, Params) -> Page1 = lists:max([lists:min([Page, NumPages]), 1]), Params1 = proplists:delete("page", Params), - BaseUrl1 = erlyweb_util:get_url_prefix(A), + %% ugly hack ahead to get around appmod rewriting for the 'users' + %% component + A1 = case yaws_arg:get_opaque_val(A, paging_path) of + undefined -> + A; + Val -> + yaws_arg:appmoddata(A, Val) + end, + BaseUrl1 = erlyweb_util:get_url_prefix(A1), BaseUrl2 = [BaseUrl1, "?", lists:map(fun({Key, Val}) -> [Key,$=,Val,$&] end, src/components/paging_controller.erl @@ -40,9 +40,8 @@ index(A) -> [?Data(A, {Username, Email}), {ewc, ui_msgs, [A, Errs1]}]; true -> - %% todo set cookie Usr = register_usr(Username, Email, Password), - login_controller:do_login(Usr) + login_controller:do_login(A, Usr) end; _ -> [?Data(A, {[], []}), {data, []}] src/components/register_controller.erl @@ -12,5 +12,5 @@ <div><input name="password2" type="password"/></div> <div style="margin-top:5px;"><input type="submit" value="submit"/></div> </form> -<% B(already_member) %> <a href="/register"><% B(login_cap) %></a> +<% B(already_member) %> <a href="/login"><% B(login_cap) %></a> src/components/register_view.et @@ -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 @@ -15,6 +15,7 @@ process_request(A, Usr) -> ValidationFun = get_validation_fun(TwitterEnabled), Background = proplists:get_value("background", Params), + {[TwitterUsername, TwitterPassword], Errs} = erlyweb_forms:validate( Params, @@ -28,34 +29,44 @@ process_request(A, Usr) -> _ -> [{invalid_url, <<"background image">>} | Errs1] end, Errs3 = Errs ++ Errs2, - Messages = - case Errs3 of - [] -> - Usr2 = - update_settings( - Usr, TwitterUsername, TwitterPassword, - TwitterEnabled, GravatarEnabled, Background), - twoorl_util:update_session(A,Usr2), - [settings_updated]; - _ -> - [] - end, - [?Data( - A, - {TwitterUsername, TwitterPassword, - checked(TwitterEnabled), checked(GravatarEnabled), - str(Background)}), - {ewc, ui_msgs, [A, Errs3, Messages]}]; + case Errs3 of + [] -> + Usr2 = + update_settings( + Usr, TwitterUsername, TwitterPassword, + TwitterEnabled, GravatarEnabled, Background), + twoorl_util:update_session(A,Usr2), + {ewr, settings, ["?success=true"]}; + _ -> + [result_data( + A, + TwitterUsername, TwitterPassword, + checked(TwitterEnabled), checked(GravatarEnabled), + str(Background)), + {ewc, ui_msgs, [A, Errs3, []]}] + end; _ -> - [?Data( - A, {str(usr:twitter_username(Usr)), - str(usr:twitter_password(Usr)), - checked(usr:twitter_enabled(Usr)), - checked(usr:gravatar_enabled(Usr)), - str(usr:background(Usr))}), - {data, []}] + UiMessages = case lists:member({"success", "true"}, + yaws_api:parse_query(A)) of + true -> + [settings_updated]; + false -> + [] + end, + [result_data(A, str(usr:twitter_username(Usr)), + str(usr:twitter_password(Usr)), + checked(usr:twitter_enabled(Usr)), + checked(usr:gravatar_enabled(Usr)), + str(usr:background(Usr))), + {ewc, ui_msgs, [A, [], UiMessages]}] end. +result_data(A, TwitterUsername, TwitterPassword, TwitterEnabled, + GravatarEnabled, Background) -> + ?Data(A, {TwitterUsername, TwitterPassword, TwitterEnabled, + GravatarEnabled, Background}). + + get_validation_fun(true) -> fun(Field, Val) -> case Val of @@ -63,7 +74,7 @@ get_validation_fun(true) -> FName = case Field of "twitter_username" -> "Twitter username"; - "twitter_password" -> + "twitter_password" -> "Twitter password" end, {error, {missing_field, FName}}; @@ -76,24 +87,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(true, 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) -> @@ -119,13 +120,17 @@ update_settings(Usr, TwitterUsername, TwitterPassword, TwitterEnabled, str(undefined) -> []; +str(Val) when is_list(Val) -> list_to_binary(Val); str(Val) -> Val. checked(0) -> []; checked(false) -> []; -checked(1) -> <<"checked">>; -checked(true) -> <<"checked">>. - +checked(1) -> checked1(); +checked(true) -> checked1(); +checked(undefined) -> []. + +checked1() -> + <<"checked=\"checked\"">>. is_checked(Param, Params) -> proplists:get_value(Param, Params) == "on". src/components/settings_controller.erl @@ -1,5 +1,6 @@ <%@ index([{B, {TwitterUsername, TwitterPassword, TwitterEnabledChecked, - GravatarEnabledChecked, Background}}, UiMsgs]) %> + GravatarEnabledChecked, Background}}, + UiMsgs]) %> <div class="t2"><% B(settings_cap) %></div> <% UiMsgs %> <form action="/settings" method="post"> @@ -23,6 +24,5 @@ </div> <div><br/><input type="submit" value="submit"/></div> </div> - </form> src/components/settings_view.et @@ -40,20 +40,29 @@ 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}}; + _ -> + true + 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]) + case Where1 of + undefined -> + msg:find_with([OrderBy, Limit]); + _ -> + msg:find(Where1, [OrderBy, Limit]) end end, fun(Msgs) -> @@ -94,7 +103,8 @@ show_msg(A, Msg, Opts) -> {usr:get_icon_link(Username, GravatarId), usr:get_link(Username)} end, - CreatedOn = msg:get_time_since(Msg), + CreatedOn = twoorl_util:i18n(A, msg:get_time_since(Msg)), + IsBig = proplists:get_value(is_big, Opts) == true, {data, {Username, Icon, Userlink, src/components/timeline_controller.erl @@ -24,6 +24,6 @@ private() -> true. -index(A, Usr) -> +index(_A, Usr) -> {data, {usr:get_link(Usr), usr:get_icon(Usr, true)}}. src/components/user_icon_controller.erl @@ -25,7 +25,7 @@ catch_all(A, [Username]) -> case usr:find_first({username,'=',Username}) of undefined -> - ?Data(A, {no_such_user, Username}); + ?Data(A, {no_user, Username}); Usr -> ToFollow = case twoorl_util:get_usr(A) of src/components/users_controller.erl @@ -1,5 +1,5 @@ -<%@ catch_all({no_such_user, Username, RssLink})%> -The user '<% Username %>' doesn't exist. +<%@ catch_all({B, Err}) %> +<% B(Err) %> <%@ catch_all([{B, {Username, ToFollow, Gravatar, FeedLink}}, Data]) %> <div class="header1"> src/components/users_view.et @@ -26,13 +26,51 @@ 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), + [mysql_connect(PoolSize, Hostname, User, Password, Database) + || {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), + [create_table(Table) || + Table <- Tables, not lists:member(Table, ExistingTables)], + ok. + +create_table(session) -> + mnesia:create_table(session, [{attributes, record_info(fields, session)}]), + ok. + +mysql_connect(PoolSize, Hostname, User, Password, Database) -> + erlydb:start( + mysql, [{hostname, Hostname}, + {username, User}, + {password, Password}, + {database, Database}, + {logfun, fun twoorl_util:log/4}]), + lists:foreach( + fun() -> + mysql:connect(erlydb_mysql, Hostname, undefined, User, Password, + Database, true) + end, lists:seq(1, PoolSize - 1)). compile() -> compile([]). @@ -47,12 +85,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,16 +149,17 @@ create_table(Table, Def) -> exit(Err2) end. - init_mysql() -> erlydb:start(mysql, [{hostname, ?DB_HOSTNAME}, {username, ?DB_USERNAME}, {password, ?DB_PASSWORD}, {database, ?DB_DATABASE}, - {logfun, fun twoorl_util:log/4}]), + {logfun, fun log/4}]), lists:foreach( fun(_) -> mysql:connect(erlydb_mysql, ?DB_HOSTNAME, undefined, ?DB_USERNAME, ?DB_PASSWORD, ?DB_DATABASE, true) end, lists:seq(1, ?DB_POOL_SIZE)). +log(Module, Line, Level, FormatFun) -> + twoorl_util:log(Module, Line, Level, FormatFun). src/twoorl.erl @@ -27,16 +27,17 @@ hook(A) -> case erlyweb:get_initial_ewc({ewc, A1}) of {page, "/"} -> start(A1); {page, "/static" ++ _} = Ewc -> Ewc; - {page, "/favicon.ico"} = Ewc -> {page, "/static/favicon.ico"}; - {page, [$/ | Username]} -> + {page, "/favicon.ico"} -> {page, "/static/favicon.ico"}; + {page, [$/ | Username] = Path} -> A2 = yaws_arg:appmoddata(A1, "/users/" ++ Username), - start(A2); + A3 = yaws_arg:add_to_opaque(A2, {paging_path, Path}), + start(A3); %% redirect user urls from "/users/[Username]" to "/[Username]" {ewc, users_controller, users_view, catch_all, [_, [Username]]} -> {response, [{redirect_local, {any_path, [$/|Username]}, 301}]}; - Ewc -> + _Ewc -> start(A1) end. src/twoorl_app_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 @@ -27,6 +27,7 @@ start_link(Args) -> supervisor:start_link({local, ?MODULE}, ?MODULE, Args). init(Args) -> - {ok, {{one_for_one, 10, 10}, [ - {twoorl_yaws, {twoorl_server, start_link, [Args]}, permanent, 2000, worker, [twoorl_server]} - ]}}. + {ok, {{one_for_one, 10, 10}, + [{twoorl_yaws, + {twoorl_server, start_link, [Args]}, + permanent, 20000, worker, [twoorl_server]}]}}. src/twoorl_sup.erl @@ -22,6 +22,9 @@ -compile(export_all). -include("twoorl.hrl"). +cookie(Key, Val) -> + yaws_api:setcookie(Key, Val, "/", "Wed 01-01-2020 00:00:00 GMT"). + gen_key() -> gen_key(?DEFAULT_KEY_SIZE). @@ -50,30 +53,28 @@ join(List, Delim) -> (Elem, Acc) -> [Elem, Delim | Acc] end, [], lists:reverse(List)). - - -get_seconds_since({datetime, Val}) -> + +get_seconds_since({datetime, Val}) -> get_seconds_since(Val); get_seconds_since(Val) -> calendar:datetime_to_gregorian_seconds( calendar:local_time()) - - calendar:datetime_to_gregorian_seconds(Val). + calendar:datetime_to_gregorian_seconds(Val). get_time_since(DateTime) -> Diff = get_seconds_since(DateTime), - {Val1, UnitStr} = + {Type, Val} = if Diff < 60 -> - {Diff, <<"seconds">>}; + {seconds_ago, Diff}; Diff < 3600 -> - {round(Diff / 60), <<"minutes">>}; + {minutes_ago, round(Diff/60)}; Diff < 86400 -> - {round(Diff / 3600), <<"hours">>}; + {hours_ago, round(Diff/3600)}; true -> - {round(Diff / 86400), <<"days">>} + {days_ago, round(Diff/86400)} end, - [integer_to_list(Val1), 32, UnitStr, <<" ago">>]. - + {Type, integer_to_list(Val)}. auth(A, Fun) -> auth(A, Fun, fun() -> {ewr, login} end). @@ -131,7 +132,7 @@ htmlize_l([X|Tail], Ack) when is_list(X) -> log(Module, Line, Level, FormatFun) -> Func = case Level of debug -> - undefined; + info_msg; info -> info_msg; normal -> @@ -261,15 +262,24 @@ get_session_key(A) -> yaws_arg:get_opaque_val(A, key). update_session(A, Usr) -> - update_session_by_key(twoorl_util:get_session_key(A), Usr). + Key = twoorl_util:get_session_key(A), + update_session(A, Usr, Key). -update_session_by_key(Key, Usr) -> - mnesia:dirty_write(#session{key=Key, - value=Usr}). +update_session(A, Usr, Key) -> + NewSession = #session{key=Key, + value=Usr}, + mnesia:dirty_write(NewSession), + Opaque1 = + lists:map(fun({session, _}) -> {session, NewSession}; + (Other) -> Other + end, yaws_arg:opaque(A)), + yaws_arg:opaque(A, Opaque1). gravatar_icon(GravatarId) -> - [<<"<img border=\"0\" src=\"http://www.gravatar.com/avatar.php?size=32&gravatar_id=">>, + [<<"<img alt=\"gravatar\" class=\"gravatar\" " + "src=\"http://www.gravatar.com/avatar.php?" + "size=32&amp;gravatar_id=">>, GravatarId, <<"\"/>">>]. gravatar_id(Email) -> @@ -303,6 +313,7 @@ iolist_fun(Rec, Fun) -> +%% Used for RSS formatting %% Reference: http://cyber.law.harvard.edu/rss/rss.html format_datetime({Date = {Year, Month, Day}, {Hour, Minute, Second}}) -> Daynum = calendar:day_of_the_week(Date), @@ -351,5 +362,54 @@ get_feed_link(Url, Format) -> with_bundle(A, Data) -> {data, {get_bundle(A), Data}}. +%% codes taken from http://www.loc.gov/standards/iso639-2/php/code_list.php +bundles() -> + [{<<"eng">>, <<"English">>, twoorl_eng}, + {<<"spa">>, <<"Español">>, twoorl_spa}, + {<<"deu">>, <<"Deutsch">>, twoorl_deu}, + {<<"fra">>, <<"Français">>, twoorl_fra}, + {<<"kor">>, <<"한국어">>, twoorl_kor}, + {<<"pol">>, <<"Polski">>, twoorl_pol}, + {<<"por">>, <<"Português Brasileiro">>, twoorl_por_br}, + {<<"ru">>, <<"Русский">>, twoorl_rus}]. + get_bundle(A) -> - fun twoorl_eng:bundle/1. + Module1 = + case erlyweb_util:get_cookie("lang", A) of + undefined -> + twoorl_eng; + Lang -> + Lang1 = list_to_binary(Lang), + case lists:keysearch(Lang1, 1, bundles()) of + false -> + ?Warn("undefined language: ~p ~p", + [get_usr(A), Lang1]), + twoorl_eng; + {value, {_, _, Module}} -> Module + end + end, + fun(StrId) -> + %% Some values may not have been translated from English. + %% We catch such exceptions and fall back on the english + %% translation. + case catch Module1:bundle(StrId) of + {'EXIT', Err} -> + case Module1 of + twoorl_eng -> + %% this is not supposed to happen + exit(Err); + _ -> + twoorl_eng:bundle(StrId) + end; + Other -> + Other + end + end. + +i18n(A, Val) -> + F = get_bundle(A), F(Val). + + +delete_sessions() -> + Sessions = mnesia:dirty_match_object(#session{_ = '_'}), + lists:foreach(fun mnesia:dirty_delete_object/1, Sessions). src/twoorl_util.erl @@ -8,7 +8,7 @@ form input { margin-bottom: 5px; } -.section1, .paging_content { +.section1, .paging_content, #txt_form { margin-bottom: 10px; } @@ -150,4 +150,11 @@ fieldset { .user_icon { text-align: center; padding: 3px; -} \ No newline at end of file +} + +#language_select_box { + margin: 10px 0px 10px 0px; + text-align: center +} + +.gravatar { border:0px; } \ No newline at end of file www/static/style.css @@ -11,6 +11,14 @@ $(function() { $("#chars").text("" + (maxChars - length)); }); + $("#language_select").change(function(e) { + var select = $("#language_select")[0]; + var lang = select.options[select.selectedIndex].value; + document.cookie = + 'lang=' + lang + '; expires=Wed, 1 Jan 2020 00:00:00 UTC; path=/'; + location.href = location.href; + }); + }); function val() { @@ -34,7 +42,7 @@ function follow(username, val) { $.post("/api/follow", {"username": username, "value": val}, - function(Res) { + function(res) { if (val == "1") { $("#follow").hide(); $("#unfollow").show(); @@ -45,3 +53,14 @@ function follow(username, val) { }); } + +function toggle_twitter(input) { + $.post("/api/toggle_twitter", + {"value": input.value == "on"}, + function(res) { + if (res != "ok") { + alert("Toggle Twitter failed"); + } + }); +} + www/static/twoorl.js README e8e58757d4cdd890717d82c16ecf0a9877781a35 947592174633a687a30167ce1e32811cc7379a88 Eduard Bondarenko edbond@gmail.com http://github.com/yariv/twoorl/commit/1fa9b885b6b8e5dcbb8919aeb26a2b1ba23bf654 1fa9b885b6b8e5dcbb8919aeb26a2b1ba23bf654 2008-07-21T04:21:28-07:00 2008-07-21T04:21:28-07:00 Merge branch 'master' of git@github.com:edbond/twoorl Conflicts: .gitignore Emakefile elib/twitter_client/twitter_client.erl elib/twitter_client/twitter_client.hrl src/components/api_controller.erl src/components/login_controller.erl src/components/register_controller.erl src/components/reply.erl src/components/settings_controller.erl src/components/stats_controller.erl src/components/stats_view.et src/twoorl.erl src/twoorl_stats.erl src/twoorl_sup.erl src/twoorl_twitter.erl d67f5ff29ec2f57740a38d84d9c466dcb130da54 Eduard Bondarenko edbond@gmail.com