diff options
Diffstat (limited to 'src/mod_irc/mod_irc_connection.erl')
-rw-r--r-- | src/mod_irc/mod_irc_connection.erl | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/mod_irc/mod_irc_connection.erl b/src/mod_irc/mod_irc_connection.erl index fd8a23e9a..3b34f9a61 100644 --- a/src/mod_irc/mod_irc_connection.erl +++ b/src/mod_irc/mod_irc_connection.erl @@ -179,7 +179,7 @@ code_change(_OldVsn, StateName, StateData, _Extra) -> %% {stop, Reason, NewStateData} %%---------------------------------------------------------------------- handle_info({route_chan, Channel, Resource, - {xmlelement, "presence", Attrs, Els}}, + {xmlelement, "presence", Attrs, _Els}}, StateName, StateData) -> NewStateData = case xml:get_attr_s("type", Attrs) of @@ -225,7 +225,7 @@ handle_info({route_chan, Channel, Resource, end; handle_info({route_chan, Channel, Resource, - {xmlelement, "message", Attrs, Els} = El}, + {xmlelement, "message", Attrs, _Els} = El}, StateName, StateData) -> NewStateData = case xml:get_attr_s("type", Attrs) of @@ -347,7 +347,7 @@ handle_info({route_chan, Channel, Resource, handle_info({route_chan, Channel, Resource, - {xmlelement, "iq", Attrs, Els} = El}, + {xmlelement, "iq", _Attrs, _Els} = El}, StateName, StateData) -> From = StateData#state.user, To = jlib:make_jid(lists:concat([Channel, "%", StateData#state.server]), @@ -385,12 +385,12 @@ handle_info({route_chan, Channel, Resource, end, {next_state, StateName, StateData}; -handle_info({route_chan, Channel, Resource, Packet}, StateName, StateData) -> +handle_info({route_chan, _Channel, _Resource, _Packet}, StateName, StateData) -> {next_state, StateName, StateData}; handle_info({route_nick, Nick, - {xmlelement, "message", Attrs, Els} = El}, + {xmlelement, "message", Attrs, _Els} = El}, StateName, StateData) -> NewStateData = case xml:get_attr_s("type", Attrs) of @@ -445,7 +445,7 @@ handle_info({route_nick, Nick, {next_state, StateName, NewStateData} end; -handle_info({route_nick, Nick, Packet}, StateName, StateData) -> +handle_info({route_nick, _Nick, _Packet}, StateName, StateData) -> {next_state, StateName, StateData}; @@ -453,16 +453,16 @@ handle_info({ircstring, [$P, $I, $N, $G, $ | ID]}, StateName, StateData) -> send_text(StateData, "PONG " ++ ID ++ "\r\n"), {next_state, StateName, StateData}; -handle_info({ircstring, [$: | String]}, StateName, StateData) -> +handle_info({ircstring, [$: | String]}, _StateName, StateData) -> Words = string:tokens(String, " "), NewStateData = case Words of [_, "353" | Items] -> process_channel_list(StateData, Items); - [_, "332", Nick, [$# | Chan] | _] -> + [_, "332", _Nick, [$# | Chan] | _] -> process_channel_topic(StateData, Chan, String), StateData; - [_, "333", Nick, [$# | Chan] | _] -> + [_, "333", _Nick, [$# | Chan] | _] -> process_channel_topic_who(StateData, Chan, String), StateData; [_, "318", _, Nick | _] -> @@ -545,16 +545,16 @@ handle_info({ircstring, String}, StateName, StateData) -> handle_info({send_text, Text}, StateName, StateData) -> send_text(StateData, Text), {next_state, StateName, StateData}; -handle_info({tcp, Socket, Data}, StateName, StateData) -> +handle_info({tcp, _Socket, Data}, StateName, StateData) -> Buf = StateData#state.inbuf ++ binary_to_list(Data), {ok, Strings} = regexp:split([C || C <- Buf, C /= $\r], "\n"), ?DEBUG("strings=~p~n", [Strings]), NewBuf = process_lines(StateData#state.encoding, Strings), {next_state, StateName, StateData#state{inbuf = NewBuf}}; -handle_info({tcp_closed, Socket}, StateName, StateData) -> +handle_info({tcp_closed, _Socket}, StateName, StateData) -> gen_fsm:send_event(self(), closed), {next_state, StateName, StateData}; -handle_info({tcp_error, Socket, Reason}, StateName, StateData) -> +handle_info({tcp_error, _Socket, _Reason}, StateName, StateData) -> gen_fsm:send_event(self(), closed), {next_state, StateName, StateData}. @@ -563,7 +563,7 @@ handle_info({tcp_error, Socket, Reason}, StateName, StateData) -> %% Purpose: Shutdown the fsm %% Returns: any %%---------------------------------------------------------------------- -terminate(Reason, StateName, StateData) -> +terminate(_Reason, _StateName, StateData) -> mod_irc:closed_connection(StateData#state.host, StateData#state.user, StateData#state.server), @@ -609,7 +609,7 @@ send_text(#state{socket = Socket, encoding = Encoding}, Text) -> bounce_messages(Reason) -> receive {send_element, El} -> - {xmlelement, Name, Attrs, SubTags} = El, + {xmlelement, _Name, Attrs, _SubTags} = El, case xml:get_attr_s("type", Attrs) of "error" -> ok; @@ -633,7 +633,7 @@ route_nick(Pid, Nick, Packet) -> Pid ! {route_nick, Nick, Packet}. -process_lines(Encoding, [S]) -> +process_lines(_Encoding, [S]) -> S; process_lines(Encoding, [S | Ss]) -> self() ! {ircstring, iconv:convert(Encoding, "utf-8", S)}, @@ -649,7 +649,7 @@ process_channel_list_find_chan(StateData, [[$# | Chan] | Items]) -> process_channel_list_find_chan(StateData, [_ | Items]) -> process_channel_list_find_chan(StateData, Items). -process_channel_list_users(StateData, Chan, []) -> +process_channel_list_users(StateData, _Chan, []) -> StateData; process_channel_list_users(StateData, Chan, [User | Items]) -> NewStateData = process_channel_list_user(StateData, Chan, User), @@ -708,7 +708,7 @@ process_channel_topic_who(StateData, Chan, String) -> Msg1 = case Words of [_, "333", _, _Chan, Whoset , Timeset] -> case string:to_integer(Timeset) of - {Unixtimeset, Rest} -> + {Unixtimeset, _Rest} -> "Topic for #" ++ Chan ++ " set by " ++ Whoset ++ " at " ++ unixtime2string(Unixtimeset); _-> @@ -730,7 +730,7 @@ process_channel_topic_who(StateData, Chan, String) -> -process_endofwhois(StateData, String, Nick) -> +process_endofwhois(StateData, _String, Nick) -> ejabberd_router:route( jlib:make_jid(lists:concat([Nick, "!", StateData#state.server]), StateData#state.host, ""), @@ -813,7 +813,7 @@ process_channotice(StateData, Chan, From, String) -> -process_privmsg(StateData, Nick, From, String) -> +process_privmsg(StateData, _Nick, From, String) -> [FromUser | _] = string:tokens(From, "!"), {ok, Msg, _} = regexp:sub(String, ".*PRIVMSG[^:]*:", ""), Msg1 = case Msg of @@ -831,7 +831,7 @@ process_privmsg(StateData, Nick, From, String) -> [{xmlelement, "body", [], [{xmlcdata, Msg2}]}]}). -process_notice(StateData, Nick, From, String) -> +process_notice(StateData, _Nick, From, String) -> [FromUser | _] = string:tokens(From, "!"), {ok, Msg, _} = regexp:sub(String, ".*NOTICE[^:]*:", ""), Msg1 = case Msg of @@ -849,7 +849,7 @@ process_notice(StateData, Nick, From, String) -> [{xmlelement, "body", [], [{xmlcdata, Msg2}]}]}). -process_version(StateData, Nick, From) -> +process_version(StateData, _Nick, From) -> [FromUser | _] = string:tokens(From, "!"), send_text( StateData, @@ -863,7 +863,7 @@ process_version(StateData, Nick, From) -> [FromUser])). -process_userinfo(StateData, Nick, From) -> +process_userinfo(StateData, _Nick, From) -> [FromUser | _] = string:tokens(From, "!"), send_text( StateData, @@ -921,7 +921,7 @@ process_quit(StateData, From, String) -> {ok, Msg, _} = regexp:sub(String, ".*QUIT[^:]*:", ""), Msg1 = filter_message(Msg), - NewChans = + %%NewChans = dict:map( fun(Chan, Ps) -> case ?SETS:is_member(FromUser, Ps) of @@ -948,7 +948,7 @@ process_quit(StateData, From, String) -> StateData. -process_join(StateData, Channel, From, String) -> +process_join(StateData, Channel, From, _String) -> [FromUser | FromIdent] = string:tokens(From, "!"), Chan = lists:subtract(Channel, ":#"), ejabberd_router:route( @@ -976,7 +976,7 @@ process_join(StateData, Channel, From, String) -> -process_mode_o(StateData, Chan, From, Nick, Affiliation, Role) -> +process_mode_o(StateData, Chan, _From, Nick, Affiliation, Role) -> %Msg = lists:last(string:tokens(String, ":")), ejabberd_router:route( jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]), @@ -1118,15 +1118,15 @@ process_iq_admin(StateData, Channel, set, SubEl) -> Reason = xml:get_path_s(ItemEl, [{elem, "reason"}, cdata]), process_admin(StateData, Channel, Nick, Affiliation, Role, Reason) end; -process_iq_admin(StateData, Channel, get, SubEl) -> +process_iq_admin(_StateData, _Channel, get, _SubEl) -> {error, ?ERR_FEATURE_NOT_IMPLEMENTED}. -process_admin(StateData, Channel, "", Affiliation, Role, Reason) -> +process_admin(_StateData, _Channel, "", _Affiliation, _Role, _Reason) -> {error, ?ERR_FEATURE_NOT_IMPLEMENTED}; -process_admin(StateData, Channel, Nick, Affiliation, "none", Reason) -> +process_admin(StateData, Channel, Nick, _Affiliation, "none", Reason) -> case Reason of "" -> send_text(StateData, @@ -1141,7 +1141,7 @@ process_admin(StateData, Channel, Nick, Affiliation, "none", Reason) -> -process_admin(StateData, Channel, Nick, Affiliation, Role, Reason) -> +process_admin(_StateData, _Channel, _Nick, _Affiliation, _Role, _Reason) -> {error, ?ERR_FEATURE_NOT_IMPLEMENTED}. |