Merge pull request #1857 from session-foundation/dev

Session 1.17.11

Author: Bilb

.github/workflows/build-binaries.yml

@@ -167,6 +167,9 @@ jobs:
         if: ${{ matrix.is_qa == true }}
         uses: ./actions/sed_for_qa
 
+      - name: Enforce static builds for libsession-util-nodejs
+        uses: ./actions/enforce_static_builds
+
       - name: Build
         run: pnpm run build
 
@@ -339,6 +342,9 @@ jobs:
         with:
           cache_suffix: ${{ matrix.cache_suffix }}
 
+      - name: Enforce static builds for libsession-util-nodejs
+        uses: ./actions/enforce_static_builds
+
       - name: Build
         run: pnpm run build
 

.github/workflows/update-localization.yml

@@ -0,0 +1,55 @@
+name: Update Localization Submodule
+
+on:
+  workflow_dispatch: # Manual trigger
+  schedule:
+    - cron: "20 10 * * *" # Runs at 10:20 am everyday
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  update-localization:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update submodule to latest main
+        run: |
+          cd ts/localization
+          git fetch origin main
+          git checkout FETCH_HEAD
+          cd ../..
+
+      - name: Check for changes
+        id: changes
+        run: |
+          if git diff --quiet; then
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+            echo "No submodule changes detected"
+          else
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+            echo "Submodule changes detected"
+          fi
+
+      - name: Create Pull Request
+        if: steps.changes.outputs.has_changes == 'true'
+        uses: peter-evans/create-pull-request@v6
+        with:
+          commit-message: "chore: update localization submodule"
+          branch: update-localization
+          delete-branch: true
+          title: "chore: Update localization submodule"
+          body: |
+            ## Changes
+            - Updated `session-localization` submodule to latest `feature/update-crowdin-translations`
+
+            This updates the translations with the latest changes from Crowdin.
+
+            Auto-generated by workflow run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

actions/enforce_static_builds/action.yml

@@ -0,0 +1,51 @@
+name: 'Enforce static builds link only to system libs'
+description: 'Enforce that the libsession-util-nodejs.node is only linking to system libraries'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Check static library linkage
+      shell: bash
+      run: |
+        if [ "$RUNNER_OS" == "Windows" ]; then
+            echo "Skipping library check on Windows"
+            exit 0
+        fi
+
+        if ! find . -name 'libsession_util_nodejs.node' | grep -q .; then
+            echo -e "\nNo libsession_util_nodejs.node file found\n"
+            exit 1
+        fi
+
+        echo "Found files:"
+        find . -name 'libsession_util_nodejs.node' | while IFS= read -r f; do
+            echo "  $f"
+        done
+
+        bad=
+
+        while IFS= read -r node_file; do
+            echo "--- Checking: $node_file ---"
+            if [ "$RUNNER_OS" == "macOS" ]; then
+                otool -L "$node_file"
+                if otool -L "$node_file" | \
+                    grep -Ev '\.node:|@rpath/libsession_util_nodejs|/usr/lib/libc\+\+|/usr/lib/libSystem'; then
+                    bad=1
+                fi
+            elif [ "$RUNNER_OS" == "Linux" ]; then
+                ldd "$node_file"
+                if ldd "$node_file" | grep -Ev '(linux-vdso\.so\.[0-9]+|ld-linux-(x86-64|armhf|aarch64)\.so\.[0-9]+|lib(stdc\+\+|gcc_s|c|m)\.so\.[0-9]+)'; then
+                    bad=1
+                fi
+            else
+                echo -e "\nDon't know how to check linked libs on $RUNNER_OS\n"
+                exit 1
+            fi
+        done < <(find . -name 'libsession_util_nodejs.node')
+
+        if [ -n "$bad" ]; then
+            echo -e "\nlibsession-util-nodejs links to unexpected libraries\n"
+            exit 1
+        fi
+
+        echo -e "\nNo unexpected linked libraries found\n"

dynamic_assets

@@ -4,7 +4,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.17.10",
+  "version": "1.17.11",
   "license": "GPL-3.0",
   "author": {
     "name": "Session Foundation",
@@ -95,7 +95,7 @@
     "framer-motion": "^12.5.0",
     "fs-extra": "11.3.0",
     "image-type": "^4.1.0",
-    "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.6.11/libsession_util_nodejs-v0.6.11.tar.gz",
+    "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.6.12/libsession_util_nodejs-v0.6.12.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.15",
     "linkify-it": "^5.0.0",
     "lodash": "^4.17.21",

package.json

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 import { type ReactNode, useMemo, useRef } from 'react';
 import { getFeatureFlagMemo } from '../state/ducks/types/releasedFeaturesReduxTypes';
 import { clampNumber } from '../util/maths';
-import { defaultTriggerPos, PopoverTriggerPosition } from './SessionTooltip';
+import { PopoverTriggerPosition } from './SessionTooltip';
 
 const TIP_LENGTH = 18;
 const VIEWPORT_MARGIN = 4;
@@ -95,7 +95,7 @@ const StyledPopover = styled.div<{
 export type PopoverProps = {
   children: ReactNode;
   pointerOffset?: number;
-  triggerPosition: PopoverTriggerPosition;
+  triggerPosition: PopoverTriggerPosition | null;
   open: boolean;
   loading?: boolean;
   maxWidth?: string;
@@ -124,7 +124,7 @@ export const SessionPopoverContent = (props: PopoverProps) => {
     loading,
     maxWidth,
     onClick,
-    triggerPosition = defaultTriggerPos,
+    triggerPosition,
     isTooltip,
     contentMargin = 0,
     containerMarginTop = VIEWPORT_MARGIN,
@@ -146,8 +146,10 @@ export const SessionPopoverContent = (props: PopoverProps) => {
   const viewportWidth = window.innerWidth;
   const viewportHeight = window.innerHeight;
 
+  const show = open && !loading && !!triggerPosition;
+
   const { x, y, pointerOffset, anchorX, finalVerticalPos, bounds } = useMemo(() => {
-    if (!open || loading) {
+    if (!show) {
       return {
         x: 0,
         y: 0,
@@ -217,15 +219,10 @@ export const SessionPopoverContent = (props: PopoverProps) => {
       bounds: { x1: minX, y1: minY, x2: maxX, y2: maxY },
     };
   }, [
-    open,
-    loading,
+    show,
     contentWidth,
     isTooltip,
-    triggerPosition.x,
-    triggerPosition.y,
-    triggerPosition.width,
-    triggerPosition.height,
-    triggerPosition.offsetX,
+    triggerPosition,
     horizontalPosition,
     viewportWidth,
     verticalPosition,
@@ -244,7 +241,7 @@ export const SessionPopoverContent = (props: PopoverProps) => {
     <>
       <StyledPopover
         ref={ref}
-        $readyToShow={open && !loading}
+        $readyToShow={show}
         onClick={onClick}
         x={x}
         y={y}
@@ -257,7 +254,7 @@ export const SessionPopoverContent = (props: PopoverProps) => {
       >
         {children}
       </StyledPopover>
-      {showPopoverAnchors && open ? (
+      {showPopoverAnchors && show ? (
         // NOTE: these are only rendered when the debug option is enabled
         <>
           <StyledCoordinateRectangleMarker title="allowedArea" $bounds={bounds} />

pnpm-lock.yaml

@@ -66,9 +66,12 @@ export const getTriggerPositionFromId = (id: string): PopoverTriggerPosition =>
   return getTriggerPositionFromBoundingClientRect(el.getBoundingClientRect());
 };
 
-export const useTriggerPosition = (ref: RefObject<HTMLElement | null>): PopoverTriggerPosition => {
+// Returns null if the ref is null
+export const useTriggerPosition = (
+  ref: RefObject<HTMLElement | null>
+): PopoverTriggerPosition | null => {
   if (!ref.current) {
-    return defaultTriggerPos;
+    return null;
   }
   return getTriggerPositionFromBoundingClientRect(ref.current.getBoundingClientRect());
 };

ts/components/SessionPopover.tsx

@@ -1,5 +1,5 @@
 import { RefObject } from 'react';
-import { useTriggerPosition } from '../SessionTooltip';
+import { type PopoverTriggerPosition } from '../SessionTooltip';
 import { SessionEmojiPanel } from './SessionEmojiPanel';
 import { SessionPopoverContent } from '../SessionPopover';
 import { FixedBaseEmoji } from '../../types/Reaction';
@@ -9,30 +9,30 @@ const EMOJI_PANEL_WIDTH_PX = 354;
 const EMOJI_PANEL_HEIGHT_PX = 435;
 
 export function SessionEmojiPanelPopover({
-  triggerRef,
+  triggerPos,
   emojiPanelRef,
   onEmojiClicked,
   open,
   onClose,
 }: {
-  triggerRef: RefObject<HTMLButtonElement | null>;
+  triggerPos: PopoverTriggerPosition | null;
   open: boolean;
   emojiPanelRef: RefObject<HTMLDivElement | null>;
   onEmojiClicked: (emoji: FixedBaseEmoji) => void;
   onClose: () => void;
 }) {
-  const triggerPos = useTriggerPosition(triggerRef);
+  const _open = open && !!triggerPos;
   return (
     <SessionPopoverContent
       triggerPosition={triggerPos}
-      open={open}
+      open={_open}
       isTooltip={false}
       verticalPosition="bottom"
       horizontalPosition="center"
       fallbackContentWidth={EMOJI_PANEL_WIDTH_PX}
       fallbackContentHeight={EMOJI_PANEL_HEIGHT_PX}
     >
-      {open ? (
+      {_open ? (
         <SessionEmojiPanel
           ref={emojiPanelRef}
           show={true}

ts/components/SessionTooltip.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
 import useClickAway from 'react-use/lib/useClickAway';
-import type { PopoverTriggerPosition } from '../SessionTooltip';
+import { useTriggerPosition, type PopoverTriggerPosition } from '../SessionTooltip';
 import { SessionPopoverContent } from '../SessionPopover';
 import { MessageReactBar } from './message/message-content/MessageReactBar';
 import { THEME_GLOBALS } from '../../themes/globals';
@@ -22,14 +22,14 @@ export function SessionEmojiReactBarPopover({
   onClickAwayFromReactionBar: () => void;
 }) {
   const emojiPanelTriggerRef = useRef<HTMLButtonElement>(null);
+  const emojiPanelTriggerPos = useTriggerPosition(emojiPanelTriggerRef);
   const emojiPanelRef = useRef<HTMLDivElement>(null);
   const emojiReactionBarRef = useRef<HTMLDivElement>(null);
   const [showEmojiPanel, setShowEmojiPanel] = useState<boolean>(false);
   const { reactToMessage } = useMessageInteractions(messageId);
   const focusedMessageId = useFocusedMessageId();
 
   const closeEmojiPanel = () => {
-    closeContextMenus();
     setShowEmojiPanel(false);
   };
 
@@ -66,7 +66,7 @@ export function SessionEmojiReactBarPopover({
     <>
       <SessionEmojiPanelPopover
         emojiPanelRef={emojiPanelRef}
-        triggerRef={emojiPanelTriggerRef}
+        triggerPos={emojiPanelTriggerPos}
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
         onEmojiClicked={onEmojiClick}
         open={showEmojiPanel}