yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 09:49:18 +02:00
Code Issues Releases Wiki Activity

Merge branch 'new_stream'

Browse source 
Conflicts:
	src/cyrsasl.erl
	src/ejabberd_c2s.erl
	src/ejabberd_cluster.erl
	src/ejabberd_frontend_socket.erl
	src/ejabberd_node_groups.erl
	src/ejabberd_router.erl
	src/mod_bosh.erl
	src/mod_ip_blacklist.erl
	src/mod_muc_mnesia.erl
	src/mod_offline.erl
	src/mod_proxy65_sm.erl
This commit is contained in:
Evgeniy Khramtsov 2017-01-20 19:35:46 +03:00
commit d5d906184f
86 changed files with 8732 additions and 7629 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/mod_muc_sql.erl
View file

@ -33,6 +33,10 @@
-export([init/2, store_room/4, restore_room/3, forget_room/3,
can_use_nick/4, get_rooms/2, get_nick/3, set_nick/4,
import/3, export/1]).
-export([register_online_room/3, unregister_online_room/3, find_online_room/2,
get_online_rooms/2, count_online_rooms/1, rsm_supported/0,
register_online_user/3, unregister_online_user/3,
count_online_rooms_by_user/2, get_online_rooms_by_user/2]).
-export([set_affiliation/6, set_affiliations/4, get_affiliation/5,
get_affiliations/3, search_affiliation/4]).
@ -161,6 +165,36 @@ get_affiliations(_ServerHost, _Room, _Host) ->
search_affiliation(_ServerHost, _Room, _Host, _Affiliation) ->
{error, not_implemented}.
register_online_room(_, _, _) ->
erlang:error(not_implemented).
unregister_online_room(_, _, _) ->
erlang:error(not_implemented).
find_online_room(_, _) ->
erlang:error(not_implemented).
count_online_rooms(_) ->
erlang:error(not_implemented).
get_online_rooms(_, _) ->
erlang:error(not_implemented).
rsm_supported() ->
false.
register_online_user(_, _, _) ->
erlang:error(not_implemented).
unregister_online_user(_, _, _) ->
erlang:error(not_implemented).
count_online_rooms_by_user(_, _) ->
erlang:error(not_implemented).
get_online_rooms_by_user(_, _) ->
erlang:error(not_implemented).
export(_Server) ->
[{muc_room,
fun(Host, #muc_room{name_host = {Name, RoomHost}, opts = Opts}) ->