From 9c4eee8a15b4d56092c89b9cfabf1e0d8bc8d9af Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 7 Dec 2023 16:28:29 +1100
Subject: [PATCH 1/3] fix: disable frigg&fenrir turn servers for now

---
 ts/session/utils/calling/CallManager.ts | 39 +++++++++++++------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index 171661c85..dde0b8adf 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -5,34 +5,34 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { MessageUtils, ToastUtils, UserUtils } from '..';
 import { SignalService } from '../../../protobuf';
-import { openConversationWithMessages } from '../../../state/ducks/conversations';
 import {
+  CallStatusEnum,
   answerCall,
   callConnected,
   callReconnecting,
-  CallStatusEnum,
   endCall,
   incomingCall,
   setFullScreenCall,
   startingCallWith,
 } from '../../../state/ducks/call';
+import { openConversationWithMessages } from '../../../state/ducks/conversations';
 import { getConversationController } from '../../conversations';
 import { CallMessage } from '../../messages/outgoing/controlMessage/CallMessage';
 import { ed25519Str } from '../../onions/onionPath';
 import { PubKey } from '../../types';
 
-import { getIsRinging } from '../RingingManager';
-import { getBlackSilenceMediaStream } from './Silence';
 import { getMessageQueue } from '../..';
-import { MessageSender } from '../../sending';
-import { DURATION } from '../../constants';
-import { Data } from '../../../data/data';
 import { getCallMediaPermissionsSettings } from '../../../components/settings/SessionSettings';
-import { PnServer } from '../../apis/push_notification_api';
+import { Data } from '../../../data/data';
 import { approveConvoAndSendResponse } from '../../../interactions/conversationInteractions';
+import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes';
+import { PnServer } from '../../apis/push_notification_api';
 import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
-import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes';
+import { DURATION } from '../../constants';
+import { MessageSender } from '../../sending';
+import { getIsRinging } from '../RingingManager';
+import { getBlackSilenceMediaStream } from './Silence';
 
 export type InputItem = { deviceId: string; label: string };
 
@@ -137,16 +137,17 @@ const iceServersFullArray = [
     username: 'session202111',
     credential: '053c268164bc7bd7',
   },
-  {
-    urls: 'turn:fenrir.getsession.org',
-    username: 'session202111',
-    credential: '053c268164bc7bd7',
-  },
-  {
-    urls: 'turn:frigg.getsession.org',
-    username: 'session202111',
-    credential: '053c268164bc7bd7',
-  },
+  // excluding those two (fenrir & frigg) as they are TCP only for now
+  // {
+  //   urls: 'turn:fenrir.getsession.org',
+  //   username: 'session202111',
+  //   credential: '053c268164bc7bd7',
+  // },
+  // {
+  //   urls: 'turn:frigg.getsession.org',
+  //   username: 'session202111',
+  //   credential: '053c268164bc7bd7',
+  // },
   {
     urls: 'turn:angus.getsession.org',
     username: 'session202111',

From d0cf3169e82ef7de128190ff4818a559deab4b62 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 7 Dec 2023 16:29:37 +1100
Subject: [PATCH 2/3] chore: bump session to 1.11.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 34c9c9782..e1036eef6 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.11.4",
+  "version": "1.11.5",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",

From ee8ec7b0f827f4ea4d728e30867863cd876ce316 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 9 Nov 2023 16:51:04 +1100
Subject: [PATCH 3/3] fix: fix macos CI by forcing use of python 3.11

---
 actions/setup_and_build/action.yml | 4 ++++
 yarn.lock                          | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/actions/setup_and_build/action.yml b/actions/setup_and_build/action.yml
index a3abd3034..c53502656 100644
--- a/actions/setup_and_build/action.yml
+++ b/actions/setup_and_build/action.yml
@@ -8,6 +8,10 @@ runs:
       with:
         node-version-file: '.nvmrc'
 
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
     - name: Cache Desktop node_modules
       id: cache-desktop-modules
       uses: actions/cache@v3
diff --git a/yarn.lock b/yarn.lock
index 01098d305..a13fb51d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -640,9 +640,9 @@
     reselect "^4.1.5"
 
 "@signalapp/better-sqlite3@^8.4.3":
-  version "8.4.3"
-  resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.4.3.tgz#7ffa8d03d2a12543247936bfb7b9f74cdbc6fe9b"
-  integrity sha512-6HaN8a90fWHBPIIZRRmSG7wc3BPczLx3Mb9MJ8wsatYqf8C1+2NdFae5AzII8Oe9YE9SSHzCjdPd8ST1m9+Qag==
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.5.2.tgz#910669f44e76a46d06df45fabefcd3ac2e7c4cce"
+  integrity sha512-t7XalDxuRP115EratM6i1kbvIXJvzETcl8wqnt3NlWZdzil7kelS/RYz+PE1G+z8ZwtFyn/ViAFMt76AsArifw==
   dependencies:
     bindings "^1.5.0"
     tar "^6.1.0"