rename a few loki to session

winter0019 · Feb 18, 2022 · 3fed220 · 3fed220
1 parent d66716d
commit 3fed220
Show file tree

Hide file tree

Showing 28 changed files with 98 additions and 181 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -1,5 +1,4 @@
 {
-  "privacyPolicy": "Terms & Privacy Policy",
   "copyErrorAndQuit": "Copy error and quit",
   "unknown": "Unknown",
   "databaseError": "Database Error",
@@ -17,15 +16,13 @@
   "editMenuCut": "Cut",
   "editMenuCopy": "Copy",
   "editMenuPaste": "Paste",
-  "editMenuPasteAndMatchStyle": "Paste and Match Style",
   "editMenuDelete": "Delete",
   "editMenuDeleteContact": "Delete Contact",
   "editMenuDeleteGroup": "Delete Group",
   "editMenuSelectAll": "Select all",
   "windowMenuClose": "Close Window",
   "windowMenuMinimize": "Minimize",
   "windowMenuZoom": "Zoom",
-  "windowMenuBringAllToFront": "Bring All to Front",
   "viewMenuResetZoom": "Actual Size",
   "viewMenuZoomIn": "Zoom In",
   "viewMenuZoomOut": "Zoom Out",

diff --git a/app/config.js b/app/config.js
@@ -7,7 +7,6 @@ let environment;
 // In production mode, NODE_ENV cannot be customized by the user
 if (isDevelopment) {
   environment = process.env.NODE_ENV || 'development';
-  process.env.LOKI_DEV = 1;
 } else {
   environment = 'production';
 }

diff --git a/app/menu.js b/app/menu.js
@@ -54,10 +54,6 @@ exports.createTemplate = (options, messages) => {
           role: 'paste',
           label: messages.editMenuPaste,
         },
-        {
-          role: 'pasteandmatchstyle',
-          label: messages.editMenuPasteAndMatchStyle,
-        },
         {
           role: 'delete',
           label: messages.editMenuDelete,
@@ -242,13 +238,6 @@ function updateForMac(template, messages, options) {
       label: messages.show,
       click: showWindow,
     },
-    {
-      type: 'separator',
-    },
-    {
-      role: 'front',
-      label: messages.windowMenuBringAllToFront,
-    },
   ];
 
   return template;

diff --git a/app/spell_check.js b/app/spell_check.js
@@ -65,13 +65,6 @@ exports.setup = (browserWindow, messages) => {
         template.push({ label: messages.editMenuPaste, role: 'paste' });
       }
 
-      if (editFlags.canPaste) {
-        template.push({
-          label: messages.editMenuPasteAndMatchStyle,
-          role: 'pasteAndMatchStyle',
-        });
-      }
-
       // Only enable select all in editors because select all in non-editors
       // results in all the UI being selected
       if (editFlags.canSelectAll && params.isEditable) {

diff --git a/debug_log.html b/debug_log.html
@@ -1,7 +1,8 @@
 <html>
-<head>
-  <meta http-equiv="Content-Security-Policy"
-    content="default-src 'none';
+  <head>
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src 'none';
             child-src 'self';
             connect-src 'self' https: wss:;
             font-src 'self';
@@ -12,42 +13,40 @@
             object-src 'none';
             script-src 'self';
             style-src 'self' 'unsafe-inline';"
-  >
-  <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
-<style>
-</style>
-</head>
-<body class='debug-log-window'>
-</body>
-<script type='text/x-tmpl-mustache' id='debug-log'>
-  <div class='content'>
-    <div>
-      <a class='x close' alt='close debug log' href='#'></a>
-      <h1> {{ title }} </h1>
-      <p> {{ debugLogExplanation }}</p>
+    />
+    <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
+    <style></style>
+  </head>
+  <body class="debug-log-window"></body>
+  <script type="text/x-tmpl-mustache" id="debug-log">
+    <div class='content'>
+      <div>
+        <a class='x close' alt='close debug log' href='#'></a>
+        <h1> {{ title }} </h1>
+        <p> {{ debugLogExplanation }}</p>
+      </div>
+      <textarea spellcheck='false' rows='5'></textarea>
+      <div class='buttons'>
+        <button class='grey submit'>{{ submit }}</button>
+      </div>
+      <div class='result'>
+      </div>
     </div>
-    <textarea spellcheck='false' rows='5'></textarea>
-    <div class='buttons'>
-      <button class='grey submit'>{{ submit }}</button>
+  </script>
+  <script type="text/x-tmpl-mustache" id="debug-log-link">
+    <div class='input-group clearfix'>
+      <input type='text' class='link' readonly value='{{ url }}' />
+      <a class='open' alt='open in a new browser tab' target='_blank' href='{{ url }}'></a>
     </div>
-    <div class='result'>
-    </div>
-  </div>
-</script>
-<script type='text/x-tmpl-mustache' id='debug-log-link'>
-  <div class='input-group clearfix'>
-    <input type='text' class='link' readonly value='{{ url }}' />
-    <a class='open' alt='open in a new browser tab' target='_blank' href='{{ url }}'></a>
-  </div>
-  <p>
-    <a class='report-link' target='_blank'
-        href='https://github.com/loki-project/session-desktop/issues/new/'>
-        {{ reportIssue }}
-    </a>
-  </p>
-</script>
-<script type='text/javascript' src='js/components.js'></script>
-<script type='text/javascript' src='js/views/whisper_view.js'></script>
-<script type='text/javascript' src='js/views/debug_log_view.js'></script>
-<script type='text/javascript' src='js/debug_log_start.js'></script>
+    <p>
+      <a class='report-link' target='_blank'
+          href='https://github.com/oxen-io/session-desktop/issues/new/'>
+          {{ reportIssue }}
+      </a>
+    </p>
+  </script>
+  <script type="text/javascript" src="js/components.js"></script>
+  <script type="text/javascript" src="js/views/whisper_view.js"></script>
+  <script type="text/javascript" src="js/views/debug_log_view.js"></script>
+  <script type="text/javascript" src="js/debug_log_start.js"></script>
 </html>
diff --git a/fix_broken_perms.sh b/fix_broken_perms.sh
@@ -1,4 +1,4 @@
 set -e
 find release/linux -type d | xargs chmod 755
 find release/linux -type f | xargs chmod 644
-chmod +x release/linux/loki-messenger*
+chmod +x release/linux/session-desktop*
diff --git a/js/modules/signal.js b/js/modules/signal.js
@@ -19,9 +19,6 @@ const { SessionInboxView } = require('../../ts/components/SessionInboxView');
 // Types
 const SettingsType = require('../../ts/types/Settings');
 
-// Views
-const Initialization = require('./views/initialization');
-
 exports.setup = () => {
   Data.init();
 
@@ -35,10 +32,6 @@ exports.setup = () => {
     Settings: SettingsType,
   };
 
-  const Views = {
-    Initialization,
-  };
-
   return {
     Components,
     Crypto,
@@ -49,6 +42,5 @@ exports.setup = () => {
     Settings,
     Types,
     Util,
-    Views,
   };
 };
diff --git a/js/modules/views/initialization.js b/js/modules/views/initialization.js
diff --git a/main.js b/main.js
@@ -28,7 +28,7 @@ const {
   systemPreferences,
 } = electron;
 
-// FIXME Hardcoding appId to prevent build failrues on release.
+// FIXME Hardcoding appId to prevent build failures on release.
 // const appUserModelId = packageJson.build.appId;
 const appUserModelId = 'com.loki-project.messenger-desktop';
 console.log('Set Windows Application User Model ID (AUMID)', {
@@ -986,7 +986,7 @@ ipc.on('set-call-media-permissions', (event, value) => {
   event.sender.send('set-success-call-media-permissions', null);
 });
 
-// Loki - Auto updating
+// Session - Auto updating
 ipc.on('get-auto-update-setting', event => {
   const configValue = userConfig.get('autoUpdate');
   // eslint-disable-next-line no-param-reassign

diff --git a/preload.js b/preload.js
@@ -28,7 +28,7 @@ window.isDev = () => config.environment === 'development';
 window.getCommitHash = () => config.commitHash;
 window.getNodeVersion = () => config.node_version;
 
-window.lokiFeatureFlags = {
+window.sessionFeatureFlags = {
   useOnionRequests: true,
   useMessageRequests: false,
   useCallMessage: true,

diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
@@ -214,7 +214,7 @@ const CallButton = () => {
     isMe ||
     !selectedConvoKey ||
     isBlocked ||
-    !window.lokiFeatureFlags.useCallMessage
+    !window.sessionFeatureFlags.useCallMessage
   ) {
     return null;
   }

diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -110,7 +110,7 @@ export class LeftPaneMessageSection extends React.Component<Props> {
     return (
       <div className="module-conversations-list-content">
         <SessionSearchInput />
-        {window.lokiFeatureFlags.useMessageRequests ? (
+        {window.sessionFeatureFlags.useMessageRequests ? (
           <MessageRequestsBanner
             handleOnClick={() => {
               window.inboxStore?.dispatch(setOverlayMode('message-requests'));

diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -21,7 +21,7 @@ import useKey from 'react-use/lib/useKey';
  */
 async function handleBlockAllRequestsClick(messageRequestSetting: boolean) {
   const messageRequestsEnabled =
-    messageRequestSetting && window?.lokiFeatureFlags?.useMessageRequests;
+    messageRequestSetting && window?.sessionFeatureFlags?.useMessageRequests;
 
   if (!messageRequestsEnabled) {
     return;

diff --git a/ts/components/settings/section/CategoryPrivacy.tsx b/ts/components/settings/section/CategoryPrivacy.tsx
@@ -57,7 +57,7 @@ export const SettingsCategoryPrivacy = (props: {
   const forceUpdate = useUpdate();
   const dispatch = useDispatch();
 
-  const hasMessageRequestFlag = window.lokiFeatureFlags.useMessageRequests;
+  const hasMessageRequestFlag = window.sessionFeatureFlags.useMessageRequests;
 
   if (props.hasPassword !== null) {
     return (
@@ -71,7 +71,7 @@ export const SettingsCategoryPrivacy = (props: {
           description={window.i18n('mediaPermissionsDescription')}
           active={Boolean(window.getSettingValue('media-permissions'))}
         />
-        {window.lokiFeatureFlags.useCallMessage && (
+        {window.sessionFeatureFlags.useCallMessage && (
           <SessionToggleWithDescription
             onClickToggle={async () => {
               await toggleCallMediaPermissions(forceUpdate);

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
@@ -1438,7 +1438,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     if (
       isMe &&
-      window.lokiFeatureFlags.useMessageRequests &&
+      window.sessionFeatureFlags.useMessageRequests &&
       window.inboxStore?.getState().userConfig.messageRequests
     ) {
       await this.setIsApproved(true);
@@ -1491,7 +1491,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       return false;
     }
     const msgRequestsEnabled =
-      window.lokiFeatureFlags.useMessageRequests &&
+      window.sessionFeatureFlags.useMessageRequests &&
       window.inboxStore?.getState().userConfig.messageRequests;
 
     // if msg requests are unused, we have to send typing (this is already a private active unblocked convo)

diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
@@ -141,7 +141,7 @@ const handleContactReceived = async (
     }
 
     if (
-      window.lokiFeatureFlags.useMessageRequests &&
+      window.sessionFeatureFlags.useMessageRequests &&
       window.inboxStore?.getState().userConfig.messageRequests
     ) {
       if (contactReceived.isApproved) {

diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
@@ -428,7 +428,7 @@ export async function innerHandleSwarmContentMessage(
     if (content.unsendMessage) {
       await handleUnsendMessage(envelope, content.unsendMessage as SignalService.Unsend);
     }
-    if (content.callMessage && window.lokiFeatureFlags?.useCallMessage) {
+    if (content.callMessage && window.sessionFeatureFlags?.useCallMessage) {
       await handleCallMessage(envelope, content.callMessage as SignalService.CallMessage);
     }
   } catch (e) {

diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
@@ -253,7 +253,7 @@ async function handleRegularMessage(
   if (type === 'outgoing') {
     await handleSyncedReceipts(message, conversation);
 
-    if (window.lokiFeatureFlags.useMessageRequests) {
+    if (window.sessionFeatureFlags.useMessageRequests) {
       // assumes sync receipts are always from linked device outgoings
       await conversation.setIsApproved(true);
     }

diff --git a/ts/session/apis/seed_node_api/SeedNodeAPI.ts b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
@@ -48,7 +48,7 @@ export async function fetchSnodePoolFromSeedNodeWithRetries(
     return fetchSnodePool;
   } catch (e) {
     window?.log?.warn(
-      'LokiSnodeAPI::fetchSnodePoolFromSeedNodeWithRetries - error',
+      'SessionSnodeAPI::fetchSnodePoolFromSeedNodeWithRetries - error',
       e.code,
       e.message
     );