Fixed tests and moved friend request status enum to new friends file
This commit is contained in:
parent
38ff70e2ec
commit
9ff96a0250
|
@ -102,6 +102,7 @@ module.exports = grunt => {
|
|||
libloki: {
|
||||
src: [
|
||||
'libloki/api.js',
|
||||
'libloki/friends.js',
|
||||
'libloki/crypto.js',
|
||||
'libloki/service_nodes.js',
|
||||
'libloki/storage.js',
|
||||
|
|
|
@ -41,8 +41,7 @@
|
|||
} = window.Signal.Migrations;
|
||||
|
||||
// Possible conversation friend states
|
||||
const FriendRequestStatusEnum =
|
||||
window.libloki.friends.friendRequestStatusEnum;
|
||||
const FriendRequestStatusEnum = window.friends.friendRequestStatusEnum;
|
||||
|
||||
// Possible session reset states
|
||||
const SessionResetEnum = Object.freeze({
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
async function broadcastOnlineStatus() {
|
||||
const friendKeys = await window.Signal.Data.getPubKeysWithFriendStatus(
|
||||
friendRequestStatusEnum.friends
|
||||
window.friends.friendRequestStatusEnum.friends
|
||||
);
|
||||
friendKeys.forEach(pubKey => {
|
||||
sendOnlineBroadcastMessage(pubKey);
|
||||
|
@ -90,28 +90,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
// Possible conversation friend states
|
||||
const friendRequestStatusEnum = Object.freeze({
|
||||
// New conversation, no messages sent or received
|
||||
none: 0,
|
||||
// This state is used to lock the input early while sending
|
||||
pendingSend: 1,
|
||||
// Friend request sent, awaiting response
|
||||
requestSent: 2,
|
||||
// Friend request received, awaiting user input
|
||||
requestReceived: 3,
|
||||
// We did it!
|
||||
friends: 4,
|
||||
});
|
||||
|
||||
window.libloki.api = {
|
||||
sendFriendRequestAccepted,
|
||||
sendEmptyMessage,
|
||||
sendOnlineBroadcastMessage,
|
||||
broadcastOnlineStatus,
|
||||
};
|
||||
|
||||
window.libloki.friends = {
|
||||
friendRequestStatusEnum,
|
||||
};
|
||||
})();
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
/* global window */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
// Possible conversation friend states
|
||||
const friendRequestStatusEnum = Object.freeze({
|
||||
// New conversation, no messages sent or received
|
||||
none: 0,
|
||||
// This state is used to lock the input early while sending
|
||||
pendingSend: 1,
|
||||
// Friend request sent, awaiting response
|
||||
requestSent: 2,
|
||||
// Friend request received, awaiting user input
|
||||
requestReceived: 3,
|
||||
// We did it!
|
||||
friends: 4,
|
||||
});
|
||||
|
||||
window.friends = {
|
||||
friendRequestStatusEnum,
|
||||
};
|
||||
})();
|
|
@ -360,6 +360,7 @@
|
|||
<script type="text/javascript" src="../js/storage.js" data-cover></script>
|
||||
<script type="text/javascript" src="../js/signal_protocol_store.js" data-cover></script>
|
||||
<script type="text/javascript" src="../js/libtextsecure.js" data-cover></script>
|
||||
<script type="text/javascript" src="../js/libloki.js" data-cover></script>
|
||||
|
||||
<script type="text/javascript" src="../js/libphonenumber-util.js"></script>
|
||||
<script type='text/javascript' src='../js/models/profile.js' data-cover></script>
|
||||
|
|
Loading…
Reference in New Issue