Merge branch 'develop' of https://github.com/a1346054/onionshare into a1346054-develop

.github/workflows/codeql-analysis.yml

@@ -47,7 +47,7 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       uses: github/codeql-action/autobuild@v1

CHANGELOG.md

@@ -110,7 +110,7 @@
 ## 1.3
 
 * Major UI redesign, introducing many UX improvements
-* Client-side web interfact redesigned
+* Client-side web interface redesigned
 * New feature: Support for meek_lite pluggable transports (Amazon and Azure) - not yet ready for Windows or macOS, sorry
 * New feature: Support for custom obfs4 and meek_lite bridges (again, meek_lite not available on Windows/macOS yet)
 * New feature: Ability to cancel share before it starts

LICENSE

@@ -6,7 +6,7 @@ Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com>
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -650,7 +650,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -669,11 +669,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

RELEASE.md

@@ -163,7 +163,7 @@ This will create `desktop/macOS/OnionShare.dmg`, signed and notarized.
 
 ## Source package
 
-To make a source package, run `./build-source.sh $TAG`, where `$TAG` is the the name of the signed git tag, e.g. `v2.1`.
+To make a source package, run `./build-source.sh $TAG`, where `$TAG` is the name of the signed git tag, e.g. `v2.1`.
 
 This will create `dist/onionshare-$VERSION.tar.gz`.
 

build-source.sh

@@ -4,7 +4,7 @@
 
 # Usage
 display_usage() {
-	echo "Usage: $0 [tag]"
+  echo "Usage: $0 [tag]"
 }
 
 if [ $# -lt 1 ]
@@ -46,13 +46,13 @@ then
   echo "Tag does not verify"
   exit 1
 fi
-cat ../verify.txt |grep "using RSA key 927F419D7EC82C2F149C1BD1403C2657CD994F73"
+cat ../verify.txt | grep "using RSA key 927F419D7EC82C2F149C1BD1403C2657CD994F73"
 if [ $? -ne 0 ]
 then
   echo "Tag signed with wrong key"
   exit 1
 fi
-cat ../verify.txt |grep "^gpg: Good signature from"
+cat ../verify.txt | grep "^gpg: Good signature from"
 if [ $? -ne 0 ]
 then
   echo "Tag verification missing 'Good signature from'"

cli/onionshare_cli/resources/static/css/style.css

@@ -320,15 +320,15 @@ div#uploads .upload .upload-status {
 }
 
 div#uploads .upload input.cancel {
-	color: #d0011b;
+  color: #d0011b;
   border: 0;
   background: none;
   box-shadow: none;
   border-radius: 0px;
-	cursor: pointer;
+  cursor: pointer;
-	font-family: sans-serif;
+  font-family: sans-serif;
-	font-size: 12px;
+  font-size: 12px;
-	text-decoration: none;
+  text-decoration: none;
   display: inline-block;
   float:right;
 }
@@ -398,4 +398,4 @@ a {
 
 a:visited {
   color: #601ca0;
-}
+}

cli/onionshare_cli/resources/static/js/chat.js

@@ -11,7 +11,7 @@ $(function () {
     // Store current username received from app context
     var current_username = $('#username').val();
 
-    // On browser connect, emit a socket event to be added to 
+    // On browser connect, emit a socket event to be added to
     // room and assigned random username
     socket.on('connect', function () {
       socket.emit('joined', {});
@@ -148,7 +148,7 @@ var getScrollDiffBefore = function () {
 
 var scrollBottomMaybe = function (scrollDiff) {
   // Scrolls to bottom if the user is scrolled at bottom
-  // if the user has scrolled upp, it wont scroll at bottom.
+  // if the user has scrolled up, it won't scroll at bottom.
   // Note: when a user themselves send a message, it will still
   // scroll to the bottom even if they had scrolled up before.
   if (scrollDiff > 0) {

cli/onionshare_cli/resources/templates/403.html

@@ -4,7 +4,7 @@
 <head>
   <title>OnionShare: 403 Forbidden</title>
   <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon" />
   <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
 </head>

cli/onionshare_cli/resources/templates/404.html

@@ -4,7 +4,7 @@
 <head>
   <title>OnionShare: 404 Not Found</title>
   <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
   <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
 </head>

cli/onionshare_cli/resources/templates/405.html

@@ -4,7 +4,7 @@
 <head>
   <title>OnionShare: 405 Method Not Allowed</title>
   <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
   <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
 </head>

cli/onionshare_cli/resources/templates/500.html

@@ -4,7 +4,7 @@
 <head>
   <title>OnionShare: An error occurred</title>
   <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
   <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
 </head>

desktop/README.md

@@ -49,7 +49,7 @@ These instructions include adding folders to the path in Windows. To do this, go
 
 Download Python 3.8.6, 32-bit (x86) from https://www.python.org/downloads/release/python-386/. I downloaded `python-3.8.6.exe`. When installing it, make sure to check the "Add Python 3.8 to PATH" checkbox on the first page of the installer.
 
-Download and install 7-Zip from http://www.7-zip.org/download.html. I downloaded `7z1900.exe`. Add `C:\Program Files (x86)\7-Zip` to your path.
+Download and install 7-Zip from https://7-zip.org/download.html. I downloaded `7z1900.exe`. Add `C:\Program Files (x86)\7-Zip` to your path.
 
 Install python dependencies:
 

desktop/scripts/dev.sh

@@ -2,8 +2,8 @@
 
 # Run OnionShare desktop, allowing you to use command-line arguments
 
-SCRIPTS_DIR="$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
+SCRIPTS_DIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )
-cd $SCRIPTS_DIR
+cd "$SCRIPTS_DIR"
 
 cd ../src
-python -c "import onionshare; onionshare.main()" $@
+python -c "import onionshare; onionshare.main()" $@

desktop/src/onionshare/tab/mode/share_mode/__init__.py

@@ -246,7 +246,7 @@ class ShareMode(Mode):
 
     def start_server_step3_custom(self):
         """
-        Step 3 in starting the server. Remove zip progess bar, and display large filesize
+        Step 3 in starting the server. Remove zip progress bar, and display large filesize
         warning, if applicable.
         """
         # Remove zip progress bar

desktop/tests/gui_base_test.py

@@ -178,7 +178,7 @@ class GuiBaseTest(unittest.TestCase):
         self.assertEqual(tab.get_mode().history.isVisible(), not currently_visible)
 
     def history_indicator(self, tab, indicator_count="1"):
-        """Test that we can make sure the history is toggled off, do an action, and the indiciator works"""
+        """Test that we can make sure the history is toggled off, do an action, and the indicator works"""
         # Make sure history is toggled off
         if tab.get_mode().history.isVisible():
             tab.get_mode().toggle_history.click()

docs/README.md

@@ -27,7 +27,7 @@ You will end up with the documentation in all supported locales in `docs/localiz
 Here's how preparing translations works:
 
 ```sh
-# Generate .po files in build/gettext 
+# Generate .po files in build/gettext
 make gettext
 
 # Create a new blank German locale in source/locale, based on .po files

docs/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=`cat ../cli/onionshare_cli/resources/version.txt`
+VERSION=$(cat ../cli/onionshare_cli/resources/version.txt)
 
 # Supported locales
 LOCALES="en fi pl pt_BR ru tr uk"

docs/source/conf.py

@@ -16,7 +16,7 @@ languages = [
     ("Русский", "ru"),  # Russian
     # ("Español", "es"),  # Spanish
     ("Türkçe", "tr"),  # Turkish
-    ("Українська", "uk"),  # Ukranian
+    ("Українська", "uk"),  # Ukrainian
 ]
 
 versions = ["2.3", "2.3.1", "2.3.2", "2.3.3", "2.4", "2.4.1"]

docs/source/develop.rst

@@ -40,7 +40,7 @@ Verbose mode
 When developing, it's convenient to run OnionShare from a terminal and add the ``--verbose`` (or ``-v``) flag to the command.
 This prints a lot of helpful messages to the terminal, such as when certain objects are initialized, when events occur (like buttons clicked, settings saved or reloaded), and other debug info. For example::
 
-    $ $ poetry run onionshare-cli -v ~/Documents/roms/nes/Q-bert\ \(USA\).nes 
+    $ poetry run onionshare-cli -v ~/Documents/roms/nes/Q-bert\ \(USA\).nes
     ╭───────────────────────────────────────────╮
     │    *            ▄▄█████▄▄            *    │
     │               ▄████▀▀▀████▄     *         │

licenses/license-onionshare.txt

@@ -3,7 +3,7 @@ Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -647,7 +647,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -666,11 +666,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

snap/snapcraft.yaml

@@ -3,9 +3,9 @@ base: core18
 version: '2.4.1'
 summary: Securely and anonymously share files, host websites, and chat using Tor
 description: |
-  OnionShare lets you securely and anonymously send and receive files. It works by starting 
+  OnionShare lets you securely and anonymously send and receive files. It works by starting
-  a web server, making it accessible as a Tor onion service, and generating an unguessable 
+  a web server, making it accessible as a Tor onion service, and generating an unguessable
-  web address so others can download files from you, or upload files to you. It does _not_ 
+  web address so others can download files from you, or upload files to you. It does _not_
   require setting up a separate server or using a third party file-sharing service.
 
 grade: stable # stable or devel
@@ -24,7 +24,7 @@ apps:
       - removable-media
     environment:
       LANG: C.UTF-8
-  
+
   cli:
     common-id: org.onionshare.OnionShareCli
     command: onionshare-cli
@@ -147,7 +147,7 @@ parts:
       - libssl-dev
       - zlib1g-dev
     after: [libevent]
-  
+
   libevent:
     source: https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz
     source-checksum: sha256/92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb