Merge remote-tracking branch 'upstream/unstable' into fix-send-approved-only-when-unapproved

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,9 +6,9 @@ body:
   - type: checkboxes
     attributes:
       label: Code of conduct
-      description: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-desktop/blob/master/CODE_OF_CONDUCT.md).
+      description: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-desktop/blob/master/CODE_OF_CONDUCT.md).
       options:
-        - label: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-desktop/blob/master/CODE_OF_CONDUCT.md)
+        - label: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-desktop/blob/master/CODE_OF_CONDUCT.md)
           required: true
 
   - type: checkboxes

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,13 +9,13 @@ Remember, you can preview this before saving it.
 
 ### First time contributor checklist:
 
-- [ ] I have read the [README](https://github.com/oxen-io/session-desktop/blob/master/README.md) and [Contributor Guidelines](https://github.com/oxen-io/session-desktop/blob/master/CONTRIBUTING.md)
+- [ ] I have read the [README](https://github.com/session-foundation/session-desktop/blob/master/README.md) and [Contributor Guidelines](https://github.com/session-foundation/session-desktop/blob/master/CONTRIBUTING.md)
 
 ### Contributor checklist:
 
 - [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/)
-- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`unstable`](https://github.com/oxen-io/session-desktop/tree/unstable) branch
+- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`unstable`](https://github.com/session-foundation/session-desktop/tree/unstable) branch
-- [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/oxen-io/session-desktop/blob/master/CONTRIBUTING.md#tests))
+- [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/session-foundation/session-desktop/blob/master/CONTRIBUTING.md#tests))
 - [ ] My changes are ready to be shipped to users
 
 ### Description

.github/workflows/build-binaries.yml

@@ -29,6 +29,7 @@ jobs:
   build_linux:
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         # this needs to be a valid target of https://www.electron.build/linux#target
         pkg_to_build: ['deb', 'rpm', 'freebsd', 'AppImage']

CONTRIBUTING.md

@@ -10,7 +10,7 @@ It's a good idea to gauge interest in your intended work by finding the current
 for it or creating a new one yourself. Use Github issues as a place to signal
 your intentions and get feedback from the users most likely to appreciate your changes.
 
-You're most likely to have your pull request accepted if it addresses an existing Github issue marked with the [good-first-issue](https://github.com/oxen-io/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag, these issues are specifically tagged, because they are generally features/bug fixes which can be cleanly merged on a single platform without requiring cross platform work, are generally of lower complexity than larger features and are non contentious, meaning that the core team doesn't need to try and assess the community desire for such a feature before merging.
+You're most likely to have your pull request accepted if it addresses an existing Github issue marked with the [good-first-issue](https://github.com/session-foundation/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag, these issues are specifically tagged, because they are generally features/bug fixes which can be cleanly merged on a single platform without requiring cross platform work, are generally of lower complexity than larger features and are non contentious, meaning that the core team doesn't need to try and assess the community desire for such a feature before merging.
 
 Of course we encourage community developers to work on ANY issue filed on our Github regardless of how it’s tagged, however if you pick up or create an issue without the “Good first issue” tag it would be best if you leave a comment on the issue so that the core team can give you any guidance required, especially around UI heavy features or issues which require cross platform integration.
 
@@ -18,7 +18,7 @@ Of course we encourage community developers to work on ANY issue filed on our Gi
 
 ## Node.js
 
-You'll need a [Node.js](https://nodejs.org/) version which matches our current version. You can check [`.nvmrc` in the `unstable` branch](https://github.com/oxen-io/session-desktop/blob/unstable/.nvmrc) to see what the current version is.
+You'll need a [Node.js](https://nodejs.org/) version which matches our current version. You can check [`.nvmrc` in the `unstable` branch](https://github.com/session-foundation/session-desktop/blob/unstable/.nvmrc) to see what the current version is.
 
 If you use other node versions you might have or need a node version manager.
 
@@ -139,7 +139,7 @@ sudo dnf install make automake gcc gcc-c++ kernel-devel
 Now, run these commands in your preferred terminal in a good directory for development:
 
 ```
-git clone https://github.com/oxen-io/session-desktop.git
+git clone https://github.com/session-foundation/session-desktop.git
 cd session-desktop
 npm install --global yarn      # (only if you don’t already have `yarn`)
 yarn install --frozen-lockfile # Install and build dependencies (this will take a while)
@@ -262,6 +262,7 @@ So you wanna make a pull request? Please observe the following guidelines.
       choices that may be helpful to someone reviewing or auditing the commit
       history in the future. When in doubt, err on the side of a longer
       commit message.
+
 Above all, spend some time with the repository. Follow the pull request template added to
 your pull request description automatically. Take a look at recent approved pull requests,
 see how they did things.

INTERNALBUILDS.md

@@ -80,7 +80,6 @@ Building on windows should work straight out of the box, but if it fails then yo
 
 ```
 npm install --global --production windows-build-tools@4.0.0
-npm install --global node-gyp@latest
 npm config set python python2.7
 npm config set msvs_version 2015
 ```

README.md

@@ -10,11 +10,11 @@ Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about
 
 ## Want to Contribute? Found a Bug or Have a feature request?
 
-Please search for any [existing issues](https://github.com/oxen-io/session-desktop/issues) that describe your bug in order to avoid duplicate submissions. <br><br>Submissions can be made by making a pull request to our development branch.If you don't know where to start contributing please read [Contributing.md](CONTRIBUTING.md) and refer to issues tagged with the [Good-first-issue](https://github.com/oxen-io/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag.
+Please search for any [existing issues](https://github.com/session-foundation/session-desktop/issues) that describe your bug in order to avoid duplicate submissions. <br><br>Submissions can be made by making a pull request to our development branch.If you don't know where to start contributing please read [Contributing.md](CONTRIBUTING.md) and refer to issues tagged with the [Good-first-issue](https://github.com/session-foundation/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag.
 
 ## Supported platforms
 
-Session requires Windows 10 or later, macOS Monterey (12) or later, or a Linux distribution with glibc 2.28 or later like Debian 10 or Ubuntu 20.04.
+Session requires Windows 10 or later, macOS Ventura (13) or later, or a Linux distribution with glibc 2.28 or later like Debian 10 or Ubuntu 20.04.
 
 ## Build instruction
 
@@ -32,8 +32,8 @@ gpg --import KeeJef.asc
 Get the signed hash for this release, the SESSION_VERSION needs to be updated for the release you want to verify
 
 ```
-export SESSION_VERSION=1.6.1
+export SESSION_VERSION=1.14.5
-wget https://github.com/oxen-io/session-desktop/releases/download/v$SESSION_VERSION/signatures.asc
+wget https://github.com/session-foundation/session-desktop/releases/download/v$SESSION_VERSION/signatures.asc
 ```
 
 Verify the signature of the hashes of the files

actions/setup_and_build/action.yml

@@ -22,12 +22,6 @@ runs:
       uses: microsoft/setup-msbuild@v2
       if: runner.os == 'Windows'
 
-    - name: Setup node for windows
-      if: runner.os == 'Windows'
-      shell: bash
-      run: |
-        yarn global add node-gyp@latest
-
     - uses: actions/cache/restore@v4
       id: cache-desktop-modules
       with:

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.14.3",
+  "version": "1.14.5",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",
@@ -10,7 +10,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/oxen-io/session-desktop.git"
+    "url": "https://github.com/session-foundation/session-desktop.git"
   },
   "main": "ts/mains/main_node.js",
   "resolutions": {
@@ -79,7 +79,7 @@
     "bytebuffer": "^5.0.1",
     "classnames": "2.2.5",
     "config": "1.28.1",
-    "curve25519-js": "https://github.com/oxen-io/curve25519-js",
+    "curve25519-js": "https://github.com/session-foundation/curve25519-js",
     "date-fns": "^3.6.0",
     "dompurify": "^2.0.7",
     "electron-localshortcut": "^3.2.1",

ts/components/conversation/media-gallery/DocumentListItem.tsx

@@ -63,7 +63,7 @@ export const DocumentListItem = (props: Props) => {
           </span>
         </div>
         <div className="module-document-list-item__date">
-          {formatDateWithLocale({ date: new Date(timestamp), formatStr: 'ddd, MMM D, Y' })}
+          {formatDateWithLocale({ date: new Date(timestamp), formatStr: 'd LLL, yyyy' })}
         </div>
       </div>
     </div>

ts/components/settings/SessionSettings.tsx

@@ -73,7 +73,7 @@ const SessionInfo = () => {
       <StyledSpanSessionInfo
         onClick={() => {
           void shell.openExternal(
-            `https://github.com/oxen-io/session-desktop/releases/tag/v${window.versionInfo.version}`
+            `https://github.com/session-foundation/session-desktop/releases/tag/v${window.versionInfo.version}`
           );
         }}
       >

ts/mains/main_node.ts

@@ -529,7 +529,7 @@ setTimeout(readyForUpdates, TEN_MINUTES);
 
 function openReleaseNotes() {
   void shell.openExternal(
-    `https://github.com/oxen-io/session-desktop/releases/tag/v${app.getVersion()}`
+    `https://github.com/session-foundation/session-desktop/releases/tag/v${app.getVersion()}`
   );
 }
 
@@ -1022,9 +1022,7 @@ ipc.on('get-start-in-tray', event => {
 
 ipcMain.on('update-badge-count', (_event, count) => {
   if (app.isReady()) {
-    app.setBadgeCount(
+    app.setBadgeCount(isNumber(count) && isFinite(count) && count >= 0 ? count : 0);
-     isNumber(count) && isFinite(count) && count >= 0 ? count : 0 
-    );
   }
 });
 

ts/node/locale.ts

@@ -11,7 +11,7 @@ export function normalizeLocaleName(locale: string) {
   const dashedLocale = locale.replaceAll('_', '-');
 
   // Note: this is a pain, but we somehow needs to keep in sync this logic and the LOCALE_PATH_MAPPING from
-  // https://github.com/oxen-io/session-shared-scripts/blob/main/crowdin/generate_desktop_strings.py
+  // https://github.com/session-foundation/session-shared-scripts/blob/main/crowdin/generate_desktop_strings.py
   // What we do, is keep as is, anything given in LOCALE_PATH_MAPPING, but otherwise, keep only the first part of the locale.
   // So `es-419` is allowed, but `es-es` is hardcoded to es, fr_FR is hardcoded to fr, and so on.
   if (

yarn.lock

@@ -2584,9 +2584,9 @@ csstype@3.1.3, csstype@^3.0.2, csstype@^3.1.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-"curve25519-js@https://github.com/oxen-io/curve25519-js":
+"curve25519-js@https://github.com/session-foundation/curve25519-js":
   version "0.0.4"
-  resolved "https://github.com/oxen-io/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6"
+  resolved "https://github.com/session-foundation/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6"
 
 dargs@^7.0.0:
   version "7.0.0"