Merge pull request #3042 from oxen-io/clearnet

Session 1.12.0

.eslintrc.js

@@ -18,6 +18,8 @@ module.exports = {
     'plugin:@typescript-eslint/recommended',
     'plugin:react/recommended',
     'plugin:react-hooks/recommended',
+    'plugin:import/recommended',
+    'plugin:import/typescript',
   ],
 
   plugins: ['mocha', 'more', '@typescript-eslint'],
@@ -67,6 +69,12 @@ module.exports = {
     '@typescript-eslint/array-type': ['error', { default: 'generic' }],
     '@typescript-eslint/no-misused-promises': 'error',
 
+    // make imports without file extensions
+    'import/extensions': ['warn', 'never'],
+
+    // NOTE Remove this line when debugging cyclic dependencies
+    'import/no-cycle': 'off',
+
     // Prettier overrides:
     'arrow-parens': 'off',
     'no-nested-ternary': 'off',

_locales/be/messages.json

@@ -181,6 +181,7 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
+  "unblockGroupToSend": "This group is blocked. Unblock it if you would like to send a message.",
   "youChangedTheTimer": "You set the disappearing message timer to $time$",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",

_locales/en/messages.json

@@ -41,7 +41,7 @@
   "unreadMessages": "Unread Messages",
   "debugLogExplanation": "This log will be saved to your desktop.",
   "reportIssue": "Report a Bug",
-  "markAllAsRead": "Mark All as Read",
+  "markAllAsRead": "Mark Read",
   "incomingError": "Error handling incoming message",
   "media": "Media",
   "mediaEmptyState": "No media",
@@ -79,7 +79,7 @@
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "Avatar for contact $name$",
   "downloadAttachment": "Download Attachment",
-  "replyToMessage": "Reply to message",
+  "replyToMessage": "Reply",
   "replyingToMessage": "Replying to:",
   "originalMessageNotFound": "Original message not found",
   "you": "You",
@@ -97,24 +97,35 @@
   "continue": "Continue",
   "error": "Error",
   "delete": "Delete",
+  "hide": "Hide",
   "messageDeletionForbidden": "You don’t have permission to delete others’ messages",
   "deleteJustForMe": "Delete just for me",
   "deleteForEveryone": "Delete for everyone",
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Delete Messages",
+  "deleteMessagesConfirmation": "Permanently delete the messages in this conversation?",
+  "hideConversation": "Hide Conversation",
+  "hideNoteToSelfConfirmation": "Are you sure you want to hide your <b>Note to Self</b> conversation?",
   "deleteConversation": "Delete Conversation",
+  "deleteConversationConfirmation": "Are you sure you want to delete your conversation with <b>$name$</b>?",
+  "deleteConversationFailed": "Failed to delete the Conversation!",
+  "deleteConversationFailedPleaseTryAgain": "Unable to delete the conversation, please try again",
+  "leaving": "Leaving...",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "From:",
   "to": "To:",
   "sent": "Sent",
+  "sending": "Sending",
   "received": "Received",
   "sendMessage": "Message",
   "groupMembers": "Members",
   "moreInformation": "More information",
+  "failed": "Failed",
+  "failedToSendMessage": "Failed to send message",
+  "read": "Read",
   "resend": "Resend",
-  "deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
@@ -181,9 +192,24 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
-  "youChangedTheTimer": "You set the disappearing message timer to $time$",
-  "timerSetOnSync": "Updated disappearing message timer to $time$",
-  "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",
+  "unblockGroupToSend": "This group is blocked. Unblock it if you would like to send a message.",
+  "timer": "Timer",
+  "timerModeRead": "read",
+  "timerModeSent": "sent",
+  "confirm": "Confirm",
+  "messageHash": "Message Hash",
+  "serverId": "Server ID",
+  "expirationType": "Expiration Type",
+  "expirationDuration": "Expiration Duration",
+  "disappears": "Disappears",
+  "messageWillDisappear": "Messages will disappear in $countAndUnit$",
+  "followSetting": "Follow Setting",
+  "followSettingDisabled": "Messages you send will no longer disappear. Are you sure you want to turn off disappearing messages?",
+  "followSettingTimeAndType": "Set your messages to disappear <b>$time$</b> after they have been <b>$type$</b>?",
+  "youChangedTheTimer": "<b>You</b> have set messages to disappear <b>$time$</b> after they have been <b>$mode$</b>",
+  "youChangedTheTimerLegacy": "<b>You</b> set the disappearing message timer to <b>$time$</b>",
+  "theyChangedTheTimer": "<b>$name$</b> has set messages to disappear <b>$time$</b> after they have been <b>$mode$</b>",
+  "theyChangedTheTimerLegacy": "<b>$name$</b> set the disappearing message timer to <b>$time$</b>",
   "timerOption_0_seconds": "Off",
   "timerOption_5_seconds": "5 seconds",
   "timerOption_10_seconds": "10 seconds",
@@ -197,11 +223,6 @@
   "timerOption_1_day": "1 day",
   "timerOption_1_week": "1 week",
   "timerOption_2_weeks": "2 weeks",
-  "disappearingMessages": "Disappearing messages",
-  "changeNickname": "Change Nickname",
-  "clearNickname": "Clear Nickname",
-  "nicknamePlaceholder": "New Nickname",
-  "changeNicknameMessage": "Enter a nickname for this user",
   "timerOption_0_seconds_abbreviated": "off",
   "timerOption_5_seconds_abbreviated": "5s",
   "timerOption_10_seconds_abbreviated": "10s",
@@ -215,10 +236,29 @@
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1w",
   "timerOption_2_weeks_abbreviated": "2w",
+  "disappearingMessages": "Disappearing messages",
+  "disappearingMessagesModeOutdated": "$name$ is using an outdated client. Disappearing messages may not work as expected.",
+  "disappearingMessagesModeLabel": "Delete Type",
+  "disappearingMessagesModeOff": "Off",
+  "disappearingMessagesModeAfterRead": "Disappear After Read",
+  "disappearingMessagesModeAfterReadSubtitle": "Messages delete after they have been read.",
+  "disappearingMessagesModeAfterSend": "Disappear After Send",
+  "disappearingMessagesModeAfterSendSubtitle": "Messages delete after they have been sent.",
+  "disappearingMessagesModeLegacy": "Legacy",
+  "disappearingMessagesModeLegacySubtitle": "Original version of disappearing messages.",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
-  "youDisabledDisappearingMessages": "You disabled disappearing messages.",
+  "disabledDisappearingMessages": "<b>$name$</b> has turned <b>off</b> disappearing messages.",
+  "youDisabledDisappearingMessages": "<b>You</b> have turned <b>off</b> disappearing messages.",
+  "youDisabledYourDisappearingMessages": "<b>You</b> turned <b>off</b> disappearing messages. Messages you send will no longer disappear.",
+  "youSetYourDisappearingMessages": "<b>You</b> set your messages to disappear <b>$time$</b> after they have been <b>$type$</b>.",
+  "theyDisabledTheirDisappearingMessages": "<b>$name$</b> has turned <b>off</b> disappearing messages. Messages they send will no longer disappear.",
+  "theySetTheirDisappearingMessages": "<b>$name$</b> has set their messages to disappear <b>$time$</b> after they have been <b>$type$</b>.",
   "timerSetTo": "Disappearing message time set to $time$",
+  "set": "Set",
+  "changeNickname": "Change Nickname",
+  "clearNickname": "Clear Nickname",
+  "nicknamePlaceholder": "New Nickname",
+  "changeNicknameMessage": "Enter a nickname for this user",
   "noteToSelf": "Note to Self",
   "savedMessages": "Saved Messages",
   "hideMenuBarTitle": "Hide Menu Bar",
@@ -259,10 +299,19 @@
   "banUserAndDeleteAll": "Ban and Delete All",
   "userBanned": "Banned successfully",
   "userBanFailed": "Ban failed!",
+  "leave": "Leave",
   "leaveGroup": "Leave Group",
   "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
-  "leaveGroupConfirmation": "Are you sure you want to leave this group?",
+  "leaveGroupConfirmation": "Are you sure you want to leave <b>$name$</b>?",
   "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?",
+  "leaveGroupConrirmationOnlyAdminLegacy": "Are you sure you want to leave <b>$name$</b>? This will deactivate the group for all members.",
+  "leaveGroupConfirmationOnlyAdmin": "You are the only admin in <b>$name$</b>",
+  "leaveGroupConfirmationOnlyAdminWarning": "Group settings and members cannot be changed without an admin",
+  "leaveGroupFailed": "Failed to leave Group!",
+  "leaveGroupFailedPleaseTryAgain": "Unable to leave the Group, please try again",
+  "leaveCommunity": "Leave Community",
+  "leaveCommunityFailed": "Failed to leave Community!",
+  "leaveCommunityFailedPleaseTryAgain": "Unable to leave the Community, please try again",
   "cannotRemoveCreatorFromGroup": "Cannot remove this user",
   "cannotRemoveCreatorFromGroupDesc": "You cannot remove this user as they are the creator of the group.",
   "noContactsForGroup": "You don't have any contacts yet",
@@ -325,6 +374,7 @@
   "editProfileModalTitle": "Profile",
   "groupNamePlaceholder": "Group Name",
   "inviteContacts": "Invite Contacts",
+  "addModerator": "Add Admin",
   "addModerators": "Add Admins",
   "removeModerators": "Remove Admins",
   "addAsModerator": "Add as Admin",
@@ -517,5 +567,16 @@
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
   "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
   "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message",
-  "setDisplayPicture": "Set Display Picture"
+  "setDisplayPicture": "Set Display Picture",
+  "settingAppliesToEveryone": "This setting applies to everyone in this conversation.",
+  "settingAppliesToYourMessages": "This setting applies to messages you send in this conversation.",
+  "onlyGroupAdminsCanChange": "Only group admins can change this setting.",
+  "messageInfo": "Message Info",
+  "fileId": "File ID",
+  "fileSize": "File Size",
+  "fileType": "File Type",
+  "resolution": "Resolution",
+  "duration": "Duration",
+  "notApplicable": "N/A",
+  "unknownError": "Unknown Error"
 }

_locales/ka/messages.json

@@ -181,6 +181,7 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
+  "unblockGroupToSend": "This group is blocked. Unblock it if you would like to send a message.",
   "youChangedTheTimer": "You set the disappearing message timer to $time$",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",

_locales/kn/messages.json

@@ -181,6 +181,7 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
+  "unblockGroupToSend": "This group is blocked. Unblock it if you would like to send a message.",
   "youChangedTheTimer": "You set the disappearing message timer to $time$",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",

_locales/lv/messages.json

@@ -181,6 +181,7 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
+  "unblockGroupToSend": "This group is blocked. Unblock it if you would like to send a message.",
   "youChangedTheTimer": "You set the disappearing message timer to $time$",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",

_locales/pa/messages.json

@@ -181,6 +181,7 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
+  "unblockGroupToSend": "This group is blocked. Unblock it if you would like to send a message.",
   "youChangedTheTimer": "You set the disappearing message timer to $time$",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",

_locales/ta/messages.json

@@ -181,6 +181,7 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
+  "unblockGroupToSend": "This group is blocked. Unblock it if you would like to send a message.",
   "youChangedTheTimer": "You set the disappearing message timer to $time$",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",

_locales/tl/messages.json

@@ -181,6 +181,7 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
+  "unblockGroupToSend": "This group is blocked. Unblock it if you would like to send a message.",
   "youChangedTheTimer": "You set the disappearing message timer to $time$",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.11.5",
+  "version": "1.12.0",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",
@@ -79,12 +79,13 @@
     "blob-util": "2.0.2",
     "blueimp-load-image": "5.14.0",
     "buffer-crc32": "0.2.13",
-    "bunyan": "^1.8.15",
+    "bunyan": "https://github.com/Bilb/node-bunyan",
     "bytebuffer": "^5.0.1",
     "classnames": "2.2.5",
     "config": "1.28.1",
     "country-code-lookup": "^0.0.19",
     "curve25519-js": "https://github.com/oxen-io/curve25519-js",
+    "date-fns": "^3.3.1",
     "dompurify": "^2.0.7",
     "electron-localshortcut": "^3.2.1",
     "electron-updater": "^4.2.2",
@@ -95,7 +96,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.6/libsession_util_nodejs-v0.2.6.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.1/libsession_util_nodejs-v0.3.1.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "^4.0.1",
     "lodash": "^4.17.21",
@@ -113,7 +114,7 @@
     "react-dom": "^17.0.2",
     "react-draggable": "^4.4.4",
     "react-h5-audio-player": "^3.2.0",
-    "react-intersection-observer": "^8.30.3",
+    "react-intersection-observer": "^9.7.0",
     "react-mentions": "^4.4.9",
     "react-qr-svg": "^2.2.1",
     "react-redux": "8.0.4",
@@ -180,6 +181,7 @@
     "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
+    "eslint-import-resolver-typescript": "^3.6.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-more": "^1.0.5",

preload.js

@@ -2,6 +2,8 @@
 const { clipboard, ipcRenderer, webFrame } = require('electron/main');
 const { Storage } = require('./ts/util/storage');
 
+const { isTestNet, isTestIntegration } = require('./ts/shared/env_vars');
+
 const url = require('url');
 
 const _ = require('lodash');
@@ -22,19 +24,14 @@ window.getTitle = () => title;
 window.getEnvironment = () => configAny.environment;
 window.getAppInstance = () => configAny.appInstance;
 window.getVersion = () => configAny.version;
-window.isDev = () => config.environment === 'development';
 window.getCommitHash = () => configAny.commitHash;
 window.getNodeVersion = () => configAny.node_version;
 
 window.sessionFeatureFlags = {
   useOnionRequests: true,
-  useTestNet: Boolean(
-    process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('testnet')
-  ),
-  integrationTestEnv: Boolean(
-    process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('test-integration')
-  ),
-  useClosedGroupV3: false || process.env.USE_CLOSED_GROUP_V3,
+  useTestNet: isTestNet(),
+  integrationTestEnv: isTestIntegration(),
+  useClosedGroupV3: false,
   debug: {
     debugLogging: !_.isEmpty(process.env.SESSION_DEBUG),
     debugLibsessionDumps: !_.isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS),