Correctly handle unicode in log messages

1 files changed, 18 insertions, 18 deletions

diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl
index 8edcf3237..fd38cc2d2 100644
--- a/src/mod_avatar.erl
+++ b/src/mod_avatar.erl
@@ -96,11 +96,11 @@ pubsub_publish_item(LServer, ?NS_AVATAR_METADATA,
 		    set_vcard_avatar(From, Photo, #{})
 	    end;
 	_ ->
-	    ?WARNING_MSG("Invalid avatar metadata of ~s@~s published "
-			 "with item id ~s",
+	    ?WARNING_MSG("Invalid avatar metadata of ~ts@~ts published "
+			 "with item id ~ts",
 			 [LUser, LServer, ItemId])
     catch _:{xmpp_codec, Why} ->
-	    ?WARNING_MSG("Failed to decode avatar metadata of ~s@~s: ~s",
+	    ?WARNING_MSG("Failed to decode avatar metadata of ~ts@~ts: ~ts",
 			 [LUser, LServer, xmpp:format_error(Why)])
     end;
 pubsub_publish_item(_, _, _, _, _, _) ->
@@ -210,26 +210,26 @@ get_avatar_data(JID, ItemID) ->
 		    {ok, Data};
 		_ ->
 		    ?WARNING_MSG("Invalid avatar data detected "
-				 "for ~s@~s with item id ~s",
+				 "for ~ts@~ts with item id ~ts",
 				 [LUser, LServer, ItemID]),
 		    {error, invalid_data}
 	    catch _:{xmpp_codec, Why} ->
 		    ?WARNING_MSG("Failed to decode avatar data for "
-				 "~s@~s with item id ~s: ~s",
+				 "~ts@~ts with item id ~ts: ~ts",
 				 [LUser, LServer, ItemID,
 				  xmpp:format_error(Why)]),
 		    {error, invalid_data}
 	    end;
 	#pubsub_item{payload = []} ->
 	    ?WARNING_MSG("Empty avatar data detected "
-			 "for ~s@~s with item id ~s",
+			 "for ~ts@~ts with item id ~ts",
 			 [LUser, LServer, ItemID]),
 	    {error, invalid_data};
 	{error, #stanza_error{reason = 'item-not-found'}} ->
 	    {error, notfound};
 	{error, Reason} ->
-	    ?WARNING_MSG("Failed to get item for ~s@~s at node ~s "
-			 "with item id ~s: ~p",
+	    ?WARNING_MSG("Failed to get item for ~ts@~ts at node ~ts "
+			 "with item id ~ts: ~p",
 			 [LUser, LServer, ?NS_AVATAR_METADATA, ItemID, Reason]),
 	    {error, internal_error}
     end.
@@ -248,12 +248,12 @@ get_avatar_meta(#iq{from = JID}) ->
 		    {ok, ItemID, Meta};
 		_ ->
 		    ?WARNING_MSG("Invalid metadata payload detected "
-				 "for ~s@~s with item id ~s",
+				 "for ~ts@~ts with item id ~ts",
 				 [LUser, LServer, ItemID]),
 		    {error, invalid_metadata}
 	    catch _:{xmpp_codec, Why} ->
 		    ?WARNING_MSG("Failed to decode metadata for "
-				 "~s@~s with item id ~s: ~s",
+				 "~ts@~ts with item id ~ts: ~ts",
 				 [LUser, LServer, ItemID,
 				  xmpp:format_error(Why)]),
 		    {error, invalid_metadata}
@@ -261,7 +261,7 @@ get_avatar_meta(#iq{from = JID}) ->
 	{error, #stanza_error{reason = 'item-not-found'}} ->
 	    {error, notfound};
 	{error, Reason} ->
-	    ?WARNING_MSG("Failed to get items for ~s@~s at node ~s: ~p",
+	    ?WARNING_MSG("Failed to get items for ~ts@~ts at node ~ts: ~p",
 			 [LUser, LServer, ?NS_AVATAR_METADATA, Reason]),
 	    {error, internal_error}
     end.
@@ -305,16 +305,16 @@ publish_avatar(#iq{from = JID} = IQ, Meta, MimeType, Data, ItemID) ->
 		{result, _} ->
 		    IQ;
 		{error, StanzaErr} ->
-		    ?ERROR_MSG("Failed to publish avatar metadata for ~s: ~p",
+		    ?ERROR_MSG("Failed to publish avatar metadata for ~ts: ~p",
 			       [jid:encode(JID), StanzaErr]),
 		    {stop, StanzaErr}
 	    end;
 	{error, #stanza_error{reason = 'not-acceptable'} = StanzaErr} ->
-	    ?WARNING_MSG("Failed to publish avatar data for ~s: ~p",
+	    ?WARNING_MSG("Failed to publish avatar data for ~ts: ~p",
 			 [jid:encode(JID), StanzaErr]),
 	    {stop, StanzaErr};
 	{error, StanzaErr} ->
-	    ?ERROR_MSG("Failed to publish avatar data for ~s: ~p",
+	    ?ERROR_MSG("Failed to publish avatar data for ~ts: ~p",
 		       [jid:encode(JID), StanzaErr]),
 	    {stop, StanzaErr}
     end.
@@ -346,7 +346,7 @@ convert_avatar(LUser, LServer, Data, Rules) ->
     if NewType == undefined ->
 	    pass;
        true ->
-	    ?DEBUG("Converting avatar of ~s@~s: ~s -> ~s",
+	    ?DEBUG("Converting avatar of ~ts@~ts: ~ts -> ~ts",
 		   [LUser, LServer, Type, NewType]),
 	    RateLimit = mod_avatar_opt:rate_limit(LServer),
 	    Opts = [{limit_by, {LUser, LServer}},
@@ -356,7 +356,7 @@ convert_avatar(LUser, LServer, Data, Rules) ->
 		    {ok, encode_mime_type(NewType), NewData};
 		{error, Reason} = Err ->
 		    ?ERROR_MSG("Failed to convert avatar of "
-			       "~s@~s (~s -> ~s): ~s",
+			       "~ts@~ts (~ts -> ~ts): ~ts",
 			       [LUser, LServer, Type, NewType,
 				eimp:format_error(Reason)]),
 		    Err
@@ -393,11 +393,11 @@ get_vcard(#jid{luser = LUser, lserver = LServer}) ->
 	#vcard_temp{} = VCard ->
 	    {ok, VCard};
 	_ ->
-	    ?ERROR_MSG("Invalid vCard of ~s@~s in the database",
+	    ?ERROR_MSG("Invalid vCard of ~ts@~ts in the database",
 		       [LUser, LServer]),
 	    {error, invalid_vcard}
     catch _:{xmpp_codec, Why} ->
-	    ?ERROR_MSG("Failed to decode vCard of ~s@~s: ~s",
+	    ?ERROR_MSG("Failed to decode vCard of ~ts@~ts: ~ts",
 		       [LUser, LServer, xmpp:format_error(Why)]),
 	    {error, invalid_vcard}
     end.