mod_roster backends rewrite

apps/ejabberd/include/jlib.hrl

@@ -326,28 +326,31 @@
 %	?STREAM_ERRORT(<<"">>, Lang, Text)).
 
 
--record(jid, {
-        user       :: binary(),
-        server     :: binary(),
-        resource   :: binary(),
-        luser      :: binary(),
-        lserver    :: binary(),
-        lresource  :: binary()
-}).
+-record(jid, { user       :: binary(),
+               server     :: binary(),
+               resource   :: binary(),
+               luser      :: binary(),
+               lserver    :: binary(),
+               lresource  :: binary()
+             }).
+-type jid() :: #jid{}.
 
--record(iq, {id = <<>>,
-	     type,
-	     xmlns = <<>>,
-	     lang = <<>>,
-	     sub_el}).
+-type(ljid() :: {binary(), binary(), binary()}).
 
--record(rsm_in, {
-        max         :: non_neg_integer() | undefined | error,
-        direction   :: before | aft | undefined,
-        %% id is empty, if cdata does not exists.
-        id          :: binary() | undefined,
-        index       :: non_neg_integer() | undefined | error
-}).
+-record(iq, { id = <<>>,
+              type,
+              xmlns = <<>>,
+              lang = <<>>,
+              sub_el
+            }).
+-type iq() :: #iq{}.
+
+-record(rsm_in, { max         :: non_neg_integer() | undefined | error,
+                  direction   :: before | aft | undefined,
+                  %% id is empty, if cdata does not exists.
+                  id          :: binary() | undefined,
+                  index       :: non_neg_integer() | undefined | error
+                }).
 
 -record(mam_borders, {
         after_id  :: non_neg_integer() | undefined,
@@ -358,6 +361,5 @@
 
 -record(rsm_out, {count, index, first, last}).
 
--type jid() :: #jid{}.
--type iq() :: #iq{}.
+
 

apps/ejabberd/include/mod_roster.hrl

@@ -19,15 +19,29 @@
 %%%
 %%%----------------------------------------------------------------------
 
--record(roster, {usj,
-		 us,
-		 jid,
-		 name = <<>>,
-		 subscription = none,
-		 ask = none,
-		 groups = [],
-		 askmessage = <<>>,
-		 xs = []}).
+-record(roster, { usj = {<<>>, <<>>, {<<>>, <<>>, <<>>}} :: usj() | '_',
+                  us = {<<>>, <<>>}                      :: us() | '_',
+                  jid = {<<>>, <<>>, <<>>}               :: ljid(),
+                  name = <<>>                            :: binary() | '_',
+                  subscription = none                    :: subscription() | '_',
+                  ask = none                             :: ask() | '_',
+                  groups = []                            :: [binary()] | '_',
+                  askmessage = <<"">>                    :: binary() | '_',
+                  xs = []                                :: [term()] | '_'
+                }).
+-type roster() :: #roster{}.
 
--record(roster_version, {us,
-			version}).
+-record(roster_version, { us = {<<>>, <<>>} :: us(),
+                          version = <<>>    :: binary()
+                        }).
+
+-type usj() :: { user() , server(), ljid() }.
+
+-type us() :: { user(), server() }.
+
+-type ask() :: none | in | out | both | subscribe | unsubscribe.
+-type subscription() :: none | both | from | to | remove.
+
+-type user() :: binary().
+-type server() :: binary().
+-type version() :: binary().