diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_mam.erl | 2 | ||||
| -rw-r--r-- | src/mod_mam_sql.erl | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/mod_mam.erl b/src/mod_mam.erl index ea267c1c0..5e4bebb75 100644 --- a/src/mod_mam.erl +++ b/src/mod_mam.erl @@ -945,7 +945,7 @@ filter_by_max(Msgs, Len) when is_integer(Len), Len >= 0 -> filter_by_max(_Msgs, _Junk) -> {[], true}. --spec limit_max(rsm_set(), binary()) -> rsm_set(). +-spec limit_max(rsm_set(), binary()) -> rsm_set() | undefined. limit_max(RSM, ?NS_MAM_TMP) -> RSM; % XEP-0313 v0.2 doesn't require clients to support RSM. limit_max(#rsm_set{max = Max} = RSM, _NS) when not is_integer(Max) -> diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl index 6e5231989..2a0dcce95 100644 --- a/src/mod_mam_sql.erl +++ b/src/mod_mam_sql.erl @@ -217,13 +217,10 @@ make_sql_query(User, LServer, true -> [] end, - WithTextClause = case WithText of - {text, <<>>} -> - []; - {text, Txt} -> + WithTextClause = if is_binary(WithText), WithText /= <<>> -> [<<" and match (txt) against ('">>, - Escape(Txt), <<"')">>]; - undefined -> + Escape(WithText), <<"')">>]; + true -> [] end, WithClause = case catch jid:tolower(With) of |