pull/788/head
Mikunj 5 years ago
parent 8ae793db19
commit d7f71650ea

@ -2323,8 +2323,10 @@
Friends -> Friends Friends -> Friends
The cases where we auto accept are the following: The cases where we auto accept are the following:
- We sent the user a friend request and that user sent us a friend request. - We sent the user a friend request,
- We are friends with the user, and that user just sent us a friend request. and that user sent us a friend request.
- We are friends with the user,
and that user just sent us a friend request.
*/ */
const isFriend = sendingDeviceConversation.isFriend(); const isFriend = sendingDeviceConversation.isFriend();
const hasSentFriendRequest = sendingDeviceConversation.hasSentFriendRequest(); const hasSentFriendRequest = sendingDeviceConversation.hasSentFriendRequest();

@ -496,7 +496,9 @@ class LokiAppDotNetServerAPI {
)); ));
} else { } else {
// disable check for .loki // disable check for .loki
process.env.NODE_TLS_REJECT_UNAUTHORIZED = endpoint.match(/\.loki\//) ? 0 : 1; process.env.NODE_TLS_REJECT_UNAUTHORIZED = endpoint.match(/\.loki\//)
? 0
: 1;
result = await nodeFetch(url, fetchOptions); result = await nodeFetch(url, fetchOptions);
// always make sure this check is enabled // always make sure this check is enabled
process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1; process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1;
@ -505,7 +507,12 @@ class LokiAppDotNetServerAPI {
} }
} catch (e) { } catch (e) {
if (txtResponse) { if (txtResponse) {
log.info(`serverRequest ${mode} error`, e.code, e.message, `json: ${txtResponse}`); log.info(
`serverRequest ${mode} error`,
e.code,
e.message,
`json: ${txtResponse}`
);
} else { } else {
log.info(`serverRequest ${mode} error`, e.code, e.message); log.info(`serverRequest ${mode} error`, e.code, e.message);
} }

Loading…
Cancel
Save