merge from develop and fix conflicts, update poetry

cli/onionshare_cli/mode_settings.py

@@ -55,6 +55,8 @@ class ModeSettings:
             "receive": {
                 "data_dir": self.build_default_receive_data_dir(),
                 "webhook_url": None,
+                "disable_text": False,
+                "disable_files": False,
             },
             "website": {"disable_csp": False, "filenames": []},
             "chat": {"room": "default"},
@@ -128,7 +130,7 @@ class ModeSettings:
                     self.fill_in_defaults()
                     self.common.log("ModeSettings", "load", f"loaded {self.filename}")
                     return
-            except:
+            except Exception:
                 pass
 
         # If loading settings didn't work, create the settings file