Fix URL not replaced with link node (fixes #258), beautify text via regex without rendering it, and fix execution order

Fixes #256

.github/ISSUE_TEMPLATE/bug-report.md

@@ -36,7 +36,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Bug occurs on official PairDrop instance https://pairdrop.net/**
 No | Yes
-Version: v1.10.3
+Version: v1.10.6
 
 **Bug occurs on self-hosted PairDrop instance**
 No | Yes
@@ -44,7 +44,7 @@ No | Yes
 **Self-Hosted Setup**
 Proxy: Nginx | Apache2
 Deployment: docker run | docker compose | npm run start:prod
-Version: v1.10.3
+Version: v1.10.6
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/zip-release.yml

@@ -26,12 +26,11 @@ jobs:
       - name: Archive Release
         uses: thedoctor0/zip-release@b57d897cb5d60cb78b51a507f63fa184cfe35554 # v0.7.6
         with:
-          type: 'zip'
           filename: 'pairdrop-cli.zip'
-          path: 'pairdrop-cli'
+          directory: 'pairdrop-cli'
           exclusions: '*.git* /*node_modules/* .editorconfig'
       - name: Upload Release
         uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5 # v1.13.0
         with:
-          artifacts: "pairdrop-cli.zip"
+          artifacts: "pairdrop-cli/pairdrop-cli.zip"
           token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -3,133 +3,127 @@
     <img src="public/images/android-chrome-512x512.png" alt="Logo"  width="150" height="150">
   </a>
  
-  <h1>PairDrop</h1>
+  # _Send it_, with [PairDrop](https://pairdrop.net)
 
   <p>
-    Local file sharing in your browser. Inspired by Apple's AirDrop.
+    Local file sharing <a href="https://pairdrop.net"><strong>in your web browser</strong></a>. 
-    <br />
-    <a href="https://pairdrop.net"><strong>Explore  »</strong></a>
     <br />
     <br />
-    <a href="https://github.com/schlagmichdoch/PairDrop/issues">Report Bug</a>
+    <a href="https://github.com/schlagmichdoch/PairDrop/issues">Report a bug</a>
-    ·
+    <br />
-    <a href="https://github.com/schlagmichdoch/PairDrop/issues">Request Feature</a>
+    <a href="https://github.com/schlagmichdoch/PairDrop/issues">Request feature</a>
   </p>
 </div>
 
 ## Features
-[PairDrop](https://pairdrop.net) is a sublime alternative to AirDrop that works on all platforms.
+File sharing on your local network that works on all platforms.
 
-- File Sharing on your local network
+- A multi-platform AirDrop-like solution that works.
-  - Send images, documents or text via peer to peer connection to devices on the same local network.
+  - Send images, documents or text via peer-to-peer connection to devices on the same local network.
-- Internet Transfers
+- Internet transfers
-  - Join temporary public rooms to transfer files easily over the internet!
+  - Join temporary public rooms to transfer files easily over the Internet.
-- Web-Application 
+- Web-app 
-  - As it is web based, it runs on all devices.
+  - Works on all devices with a modern web-browser.
+ 
+Send a file from your phone to your laptop?
+<br>Share photos in original quality with friends using Android and iOS?
+<br>Share private files peer-to-peer between Linux systems?
 
-You want to quickly send a file from your phone to your laptop?
+<img src="docs/pairdrop_screenshot_mobile.gif" alt="Screenshot GIF showing PairDrop in use" style="width: 300px">
-<br>You want to share photos in original quality with friends that use a mixture of Android and iOS?
-<br>You want to share private files peer to peer between Linux systems?
-<br>AirDrop is unreliable again?
-<br>_Send it with PairDrop!_
 
-Developed based on [Snapdrop](https://github.com/RobinLinus/snapdrop)
+## Differences to the [Snapdrop](https://github.com/RobinLinus/snapdrop) it is based on
+<details><summary>List view</summary>
 
-## Differences to Snapdrop
+### Paired Devices and Public Rooms — Internet Transfer
-<details><summary>Click to expand</summary>
+* Transfer files over the Internet between paired devices or by entering temporary public rooms.
-
+* Connect to devices in complex network environments (public Wi-Fi, company network, iCloud Private Relay, VPN, etc.).
-### Paired Devices and Public Rooms - Internet Transfer
-* Transfer files over the internet between paired devices or by entering temporary public rooms.
-* Connect to devices in complex network environments (public Wi-Fi, company network, Apple Private Relay, VPN etc.).
 * Connect to devices on your mobile hotspot.
-* Devices outside your local network that are behind a NAT are connected automatically via the PairDrop TURN server.
+* Devices outside of your local network that are behind a NAT are auto-connected via the PairDrop TURN server.
 * Connect to devices on your mobile hotspot.
-* You will always discover devices on your local network. Paired devices and devices in the same public room are shown additionally.
+* Devices from the local network, in the same public room, or previously paired are shown.
 
 #### Persistent Device Pairing
-* Pair your devices via a 6-digit code or a QR-Code.
+
-* Paired devices will always find each other via shared secrets independently of their local network. 
+Always connect to known devices
-* Paired devices are persistent. You find your devices even after reopening PairDrop.
+
-* You can edit and unpair devices easily
+* Pair devices via a 6-digit code or a QR-Code.
-* Ideal to always connect easily to your own devices
+* Paired devices always find each other via shared secrets independently of their local network. 
+* Pairing is persistent. You find your devices even after reopening PairDrop.
+* You can edit and unpair devices easily.
 
 #### Temporary Public Rooms
-* Enter a public room via a 5-letter code or a QR-Code.
-* Enter a public room to temporarily connect to devices outside your local network.
-* All devices in the same public room see each other mutually.
-* Public rooms are temporary. Public rooms are left as soon as PairDrop is closed.
-* Ideal to connect easily to others in complex network situations or over the internet.
 
-### [Improved UI for sending/receiving files](https://github.com/RobinLinus/snapdrop/issues/560)
+Connect to others in complex network situations, or over the Internet.
-* Files are transferred only after a request is accepted first. On transfer completion files are downloaded automatically if possible.
+
+* Enter a public room via a 5-letter code or a QR-code.
+* Enter a public room to temporarily connect to devices outside your local network.
+* All devices in the same public room see each other.
+* Public rooms are temporary. Closing PairDrop  leaves all rooms.
+
+### [Improved UI for Sending/Receiving Files](https://github.com/RobinLinus/snapdrop/issues/560)
+* Files are transferred after a request is accepted. Files are auto-downloaded upon completing a transfer, if possible.
 * Multiple files are downloaded as a ZIP file
-* On iOS and Android, in addition to downloading, files can be shared or saved to the gallery via the Share menu.
+* Download, share or save to gallery via the "Share" menu on Android and iOS.
-* Multiple files are transferred at once with an overall progress indicator
+* Multiple files are transferred at once with an overall progress indicator.
 
 ### Send Files or Text Directly From Share Menu, Context Menu or CLI
-* [Send files directly from context menu on Windows](docs/how-to.md#send-multiple-files-and-directories-directly-from-context-menu-on-windows)
+* [Send files directly from context menu on Ubuntu (using Nautilus)](docs/how-to.md#send-multiple-files-and-directories-directly-from-context-menu-on-ubuntu-using-nautilus)
-* [Send files directly from context menu on Ubuntu (using Nautilus)](/docs/how-to.md#send-multiple-files-and-directories-directly-from-context-menu-on-ubuntu-using-nautilus)
+* [Send files directly from the context menu on Windows](docs/how-to.md#send-files-directly-from-context-menu-on-windows)
-* [Send files directly from share menu on iOS](docs/how-to.md#send-directly-from-share-menu-on-ios)
+* [Send directly from the "Share" menu on iOS](docs/how-to.md#send-directly-from-share-menu-on-ios)
-* [Send files directly from share menu on Android](docs/how-to.md#send-directly-from-share-menu-on-android)
+* [Send directly from the "Share" menu on Android](docs/how-to.md#send-directly-from-share-menu-on-android)
-* [Send files directly via command-line interface](docs/how-to.md#send-directly-via-command-line-interface)
+* [Send directly via the command-line interface](docs/how-to.md#send-directly-via-command-line-interface)
 
-### Other changes
+### Other Changes
-* Change your display name permanently to easily differentiate your devices
+* Change your display name to easily differentiate your devices.
-* [Paste files/text and choose the recipient afterwords ](https://github.com/RobinLinus/snapdrop/pull/534)
+* [Paste files/text and choose the recipient afterwards ](https://github.com/RobinLinus/snapdrop/pull/534)
 * [Prevent devices from sleeping on file transfer](https://github.com/RobinLinus/snapdrop/pull/413)
 * Warn user before PairDrop is closed on file transfer
 * Open PairDrop on multiple tabs simultaneously (Thanks [@willstott101](https://github.com/willstott101))
-* [Video and Audio preview](https://github.com/RobinLinus/snapdrop/pull/455) (Thanks [@victorwads](https://github.com/victorwads))
+* [Video and audio preview](https://github.com/RobinLinus/snapdrop/pull/455) (Thanks [@victorwads](https://github.com/victorwads))
-* Switch theme back to auto/system after darkmode or lightmode is enabled
+* Switch theme back to auto/system after dark or light mode is on
 * Node-only implementation (Thanks [@Bellisario](https://github.com/Bellisario))
-* Automatic restart on error (Thanks [@KaKi87](https://github.com/KaKi87))
+* Auto-restart on error (Thanks [@KaKi87](https://github.com/KaKi87))
 * Lots of stability fixes (Thanks [@MWY001](https://github.com/MWY001) [@skiby7](https://github.com/skiby7) and [@willstott101](https://github.com/willstott101))
 * To host PairDrop on your local network (e.g. on Raspberry Pi): [All peers connected with private IPs are discoverable by each other](https://github.com/RobinLinus/snapdrop/pull/558)
-* When hosting PairDrop yourself you can [set your own STUN/TURN servers](docs/host-your-own.md#specify-stunturn-servers)
+* When hosting PairDrop yourself, you can [set your own STUN/TURN servers](docs/host-your-own.md#specify-stunturn-servers)
-* Built-in translations via [Weblate](https://hosted.weblate.org/engage/pairdrop/)
+* Translations.
-* Airy design (Thanks [@Avieshek](https://linktr.ee/avieshek/))
 
 </details>
 
-## Screenshots
+## Translate PairDrop on [Hosted Weblate](https://hosted.weblate.org/engage/pairdrop/)
-<img src="docs/pairdrop_screenshot_mobile.gif" alt="Gif of Screenshots that show PairDrop in use" style="width: 300px">
-
-## PairDrop is built with the following awesome technologies:
-* Vanilla HTML5 / ES6 / CSS3 frontend
-* [WebRTC](http://webrtc.org/) / [WebSockets](http://www.websocket.org/)
-* [NodeJS](https://nodejs.org/en/) backend
-* [Progressive Web App](https://wikipedia.org/wiki/Progressive_Web_App)
-* [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API)
-* [Weblate](https://weblate.org/) Web based localization tool
-* [zip.js](https://github.com/gildas-lormeau/zip.js) JavaScript library to zip and unzip files ([BSD 3-Clause License](licenses/BSD_3-Clause-zip-js))
-* [NoSleep](https://github.com/richtr/NoSleep.js) JavaScript library to prevent display sleep and enable wake lock in any Android or iOS web browser ([MIT License](licenses/MIT-NoSleep))
-* [heic2any](https://github.com/alexcorvi/heic2any) JavaScript library to convert HEIC/HEIF images to PNG/GIF/JPEG ([MIT License](licenses/MIT-heic2any))
-* [cyrb53](https://github.com/bryc) Super fast hash function
-
-Have any questions? Read our [FAQ](docs/faq.md).
-
-You can [host your own instance with Docker](docs/host-your-own.md).
-
-
-## Support PairDrop
-<a href="https://www.buymeacoffee.com/pairdrop" target="_blank">
-<img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" >
-</a>
-
-PairDrop is free and always will be.
-Still, we have to pay for the domain and the server.
-
-To contribute and support, please use BuyMeACoffee via the button above.
-
-Thanks a lot for supporting free and open software!
-
-## Translate PairDrop
 <a href="https://hosted.weblate.org/engage/pairdrop/">
-<img src="https://hosted.weblate.org/widget/pairdrop/pairdrop-spa/open-graph.png" alt="Translation status" style="width: 300px" />
+<img src="https://hosted.weblate.org/widget/pairdrop/horizontal-blue.svg" alt="Translation status" style="width: 300px" />
 </a>
 
-## How to contribute
+## Built with the following awesome technologies:
+* Vanilla HTML5 / JS ES6 / CSS 3 frontend
+* [WebRTC](http://webrtc.org/) / WebSockets
+* [Node.js](https://nodejs.org/en/) backend
+* [Progressive web app (PWA)](https://en.wikipedia.org/wiki/Progressive_web_app) unified functionality
+* [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) storage handling
+* [zip.js](https://gildas-lormeau.github.io/zip.js/) library
+* [cyrb53](https://github.com/bryc/code/blob/master/jshash/experimental/cyrb53.js) super-fast hash function
+* [NoSleep](https://github.com/richtr/NoSleep.js) display sleep, add wake lock ([MIT](licenses/MIT-NoSleep))
+* [heic2any](https://github.com/alexcorvi/heic2any) HEIC/HEIF to PNG/GIF/JPEG ([MIT](licenses/MIT-heic2any))
+* [Weblate](https://weblate.org/) web-based localization tool
 
+[FAQ](docs/faq.md)
+
+[Host your own instance with Docker or Node.js](docs/host-your-own.md).
+
+## Support
+<a href="https://www.buymeacoffee.com/pairdrop" target="_blank">
+<img src="https://cdn.buymeacoffee.com/buttons/v2/default-blue.png" alt="Buy me a coffee" style="height: 60px !important;width: 217px !important;" >
+</a>
+<br />
+<br />
+
+PairDrop is libre, and always will be. \
+I footed the bill for the domain and the server, and you can help create great softeare by supporting me. \
+Please use BuyMeACoffee via the button above. \
+Thanks a lot for supporting copylefted libre software!
+
+## Contributing
 Feel free to [open an issue](https://github.com/schlagmichdoch/pairdrop/issues/new/choose) or a
-[pull request](https://github.com/schlagmichdoch/pairdrop/pulls) but follow
+[pull request](https://github.com/schlagmichdoch/pairdrop/pulls), following the
 [Contributing Guidelines](CONTRIBUTING.md).

docs/how-to.md

@@ -24,7 +24,7 @@ This opens PairDrop in the default browser where you can choose the receiver.
 ```bash
 pairdrop -h
 ```
-```bash
+```
 Send files or text with PairDrop via command-line interface.
 Current domain: https://pairdrop-dev.onrender.com/
 
@@ -35,44 +35,61 @@ Send text:		pairdrop -t "text"
 Specify domain:		pairdrop -d "https://pairdrop.net/"
 Show this help text:	pairdrop (-h|--help)
 
-This pairdrop-cli version was released alongside v1.10.0
+This pairdrop-cli version was released alongside v1.10.4
 ```
 
 <br>
 
 ### Setup
-Download the bash file: [pairdrop-cli/pairdrop](/pairdrop-cli/pairdrop).
 
-#### Linux
+#### Linux / Mac
 1. Download the latest _pairdrop-cli.zip_ from the [releases page](https://github.com/schlagmichdoch/PairDrop/releases)
-2. Unzip the archive to a folder of your choice e.g. `/usr/local/bin/pairdrop-cli/`
+   ```shell
-3. Make sure the bash file `/usr/local/bin/pairdrop-cli/pairdrop` is executable. Otherwise, use `chmod +x pairdrop`
+   wget "https://github.com/schlagmichdoch/PairDrop/releases/download/v1.10.6/pairdrop-cli.zip"
-4. Add absolute path of the folder to PATH variable to make `pairdrop` available globally by executing
+   ```
-   `export PATH=$PATH:/usr/local/bin/pairdrop-cli/`
+   or
-
+   ```shell
-<br>
+   curl -LO "https://github.com/schlagmichdoch/PairDrop/releases/download/v1.10.6/pairdrop-cli.zip"
-
+   ```
-#### Mac
+2. Unzip the archive to a folder of your choice e.g. `/usr/share/pairdrop-cli/`
-1. add bash file to `/usr/local/bin`
+   ```shell
+   sudo unzip pairdrop-cli.zip -d /usr/share/pairdrop-cli/
+   ```
+3. Copy the file _.pairdrop-cli-config.example_ to _.pairdrop-cli-config_
+   ```shell
+   sudo cp /usr/share/pairdrop-cli/.pairdrop-cli-config.example /usr/share/pairdrop-cli/.pairdrop-cli-config
+   ```
+4. Make the bash file _pairdrop_ executable
+   ```shell
+   sudo chmod +x /usr/share/pairdrop-cli/pairdrop
+   ```
+5. Add a symlink to /usr/local/bin/ to include _pairdrop_ to _PATH_
+   ```shell
+   sudo ln -s /usr/share/pairdrop-cli/pairdrop /usr/local/bin/pairdrop
+   ```
 
 <br>
 
 #### Windows
 1. Download the latest _pairdrop-cli.zip_ from the [releases page](https://github.com/schlagmichdoch/PairDrop/releases)
 2. Put file in a preferred folder e.g. `C:\Program Files\pairdrop-cli`
-3. Search for and open `Edit environment variables for your account`
+3. Inside this folder, copy the file _.pairdrop-cli-config.example_ to _.pairdrop-cli-config_
-4. Click `Environment Variables…`
+4. Search for and open `Edit environment variables for your account`
-5. Under *System Variables* select `Path` and click *Edit...*
+5. Click `Environment Variables…`
-6. Click *New*, insert the preferred folder (`C:\Program Files\pairdrop-cli`), click *OK* until all windows are closed
+6. Under _System Variables_ select `Path` and click _Edit..._
-7. Reopen Command prompt window
+7. Click _New_, insert the preferred folder (`C:\Program Files\pairdrop-cli`), click *OK* until all windows are closed
+8. Reopen Command prompt window
 
-<br>
+**Requirements**
 
-### Requirements
 As Windows cannot execute bash scripts natively, you need to install [Git Bash](https://gitforwindows.org/).
-Then, you can also use pairdrop-cli from the default Windows Command Prompt \
+
-by using the shell file instead of the bash file: `pairdrop.sh -h` which then itself executes \
+Then, you can also use pairdrop-cli from the default Windows Command Prompt 
-pairdrop-cli (the bash file) via the Git Bash.
+by using the shell file instead of the bash file which then itself executes 
+_pairdrop-cli_ (the bash file) via the Git Bash.
+```shell
+pairdrop.sh -h
+```
 
 <br>
 
@@ -82,14 +99,15 @@ pairdrop-cli (the bash file) via the Git Bash.
 It is possible to send multiple files with PairDrop via the context menu by adding pairdrop-cli to Windows `Send to` menu:
 1. Download the latest _pairdrop-cli.zip_ from the [releases page](https://github.com/schlagmichdoch/PairDrop/releases)
 2. Unzip the archive to a folder of your choice e.g. `C:\Program Files\pairdrop-cli\`
-3. Copy the shortcut _send with PairDrop.lnk_
+3. Inside this folder, copy the file _.pairdrop-cli-config.example_ to _.pairdrop-cli-config_
-4. Hit Windows Key+R, type: `shell:sendto` and hit Enter.
+4. Copy the shortcut _send with PairDrop.lnk_
-5. Paste the copied shortcut into the directory
+5. Hit Windows Key+R, type: `shell:sendto` and hit Enter.
-6. Open the properties window of the shortcut and edit the link field to point to _send-with-pairdrop.ps1_ located in the folder you used in step 2: \
+6. Paste the copied shortcut into the directory
+7. Open the properties window of the shortcut and edit the link field to point to _send-with-pairdrop.ps1_ located in the folder you used in step 2: \
    `"C:\Program Files\PowerShell\7\pwsh.exe" -File "C:\Program Files\pairdrop-cli\send-with-pairdrop.ps1"`
-7. You are done! You can now send multiple files and directories directly via PairDrop:
+8. You are done! You can now send multiple files and directories directly via PairDrop:
 
-> _context menu > Send to > PairDrop_
+   _context menu_ > _Send to_ > _PairDrop_
 
 ##### Requirements
 As Windows cannot execute bash scripts natively, you need to install [Git Bash](https://gitforwindows.org/).
@@ -100,14 +118,18 @@ As Windows cannot execute bash scripts natively, you need to install [Git Bash](
 
 ### Registering to open files with PairDrop
 It is possible to send multiple files with PairDrop via the context menu by adding pairdrop-cli to Nautilus `Scripts` menu:
-1. Download the latest _pairdrop-cli.zip_ from the [releases page](https://github.com/schlagmichdoch/PairDrop/releases)
+1. Register _pairdrop_ as executable via [guide above](#linux).
-2. Unzip the archive to a folder of your choice e.g. `/usr/local/bin/pairdrop-cli/`
+2. Copy the shell file _send-with-pairdrop_ to `~/.local/share/nautilus/scripts/` to include it in the context menu
-3. Copy the shell file _send-with-pairdrop.sh_ to `/home/<user>/.local/share/nautilus/scripts/`
+   ```shell
-4. Edit the shell file and edit the variable `pathToPairDropCli` to point to the pairdrop-cli executable from step 2 (e.g. `/usr/local/bin/pairdrop-cli/pairdrop`) 
+   cp /usr/share/pairdrop-cli/send-with-pairdrop ~/.local/share/nautilus/scripts/
-5. Make sure the shell file `/home/<user>/.local/share/nautilus/scripts/send-with-pairdrop.sh` is executable. Otherwise, use `chmod +x send-with-pairdrop.sh`
+   ```
-6. You are done! You can now send multiple files and directories directly via PairDrop:
+3. Make the shell file _send-with-pairdrop_ executable
+   ```shell
+   chmod +x ~/.local/share/nautilus/scripts/send-with-pairdrop
+   ```
+4. You are done! You can now send multiple files and directories directly via PairDrop:
 
-> _context menu > Scripts > send-with-pairdrop.sh_
+   _context menu_ > _Scripts_ > _send-with-pairdrop_
 
 <br>
 
@@ -115,6 +137,6 @@ It is possible to send multiple files with PairDrop via the context menu by addi
 The [File Handling API](https://learn.microsoft.com/en-us/microsoft-edge/progressive-web-apps-chromium/how-to/handle-files)
 was implemented, but it was removed as default file associations were overwritten ([#17](https://github.com/schlagmichdoch/PairDrop/issues/17),
 [#116](https://github.com/schlagmichdoch/PairDrop/issues/116) [#190](https://github.com/schlagmichdoch/PairDrop/issues/190))
-and it only worked with explicitly specified file types and not with directories at all.
+and it only worked with explicitly specified file types and couldn't handle directories at all.
 
 [< Back](/README.md)

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pairdrop",
-  "version": "1.10.3",
+  "version": "1.10.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "pairdrop",
-      "version": "1.10.3",
+      "version": "1.10.6",
       "license": "ISC",
       "dependencies": {
         "express": "^4.18.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pairdrop",
-  "version": "1.10.3",
+  "version": "1.10.6",
   "type": "module",
   "description": "",
   "main": "server/index.js",

pairdrop-cli/.pairdrop-cli-config.example

@@ -0,0 +1 @@
+DOMAIN=https://pairdrop.net/

pairdrop-cli/pairdrop

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
 
+# PairDrop version when this file was last changed
+version="v1.10.4"
+
 ############################################################
 # Help                                                     #
 ############################################################
@@ -17,7 +20,7 @@ help()
    echo -e "Specify domain:\t\t$(basename "$0") -d \"https://pairdrop.net/\""
    echo -e "Show this help text:\t$(basename "$0") (-h|--help)"
    echo
-   echo "This pairdrop-cli version was released alongside v1.10.0"
+   echo "This pairdrop-cli version was released alongside ${version}"
 }
 
 openPairDrop()
@@ -337,12 +340,15 @@ popd  > '/dev/null';
 
 config_path="${script_path}/.pairdrop-cli-config"
 
+# If config file does not exist, try to create it. If it fails log error message and exit
 [ ! -f "$config_path" ] &&
   specifyDomain "https://pairdrop.net/" &&
   [ ! -f "$config_path" ] &&
-  echo "Could not create config file. Add 'DOMAIN=https://pairdrop.net/' to a file called .pairdrop-cli-config in the same file as this 'pairdrop' bash file"
+  echo "Could not create config file. Add 'DOMAIN=https://pairdrop.net/' to a file called .pairdrop-cli-config in the same file as this 'pairdrop' bash file (${script_path})" &&
+  exit
 
-[ ! -f "$config_path" ] || export "$(grep -v '^#' "$config_path" | xargs)"
+# Read config variables
+export "$(grep -v '^#' "$config_path" | xargs)"
 
 setOs
 

pairdrop-cli/send-with-pairdrop

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# edit this to point to the pairdrop-cli executable
-pathToPairDropCli="/usr/local/bin/pairdrop-cli/pairdrop"
-
 # Initialize an array
 lines=()
 
@@ -17,4 +14,4 @@ length=${#lines[@]}
 # Remove the last entry
 unset 'lines[length-1]'
 
-$pathToPairDropCli "${lines[@]}"
+pairdrop "${lines[@]}"

public/index.html

@@ -139,7 +139,7 @@
                 <div class="edit-btn btn btn-small btn-rounded btn-dark text-white" data-i18n-key="header.edit-share-mode" data-i18n-attrs="text" hidden></div>
             </div>
         </div>
-        <div id="websocket-fallback" hidden>
+        <div id="websocket-fallback" class="text-center" hidden>
             <span data-i18n-key="footer.traffic" data-i18n-attrs="text"></span>
             <span data-i18n-key="footer.routed" data-i18n-attrs="text"></span>
             <span data-i18n-key="footer.webrtc" data-i18n-attrs="text"></span>
@@ -582,7 +582,7 @@
             </svg>
             <div class="title-wrapper" dir="ltr">
                 <h1>PairDrop</h1>
-                <div class="font-subheading">v1.10.3</div>
+                <div class="font-subheading">v1.10.6</div>
             </div>
             <div class="font-subheading" data-i18n-key="about.claim" data-i18n-attrs="text"></div>
             <div class="row">

public/lang/ar.json

@@ -66,7 +66,8 @@
         "language-selector_title": "إختر اللغة",
         "about_title": "حول PairDrop",
         "about_aria-label": "افتح حول PairDrop",
-        "theme-light_title": "إستخدم دائماً المظهر الفاتح"
+        "theme-light_title": "إستخدم دائماً المظهر الفاتح",
+        "edit-share-mode": "ت٧ارف"
     },
     "instructions": {
         "x-instructions_mobile": "انقر لإرسال الملفات أو انقر لفترة طويلة لإرسال رسالة",

public/lang/de.json

@@ -152,7 +152,7 @@
         "x-instructions_desktop": "Klicke, um Dateien zu senden oder benutze einen Rechtsklick, um eine Nachricht zu senden",
         "no-peers-title": "Öffne PairDrop auf anderen Geräten, um Dateien zu senden",
         "no-peers_data-drop-bg": "Hier ablegen, um Empfänger auszuwählen",
-        "no-peers-subtitle": "Kopple Geräte oder betrete einen öffentlichen Raum, um in anderen Netzwerken sichtbar zu sein",
+        "no-peers-subtitle": "Kopple Geräte oder betritt einen öffentlichen Raum, um in anderen Netzwerken sichtbar zu sein",
         "x-instructions-share-mode_desktop": "Klicke zum Senden von {{descriptor}}",
         "x-instructions-share-mode_mobile": "Tippe zum Senden von {{descriptor}}",
         "x-instructions_data-drop-peer": "Hier ablegen, um an Peer zu senden",

public/lang/id.json

@@ -58,7 +58,7 @@
         "room-url-copied-to-clipboard": "Tautan ke ruang publik disalin ke papan klip"
     },
     "header": {
-        "cancel-share-mode": "Selesai",
+        "cancel-share-mode": "Batalkan",
         "theme-auto_title": "Sesuaikan tema dengan sistem",
         "install_title": "Instal PairDrop",
         "theme-dark_title": "Selalu gunakan tema gelap",
@@ -69,7 +69,9 @@
         "language-selector_title": "Atur Bahasa",
         "about_title": "Tentang PairDrop",
         "about_aria-label": "Buka Tentang PairDrop",
-        "theme-light_title": "Selalu gunakan tema terang"
+        "theme-light_title": "Selalu gunakan tema terang",
+        "edit-share-mode": "Sunting",
+        "expand_title": "Perluas baris tombol header"
     },
     "instructions": {
         "x-instructions_mobile": "Ketuk untuk mengirim file atau ketuk lama untuk mengirim pesan",
@@ -83,7 +85,11 @@
         "no-peers-title": "Buka PairDrop di perangkat lain untuk berkirim file",
         "x-instructions_data-drop-peer": "Lepaskan untuk mengirim ke rekan",
         "x-instructions_data-drop-bg": "Lepaskan untuk memilih penerima",
-        "no-peers_data-drop-bg": "Lepaskan untuk memilih penerima"
+        "no-peers_data-drop-bg": "Lepaskan untuk memilih penerima",
+        "activate-share-mode-and-other-file": "dan 1 file lainnya",
+        "activate-share-mode-shared-file": "file yang dibagikan",
+        "activate-share-mode-shared-files-plural": "{{count}} file yang dibagikan",
+        "webrtc-requirement": "Untuk menggunakan instance PairDrop ini, WebRTC harus diaktifkan!"
     },
     "peer-ui": {
         "processing": "Memproses…",
@@ -111,7 +117,7 @@
         "join": "Gabung",
         "title-image-plural": "Gambar",
         "send": "Kirim",
-        "base64-tap-to-paste": "Ketuk di sini untuk menempelkan {{type}}",
+        "base64-tap-to-paste": "Ketuk di sini untuk membagikan{{type}}",
         "base64-text": "teks",
         "copy": "Salin",
         "file-other-description-image": "dan 1 gambar lainnya",
@@ -125,7 +131,7 @@
         "title-image": "Gambar",
         "file-other-description-file-plural": "dan {{count}} file lainnya",
         "would-like-to-share": "ingin berbagi",
-        "send-message-to": "Kirim pesan ke",
+        "send-message-to": "Ke:",
         "language-selector-title": "Pilih Bahasa",
         "pair": "Pasangkan",
         "hr-or": "ATAU",
@@ -144,7 +150,11 @@
         "enter-room-id-from-another-device": "Masukkan room ID dari perangkat lain untuk bergabung dengan room.",
         "message_title": "Masukkan pesan untuk dikirim",
         "pair-devices-qr-code_title": "Klik untuk menyalin tautan untuk memasangkan perangkat ini",
-        "public-room-qr-code_title": "Klik untuk menyalin tautan ke ruang publik"
+        "public-room-qr-code_title": "Klik untuk menyalin tautan ke ruang publik",
+        "base64-title-files": "Bagikan File",
+        "base64-title-text": "Bagikan Teks",
+        "message_placeholder": "Teks",
+        "paired-device-removed": "Perangkat yang dipasangkan telah dihapus."
     },
     "about": {
         "claim": "Cara termudah untuk mentransfer file lintas perangkat",

public/lang/it.json

@@ -40,7 +40,8 @@
         "no-peers-title": "Apri PairDrop su altri dispositivi per inviare files",
         "x-instructions_data-drop-peer": "Rilascia per inviare al peer",
         "x-instructions_data-drop-bg": "Rilascia per selezionare il destinatario",
-        "no-peers_data-drop-bg": "Rilascia per selezionare il destinatario"
+        "no-peers_data-drop-bg": "Rilascia per selezionare il destinatario",
+        "webrtc-requirement": "Per usare questa istanza di PairDrop, devi attivare WebRTC!"
     },
     "dialogs": {
         "auto-accept-instructions-2": "per accettare automaticamente tutti i files inviati da quel dispositivo.",

public/lang/ja.json

@@ -69,7 +69,9 @@
         "language-selector_title": "言語を設定",
         "about_title": "PairDropについて",
         "about_aria-label": "PairDropについてを開く",
-        "theme-light_title": "常にライトテーマを使用する"
+        "theme-light_title": "常にライトテーマを使用する",
+        "edit-share-mode": "編集",
+        "expand_title": "ヘッダーボタン列を拡大する"
     },
     "instructions": {
         "x-instructions_mobile": "タップしてファイルを送信または長押ししてメッセージを送信します",
@@ -83,7 +85,11 @@
         "no-peers-title": "他のデバイスでPairDropを開いてファイルを送信します",
         "x-instructions_data-drop-peer": "離すとこの相手に送信します",
         "x-instructions_data-drop-bg": "送信したい相手の上で離してください",
-        "no-peers_data-drop-bg": "送信したい相手の上で離してください"
+        "no-peers_data-drop-bg": "送信したい相手の上で離してください",
+        "activate-share-mode-and-other-file": "もう1つの別のファイル",
+        "activate-share-mode-shared-file": "共有されたファイル",
+        "activate-share-mode-shared-files-plural": "{{count}}個の共有されたファイル",
+        "webrtc-requirement": "このPairDropインスタンスを使用するには、WebRTCを有効にする必要があります！"
     },
     "peer-ui": {
         "processing": "処理中…",
@@ -144,7 +150,16 @@
         "enter-room-id-from-another-device": "他のデバイスに表示された参加したいルームのIDを入力します。",
         "message_title": "送信するメッセージを挿入",
         "pair-devices-qr-code_title": "クリックしてこのデバイスをペア設定するリンクをコピー",
-        "public-room-qr-code_title": "クリックしてパブリックルームへのリンクをコピー"
+        "public-room-qr-code_title": "クリックしてパブリックルームへのリンクをコピー",
+        "paired-device-removed": "ペア設定されたデバイスが削除されました。",
+        "message_placeholder": "テキスト",
+        "base64-title-files": "共有されたファイル",
+        "base64-title-text": "テキストを共有",
+        "approve": "承諾",
+        "share-text-subtitle": "送信する前にメッセージを編集する:",
+        "share-text-checkbox": "テキストを共有するときに常にこのダイアログを表示する",
+        "close-toast_title": "通知を閉じる",
+        "share-text-title": "テキストメッセージを共有します"
     },
     "about": {
         "claim": "デバイス間でファイルを転送する最も簡単な方法",
@@ -152,7 +167,11 @@
         "close-about_aria-label": "PairDropについてを閉じる",
         "buy-me-a-coffee_title": "コーヒーをおごってください！",
         "github_title": "GitHubでPairDropを見る",
-        "faq_title": "FAQ"
+        "faq_title": "FAQ",
+        "mastodon_title": "MastodonにPairDropについて書く",
+        "bluesky_title": "BlueSkyでフォロー",
+        "custom_title": "フォロー",
+        "privacypolicy_title": "プライバシーポリシーを開く"
     },
     "document-titles": {
         "file-transfer-requested": "ファイルの転送がリクエストされました",

public/lang/kn.json

@@ -13,7 +13,8 @@
         "about_aria-label": "PairDrop ಕುರಿತು ಪುಟವನ್ನು ತೆರೆಯಿರಿ",
         "theme-light_title": "ಯಾವಾಗಲೂ ಲೈಟ್ ಥೀಮ್ ಅನ್ನು ಬಳಸಿ",
         "edit-share-mode": "ಎಡಿಟ್ ಮಾಡಿ",
-        "cancel-share-mode": "ರದ್ದುಗೊಳಿಸಿ"
+        "cancel-share-mode": "ರದ್ದುಗೊಳಿಸಿ",
+        "expand_title": "ಹೆಡರ್ ಬಟನ್ ಸಾಲನ್ನು ವಿಸ್ತರಿಸಿ"
     },
     "dialogs": {
         "message_placeholder": "ಪಠ್ಯ",
@@ -173,7 +174,11 @@
         "close-about_aria-label": "PairDrop ಕುರಿತು ಪುಟವನ್ನು ಮುಚ್ಚಿ",
         "buy-me-a-coffee_title": "ನನಗೆ ಕಾಫಿ ಖರೀದಿಸಿ!",
         "github_title": "GitHub ನಲ್ಲಿ PairDrop",
-        "faq_title": "ಪದೇ ಪದೇ ಕೇಳಲಾಗುವ ಪ್ರಶ್ನೆಗಳು"
+        "faq_title": "ಪದೇ ಪದೇ ಕೇಳಲಾಗುವ ಪ್ರಶ್ನೆಗಳು",
+        "bluesky_title": "BlueSky ನಲ್ಲಿ ನಮ್ಮನ್ನು ಅನುಸರಿಸಿ",
+        "privacypolicy_title": "ನಮ್ಮ ಗೌಪ್ಯತೆ ನೀತಿ ತೆರೆಯಿರಿ",
+        "mastodon_title": "Mastodon ನಲ್ಲಿ PairDrop ಕುರಿತು ಬರೆಯಿರಿ",
+        "custom_title": "ನಮ್ಮನ್ನು ಅನುಸರಿಸಿ"
     },
     "document-titles": {
         "file-transfer-requested": "ಫೈಲ್ ವರ್ಗಾವಣೆಗೆ ವಿನಂತಿಸಲಾಗಿದೆ",

public/lang/ro.json

@@ -58,7 +58,7 @@
         "room-url-copied-to-clipboard": "Link către sala publică copiat în clipboard"
     },
     "header": {
-        "cancel-share-mode": "Gata",
+        "cancel-share-mode": "Anulare",
         "theme-auto_title": "Adaptează tema la sistem",
         "install_title": "Instalează PairDrop",
         "theme-dark_title": "Utilizați mereu tema întunecoasă",
@@ -69,13 +69,15 @@
         "language-selector_title": "Setează Limba",
         "about_title": "Despre PairDrop",
         "about_aria-label": "Deschide Despre PairDrop",
-        "theme-light_title": "Utilizați mereu tema luminoasă"
+        "theme-light_title": "Utilizați mereu tema luminoasă",
+        "expand_title": "Extindeți rândul de butoane antet",
+        "edit-share-mode": "Editați"
     },
     "instructions": {
         "x-instructions_mobile": "Atingeți pentru a trimite fișiere sau atingeți lung pentru a trimite un mesaj",
-        "x-instructions-share-mode_desktop": "Clic pentru a trimite",
+        "x-instructions-share-mode_desktop": "Faceți clic pentru a trimite {{descriptor}}",
         "activate-share-mode-and-other-files-plural": "și {{count}} alte fișiere",
-        "x-instructions-share-mode_mobile": "Atinge pentru a trimite",
+        "x-instructions-share-mode_mobile": "Atingeți pentru a trimite {{descriptor}}",
         "activate-share-mode-base": "Deschideți PairDrop pe alte dispozitive pentru a trimite",
         "no-peers-subtitle": "Împerecheați dispozitive sau intrați într-o cameră publică pentru a fi descoperit în alte rețele",
         "activate-share-mode-shared-text": "text partajat",
@@ -83,7 +85,11 @@
         "no-peers-title": "Deschideți PairDrop pe alte dispozitive pentru a trimite fișiere",
         "x-instructions_data-drop-peer": "Eliberare pentru a trimite la peer",
         "x-instructions_data-drop-bg": "Eliberați pentru a selecta recipientul",
-        "no-peers_data-drop-bg": "Eliberare pentru a selecta recipientul"
+        "no-peers_data-drop-bg": "Eliberați pentru a selecta destinatarul",
+        "activate-share-mode-shared-files-plural": "{{count}} fișiere partajate",
+        "activate-share-mode-shared-file": "fișier partajat",
+        "activate-share-mode-and-other-file": "și încă 1 fișier",
+        "webrtc-requirement": "Pentru a utiliza această instanță PairDrop, WebRTC trebuie să fie activat!"
     },
     "peer-ui": {
         "processing": "Procesarea…",
@@ -95,7 +101,7 @@
         "transferring": "Transferul…"
     },
     "dialogs": {
-        "base64-paste-to-send": "Lipiți aici pentru a trimite {{type}}",
+        "base64-paste-to-send": "Inserați clipboard aici pentru a distribui {{type}}",
         "auto-accept-instructions-2": "pentru a accepta automat toate fișierele trimise de la dispozitivul respectiv.",
         "receive-text-title": "Mesaj primit",
         "edit-paired-devices-title": "Editați dispozitivele asociate",
@@ -111,7 +117,7 @@
         "join": "Alătură-te",
         "title-image-plural": "Imagini",
         "send": "Trimite",
-        "base64-tap-to-paste": "Atinge aici pentru a lipi {{type}}",
+        "base64-tap-to-paste": "Atingeți aici pentru a distribui {{type}}",
         "base64-text": "text",
         "copy": "Copiază",
         "file-other-description-image": "și 1 altă imagine",
@@ -125,7 +131,7 @@
         "title-image": "Imagine",
         "file-other-description-file-plural": "și {{count}} alte fișiere",
         "would-like-to-share": "ar dori să împărtășească",
-        "send-message-to": "Trimite un mesaj la",
+        "send-message-to": "La:",
         "language-selector-title": "Setați Limba",
         "pair": "Cuplu",
         "hr-or": "SAU",
@@ -144,7 +150,16 @@
         "enter-room-id-from-another-device": "Introdu ID-ul camerei de pe un alt dispozitiv pentru a intra în cameră.",
         "message_title": "Inserați mesajul de trimis",
         "pair-devices-qr-code_title": "Dați clic pentru a copia link-ul pentru a asocia acest dispozitiv",
-        "public-room-qr-code_title": "Dați clic pentru a copia link-ul în sala publică"
+        "public-room-qr-code_title": "Dați clic pentru a copia link-ul în sala publică",
+        "message_placeholder": "Text",
+        "close-toast_title": "Închideți notificarea",
+        "share-text-checkbox": "Afișați întotdeauna acest dialog atunci când partajați text",
+        "base64-title-files": "Distribuie fisiere",
+        "approve": "aprobă",
+        "paired-device-removed": "Dispozitivul asociat a fost eliminat.",
+        "share-text-title": "Partajați un mesaj text",
+        "share-text-subtitle": "Editați mesajul înainte de a-l trimite:",
+        "base64-title-text": "Partajați textul"
     },
     "about": {
         "claim": "Cel mai simplu mod de a transfera fișiere între dispozitive",
@@ -152,7 +167,11 @@
         "close-about_aria-label": "Închide Despre PairDrop",
         "buy-me-a-coffee_title": "Cumpără-mi o cafea!",
         "github_title": "PairDrop pe GitHub",
-        "faq_title": "Întrebări frecvente"
+        "faq_title": "Întrebări frecvente",
+        "bluesky_title": "Urmărește-ne pe BlueSky",
+        "privacypolicy_title": "Deschideți politica noastră de confidențialitate",
+        "mastodon_title": "Scrieți despre PairDrop pe Mastodon",
+        "custom_title": "Urmăriți-ne"
     },
     "document-titles": {
         "file-transfer-requested": "Transfer de fișiere cerut",

public/lang/tr.json

@@ -12,7 +12,8 @@
         "cancel-share-mode": "Bitti",
         "join-public-room_title": "Geçici olarak genel odaya katılın",
         "language-selector_title": "Dili Seç",
-        "edit-share-mode": "Düzenle"
+        "edit-share-mode": "Düzenle",
+        "expand_title": "Başlık düğmesi satırını genişlet"
     },
     "instructions": {
         "no-peers_data-drop-bg": "Alıcıyı seçmek için bırakın",
@@ -166,7 +167,11 @@
         "close-about_aria-label": "PairDrop Hakkında'yı Kapat",
         "buy-me-a-coffee_title": "Bana bir kahve al!",
         "github_title": "GitHub'da PairDrop",
-        "faq_title": "Sıkça sorulan sorular"
+        "faq_title": "Sıkça sorulan sorular",
+        "custom_title": "Bizi takip edin",
+        "privacypolicy_title": "Gizlilik politikamızı açın",
+        "mastodon_title": "Mastodon'da PairDrop hakkında yazın",
+        "bluesky_title": "Bizi BlueSky'da takip edin"
     },
     "document-titles": {
         "file-transfer-requested": "Dosya Transferi Talep Edildi",

public/lang/zh-CN.json

@@ -12,7 +12,8 @@
         "cancel-share-mode": "完成",
         "join-public-room_title": "暂时加入公共房间",
         "language-selector_title": "设置语言",
-        "edit-share-mode": "编辑"
+        "edit-share-mode": "编辑",
+        "expand_title": "展开标题按钮行"
     },
     "instructions": {
         "x-instructions_data-drop-peer": "释放以发送到此设备",
@@ -114,7 +115,11 @@
         "github_title": "PairDrop 在 GitHub 上开源",
         "claim": "最简单的跨设备传输方案",
         "buy-me-a-coffee_title": "帮我买杯咖啡！",
-        "tweet_title": "关于 PairDrop 的推特"
+        "tweet_title": "关于 PairDrop 的推特",
+        "bluesky_title": "在 BlueSky 上关注",
+        "privacypolicy_title": "打开隐私政策",
+        "mastodon_title": "在 Maston 上推广 PairDrop",
+        "custom_title": "关注我们"
     },
     "notifications": {
         "display-name-changed-permanently": "展示的名字已经永久变更",

public/scripts/ui.js

@@ -172,31 +172,34 @@ class PeersUI {
     }
 
     _onDrop(e) {
-        e.preventDefault();
-
         if (this.shareMode.active || Dialog.anyDialogShown()) return;
 
-        if (!$$('x-peer') || !$$('x-peer').contains(e.target)) {
+        e.preventDefault();
-            if (e.dataTransfer.files.length > 0) {
+
-                Events.fire('activate-share-mode', {files: e.dataTransfer.files});
-            } else {
-                for (let i=0; i<e.dataTransfer.items.length; i++) {
-                    if (e.dataTransfer.items[i].type === "text/plain") {
-                        e.dataTransfer.items[i].getAsString(text => {
-                            Events.fire('activate-share-mode', {text: text});
-                        });
-                    }
-                }
-            }
-        }
         this._onDragEnd();
+
+        if ($$('x-peer') || !$$('x-peer').contains(e.target)) return; // dropped on peer
+
+        const files = e.dataTransfer.files;
+        const text = e.dataTransfer.getData("text");
+
+        if (files.length > 0) {
+            Events.fire('activate-share-mode', {
+                files: files
+            });
+        }
+        else if(text.length > 0) {
+            Events.fire('activate-share-mode', {
+                text: text
+            });
+        }
     }
 
     _onDragOver(e) {
-        e.preventDefault();
-
         if (this.shareMode.active || Dialog.anyDialogShown()) return;
 
+        e.preventDefault();
+
         this.$xInstructions.setAttribute('drop-bg', true);
         this.$xNoPeers.setAttribute('drop-bg', true);
     }
@@ -630,29 +633,28 @@ class PeerUI {
     }
 
     _onDrop(e) {
-        e.preventDefault();
-
         if (PeerUI._shareMode.active || Dialog.anyDialogShown()) return;
 
-        if (e.dataTransfer.files.length > 0) {
+        e.preventDefault();
-            Events.fire('files-selected', {
-                files: e.dataTransfer.files,
-                to: this._peer.id
-            });
-        } else {
-            for (let i=0; i<e.dataTransfer.items.length; i++) {
-                if (e.dataTransfer.items[i].type === "text/plain") {
-                    e.dataTransfer.items[i].getAsString(text => {
-                        Events.fire('send-text', {
-                            text: text,
-                            to: this._peer.id
-                        });
-                    });
-                }
-            }
-        }
 
         this._onDragEnd();
+
+        const peerId = this._peer.id;
+        const files = e.dataTransfer.files;
+        const text = e.dataTransfer.getData("text");
+
+        if (files.length > 0) {
+            Events.fire('files-selected', {
+                files: files,
+                to: peerId
+            });
+        }
+        else if (text.length > 0) {
+            Events.fire('send-text', {
+                text: text,
+                to: peerId
+            });
+        }
     }
 
     _onDragOver() {
@@ -1896,6 +1898,8 @@ class SendTextDialog extends Dialog {
         this.$submit = this.$el.querySelector('button[type="submit"]');
         this.$form.addEventListener('submit', e => this._onSubmit(e));
         this.$text.addEventListener('input', _ => this._onInput());
+        this.$text.addEventListener('paste', e => this._onPaste(e));
+        this.$text.addEventListener('drop', e => this._onDrop(e));
 
         Events.on('text-recipient', e => this._onRecipient(e.detail.peerId, e.detail.deviceName));
         Events.on('keydown', e => this._onKeyDown(e));
@@ -1914,6 +1918,40 @@ class SendTextDialog extends Dialog {
         }
     }
 
+    async _onDrop(e) {
+        e.preventDefault()
+
+        const text = e.dataTransfer.getData("text");
+        const selection = window.getSelection();
+
+        if (selection.rangeCount) {
+            selection.deleteFromDocument();
+            selection.getRangeAt(0).insertNode(document.createTextNode(text));
+        }
+
+        this._onInput();
+    }
+
+    async _onPaste(e) {
+        e.preventDefault()
+
+        const text = (e.clipboardData || window.clipboardData).getData('text');
+        const selection = window.getSelection();
+
+        if (selection.rangeCount) {
+            selection.deleteFromDocument();
+            const textNode = document.createTextNode(text);
+            const range = document.createRange();
+            range.setStart(textNode, textNode.length);
+            range.collapse(true);
+            selection.getRangeAt(0).insertNode(textNode);
+            selection.removeAllRanges();
+            selection.addRange(range);
+        }
+
+        this._onInput();
+    }
+
     _textEmpty() {
         return !this.$text.innerText || this.$text.innerText === "\n";
     }
@@ -1997,12 +2035,22 @@ class ReceiveTextDialog extends Dialog {
         window.blop.play();
         this._receiveTextQueue.push({text: text, peerId: peerId});
         this._setDocumentTitleMessages();
+        changeFavicon("images/favicon-96x96-notification.png");
+
         if (this.isShown()) return;
+
         this._dequeueRequests();
     }
 
     _dequeueRequests() {
-        if (!this._receiveTextQueue.length) return;
+        if (!this._receiveTextQueue.length) {
+            this.$text.innerHTML = "";
+            return;
+        }
+
+        this._setDocumentTitleMessages();
+        changeFavicon("images/favicon-96x96-notification.png");
+
         let {text, peerId} = this._receiveTextQueue.shift();
         this._showReceiveTextDialog(text, peerId);
     }
@@ -2013,35 +2061,68 @@ class ReceiveTextDialog extends Dialog {
         this.$displayName.classList.add($(peerId).ui._badgeClassName());
 
         this.$text.innerText = text;
-        this.$text.classList.remove('text-center');
 
-        // Beautify text if text is short
+        // Beautify text if text is not too long
-        if (text.length < 2000) {
+        if (this.$text.innerText.length <= 300000) {
-            // replace URLs with actual links
+            // Hacky workaround to replace URLs with link nodes in all cases
-            this.$text.innerHTML = this.$text.innerHTML
+            // 1. Use text variable, find all valid URLs via regex and replace URLs with placeholder
-                .replace(/(^|(?<=(<br>|\s)))(https?:\/\/|www.)(([a-z]|[A-Z]|[0-9]|[\-_~:\/?#\[\]@!$&'()*+,;=%]){2,}\.)(([a-z]|[A-Z]|[0-9]|[\-_~:\/?#\[\]@!$&'()*+,;=%.]){2,})/g,
+            // 2. Use html variable, find placeholders with regex and replace them with link nodes
-                (url) => {
-                        let link = url;
 
-                        // prefix www.example.com with http protocol to prevent it from being a relative link
+            let $textShadow = document.createElement('div');
-                        if (link.startsWith('www')) {
+            $textShadow.innerText = text;
-                            link = "http://" + link
+
+            let linkNodes = {};
+            let searchHTML = $textShadow.innerHTML;
+            const p = "@";
+            const pRgx = new RegExp(`${p}\\d+`, 'g');
+            let occP = searchHTML.match(pRgx) || [];
+
+            let m = 0;
+
+            const allowedDomainChars = "a-zA-Z0-9áàäčçđéèêŋńñóòôöšŧüžæøåëìíîïðùúýþćěłřśţźǎǐǒǔǥǧǩǯəʒâûœÿãõāēīōūăąĉċďĕėęĝğġģĥħĩĭįıĵķĸĺļľņňŏőŕŗŝşťũŭůűųŵŷżאבגדהוזחטיךכלםמןנסעףפץצקרשתװױײ";
+            const urlRgx = new RegExp(`(^|\\n|\\s|["><\\-_~:\\/?#\\[\\]@!$&'()*+,;=%.])(((https?:\\/\\/)?(?:[${allowedDomainChars}](?:[${allowedDomainChars}-]{0,61}[${allowedDomainChars}])?\\.)+[${allowedDomainChars}][${allowedDomainChars}-]{0,61}[${allowedDomainChars}])(:?\\d*)\\/?([${allowedDomainChars}_\\/\\-#.]*)(\\?([${allowedDomainChars}\\-_~:\\/?#\\[\\]@!$&'()*+,;=%.]*))?)`, 'g');
+
+            $textShadow.innerText = text.replace(urlRgx,
+                (match, whitespaceOrSpecial, url, g3, scheme) => {
+                    let link = url;
+
+                    // prefix www.example.com with http protocol to prevent it from being a relative link
+                    if (!scheme && link.startsWith('www')) {
+                        link = "http://" + link
+                    }
+
+                    if (isUrlValid(link)) {
+                        // link is valid -> replace with link node placeholder
+
+                        // find linkNodePlaceholder that is not yet present in text node
+                        m++;
+                        while (occP.includes(`${p}${m}`)) {
+                            m++;
                         }
+                        let linkNodePlaceholder = `${p}${m}`;
 
-                        return `<a href="${link}" target="_blank">${url}</a>`;
+                        // add linkNodePlaceholder to text node and save a reference to linkNodes object
+                        linkNodes[linkNodePlaceholder] = `<a href="${link}" target="_blank">${url}</a>`;
+                        return `${whitespaceOrSpecial}${linkNodePlaceholder}`;
+                    }
+                    // link is not valid -> do not replace
+                    return match;
+                });
+
+
+            this.$text.innerHTML = $textShadow.innerHTML.replace(pRgx,
+                (m) => {
+                    let urlNode = linkNodes[m];
+                    return urlNode ? urlNode : m;
                 });
         }
 
         this._evaluateOverflowing(this.$text);
-
-        this._setDocumentTitleMessages();
-
-        changeFavicon("images/favicon-96x96-notification.png");
         this.show();
     }
 
     _setDocumentTitleMessages() {
-        document.title = !this._receiveTextQueue.length
+        document.title = this._receiveTextQueue.length <= 1
             ? `${ Localization.getTranslation("document-titles.message-received") } - PairDrop`
             : `${ Localization.getTranslation("document-titles.message-received-plural", null, {count: this._receiveTextQueue.length + 1}) } - PairDrop`;
     }

public/scripts/util.js

@@ -583,4 +583,14 @@ async function decodeBase64Text(base64) {
     if (!base64) throw new Error('Base64 is empty');
 
     return decodeURIComponent(escape(window.atob(base64)))
+}
+
+function isUrlValid(url) {
+    try {
+        let urlObj = new URL(url);
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
 }

public/service-worker.js

@@ -1,4 +1,4 @@
-const cacheVersion = 'v1.10.3';
+const cacheVersion = 'v1.10.6';
 const cacheTitle = `pairdrop-cache-${cacheVersion}`;
 const forceFetch = false; // FOR DEVELOPMENT: Set to true to always update assets instead of using cached versions
 const relativePathsToCache = [
@@ -193,7 +193,7 @@ const evaluateRequestData = function (request) {
 
                     const objectStoreRequest = objectStore.add(fileObjects[i]);
                     objectStoreRequest.onsuccess = _ => {
-                        if (i === fileObjects.length - 1) resolve(pairDropUrl + '?share-target=files');
+                        if (i === fileObjects.length - 1) resolve(pairDropUrl + '?share_target=files');
                     }
                 }
             }
@@ -202,7 +202,7 @@ const evaluateRequestData = function (request) {
             }
         }
         else {
-            let urlArgument = '?share-target=text';
+            let urlArgument = '?share_target=text';
 
             if (title) urlArgument += `&title=${title}`;
             if (text) urlArgument += `&text=${text}`;

public/styles/styles-deferred.css

@@ -12,7 +12,6 @@
     display: block;
     overflow: auto;
     resize: none;
-    line-height: 16px;
     max-height: 350px;
     word-break: break-word;
     word-wrap: anywhere;