Merge beta into master

.github/workflows/mypy.yml

@@ -10,10 +10,10 @@ jobs:
     name: Mypy
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
+    - name: Set up Python
       uses: actions/setup-python@v1
       with:
-        python-version: 3.8
+        python-version: '3.12'
     - name: Install Dependencies
       run: |
         pip install mypy

.github/workflows/pytest.yml

@@ -10,10 +10,10 @@ jobs:
     name: PyTest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
+    - name: Set up Python
       uses: actions/setup-python@v1
       with:
-        python-version: 3.8
+        python-version: '3.12'
     - name: Install Dependencies
       run: |
         pip install -r requirements-backend.txt

KerbalStuff/config.py

@@ -2,7 +2,7 @@
 import logging.config
 import os
 from configparser import ConfigParser
-from distutils.util import strtobool
+from str2bool import str2bool
 from typing import Optional, Dict, Any
 
 # Load the software configuration
@@ -27,7 +27,7 @@ def _cfgi(k: str, default: int = 0) -> int:
 
 def _cfgb(k: str, default: bool = False) -> bool:
     val = _cfg(k)
-    return strtobool(val) == 1 if val is not None else default
+    return str2bool(val) if val is not None else default
 
 
 def _cfgd(k: str, default: Optional[Dict[str, str]] = None) -> Dict[str, str]:

KerbalStuff/notification.py

@@ -29,11 +29,11 @@ def send_add_notification(notif: EnabledNotification) -> None:
                      {'name': notif.mod.name,
                       'id': notif.mod.id,
                       'license': notif.mod.license,
-                      'username': [user.username for user in authors],
-                      'user_github': [user.githubUsername for user in authors],
-                      'user_forum_id': [user.forumId for user in authors],
-                      'user_forum_username': [user.forumUsername for user in authors],
-                      'email': [user.email for user in authors],
+                      'username': [user.username or '' for user in authors],
+                      'user_github': [user.githubUsername or '' for user in authors],
+                      'user_forum_id': [user.forumId or '' for user in authors],
+                      'user_forum_username': [user.forumUsername or '' for user in authors],
+                      'email': [user.email or '' for user in authors],
                       'user_url': [site_base_url + url_for("profile.view_profile",
                                                            username=user.username)
                                    for user in authors],

requirements-backend.txt

@@ -23,6 +23,7 @@ pymdown-extensions
 python-daemon
 redis
 requests
+str2bool
 SQLAlchemy>=1.4,<2 # 1.4 shows deprecation warnings for 2.0, 2.0 would break our backend as of now
 SQLAlchemy-Utils
 tinycss2

templates/privacy.html

@@ -12,15 +12,15 @@ <h1>Terms of Use</h1>
     <p>The general idea is "be responsible". Follow these basic rules:</p>
     <ul>
         <li>Do not upload illegal content to the site</li>
-        <li>Do not abuse or harrass other users</li>
+        <li>Do not abuse or harass other users</li>
         <li>Do not upload content you cannot grant licenses to</li>
         <li>Uploaders offer {{ site_name }} a royalty-free, worldwide license to distribute their mods upon uploading them</li>
     </ul>
     <p>We can remove any content whenever we feel like it for any reason at all, with or without notifying the content owner.</p>
     <p>Users of the site agree to monitor the site for changes, while the team makes a best-effort promise to notify about changes.</p>
 <h1>Legal Disclosure</h1>Information in accordance with section 5 TMG<br/><br/>Schlegel, Christian<br/>Hauptstr. 38d<br/>53604 Bad Honnef<br/><h2>Contact</h2>Telephone: +49 175/8281852<br/>E-Mail: <a href="mailto:[email protected]">[email protected]</a><br/>Internetadresse: <a href="http://spacedock.info" target="_blank">http//spacedock.info</a><br/><h2>Person responsible for content in accordance with 55 Abs. 2 RStV</h2>Schlegel, Christian<br/>Hauptstr. 38d<br/>53604 Bad Honnef<br/><h2>Contact</h2>Telephone: +49 175/8281852<br/>E-Mail: <a href="mailto:[email protected]">[email protected]</a><br/><h2>Indication of source for images and graphics</h2>some image source<br/><h2>Disclaimer</h2>Accountability for content<br/>The contents of our pages have been created with the utmost care. However, we cannot guarantee the contents' accuracy, completeness or topicality. According to statutory provisions, we are furthermore responsible for our own content on these web pages. In this context, please note that we are accordingly not obliged to monitor merely the transmitted or saved information of third parties, or investigate circumstances pointing to illegal activity. Our obligations to remove or block the use of information under generally applicable laws remain unaffected by this as per &sect;&sect; 8 to 10 of the Telemedia Act (TMG).<br/><br/>Accountability for links<br/>Responsibility for the content of external links (to web pages of third parties) lies solely with the operators of the linked pages. No violations were evident to us at the time of linking. Should any legal infringement become known to us, we will remove the respective link immediately.<br/><br/>Copyright<br/> Our web pages and their contents are subject to German copyright law. Unless expressly permitted by law (&sect; 44a et seq. of the copyright law), every form of utilizing, reproducing or processing works subject to copyright protection on our web pages requires the prior consent of the respective owner of the rights. Individual reproductions of a work are allowed only for private use, so must not serve either directly or indirectly for earnings. Unauthorized utilization of copyrighted works is punishable (&sect; 106 of the copyright law).<br/><br/>
 
-<h1>Privacy Statement</h1><h2>General</h2>Your personal data (e.g. title, name, house address, e-mail address, phone number, bank details, credit card number) are processed by us only in accordance with the provisions of German data privacy laws. The following provisions describe the type, scope and purpose of collecting, processing and utilizing personal data. This data privacy policy applies only to our web pages. If links on our pages route you to other pages, please inquire there about how your data are handled in such cases.<br/><h2>Inventory data</h2>(1) Your personal data, insofar as these are necessary for this contractual relationship (inventory data) in terms of its establishment, organization of content and modifications, are used exclusively for fulfilling the contract. For goods to be delivered, for instance, your name and address must be relayed to the supplier of the goods. <br/>(2) Without your explicit consent or a legal basis, your personal data are not passed on to third parties outside the scope of fulfilling this contract. After completion of the contract, your data are blocked against further use. After expiry of deadlines as per tax-related and commercial regulations, these data are deleted unless you have expressly consented to their further use.<br/><h2>Social plug-ins from Facebook</h2>We use social plug-ins from facebook.com, operated by Facebook Inc., 1601 S. California Ave, Palo Alto, CA 94304, USA. The plug-ins can be recognized by way of the Facebook logo or the supplement &quot;Facebook Social Plug-in&quot;. For example, if you click on the &quot;Like&quot; button or leave a comment, the relevant information is transmitted directly from your browser to Facebook and stored there. Furthermore, Facebook makes your likes public for your Facebook friends. If you are logged into Facebook, it can assign the invocation of our page directly to your Facebook account. Even if you are not logged in or don't have a Facebook account, your browser sends information (e.g. which web pages you have called up, your IP address) which is then stored by Facebook. For details about handling of your personal data by Facebook and your related rights, please refer to the data privacy policy of Facebook: <a href="http://www.facebook.com/policy.php" target="_blank">http://www.facebook.com/policy.php</a>. If you do not want Facebook to map data collected about you via our Web sites to your Facebook account, you must log out of Facebook before you visit our web pages.<br/><h2>Social plug-ins from Twitter</h2>With Twitter and its Retweet functions, we use social plug-ins from Twitter.com, operated by Twitter Inc. 795 Folsom St., Suite 600, San Francisco, CA 94107. If you use Retweet, the websites visited by you are announced to third parties and associated with your Twitter account. Details about handling of your data by Twitter as well as your rights and setting options for protecting your personal information can be found in Twitter's data privacy policy: <a href="http://twitter.com/privacy " target="_blank">http://twitter.com/privacy </a><br/><h2>Newsletter</h2>Following subscription to the newsletter, your e-mail address is used for our own advertising purposes until you cancel the newsletter again. Cancellation is possible at any time. The following consent has been expressly granted by you separately, or possibly in the course of an ordering process: <br/>By clicking the "Recieve Updates" Button<br/>You may revoke your consent at any time with future effect. If you no longer want to receive the newsletter, then unsubscribe as follows: <br/> By disableing updates for the respective mods<br/><h2>Disclosure</h2>According to the Federal Data Protection Act, you have a right to free-of-charge information about your stored data, and possibly entitlement to correction, blocking or deletion of such data. Inquiries can be directed to the following e-mail addresses: ( <a href="mailto:[email protected]">[email protected]</a> )
+<h1>Privacy Statement</h1><h2>General</h2>Your personal data (e.g. title, name, house address, e-mail address, phone number, bank details, credit card number) are processed by us only in accordance with the provisions of German data privacy laws. The following provisions describe the type, scope and purpose of collecting, processing and utilizing personal data. This data privacy policy applies only to our web pages. If links on our pages route you to other pages, please inquire there about how your data are handled in such cases.<br/><h2>Inventory data</h2>(1) Your personal data, insofar as these are necessary for this contractual relationship (inventory data) in terms of its establishment, organization of content and modifications, are used exclusively for fulfilling the contract. For goods to be delivered, for instance, your name and address must be relayed to the supplier of the goods. <br/>(2) Without your explicit consent or a legal basis, your personal data are not passed on to third parties outside the scope of fulfilling this contract. After completion of the contract, your data are blocked against further use. After expiry of deadlines as per tax-related and commercial regulations, these data are deleted unless you have expressly consented to their further use.<br/><h2>Social plug-ins from Facebook</h2>We use social plug-ins from facebook.com, operated by Facebook Inc., 1601 S. California Ave, Palo Alto, CA 94304, USA. The plug-ins can be recognized by way of the Facebook logo or the supplement &quot;Facebook Social Plug-in&quot;. For example, if you click on the &quot;Like&quot; button or leave a comment, the relevant information is transmitted directly from your browser to Facebook and stored there. Furthermore, Facebook makes your likes public for your Facebook friends. If you are logged into Facebook, it can assign the invocation of our page directly to your Facebook account. Even if you are not logged in or don't have a Facebook account, your browser sends information (e.g. which web pages you have called up, your IP address) which is then stored by Facebook. For details about handling of your personal data by Facebook and your related rights, please refer to the data privacy policy of Facebook: <a href="http://www.facebook.com/policy.php" target="_blank">http://www.facebook.com/policy.php</a>. If you do not want Facebook to map data collected about you via our Web sites to your Facebook account, you must log out of Facebook before you visit our web pages.<br/><h2>Social plug-ins from Twitter</h2>With Twitter and its Retweet functions, we use social plug-ins from Twitter.com, operated by Twitter Inc. 795 Folsom St., Suite 600, San Francisco, CA 94107. If you use Retweet, the websites visited by you are announced to third parties and associated with your Twitter account. Details about handling of your data by Twitter as well as your rights and setting options for protecting your personal information can be found in Twitter's data privacy policy: <a href="http://twitter.com/privacy " target="_blank">http://twitter.com/privacy </a><br/><h2>Newsletter</h2>Following subscription to the newsletter, your e-mail address is used for our own advertising purposes until you cancel the newsletter again. Cancellation is possible at any time. The following consent has been expressly granted by you separately, or possibly in the course of an ordering process: <br/>By clicking the "Receive Updates" Button<br/>You may revoke your consent at any time with future effect. If you no longer want to receive the newsletter, then unsubscribe as follows: <br/> By disabling updates for the respective mods<br/><h2>Disclosure</h2>According to the Federal Data Protection Act, you have a right to free-of-charge information about your stored data, and possibly entitlement to correction, blocking or deletion of such data. Inquiries can be directed to the following e-mail addresses: ( <a href="mailto:[email protected]">[email protected]</a> )
 
 </div>
 {% endblock %}

templates/view_profile.html

@@ -232,7 +232,7 @@ <h2>
                                         <span class="text-muted">
                                             YouTube:
                                         </span>
-                                        <a target="_blank" href="https://www.youtube.com/user/{{profile.youtubeUsername}}">
+                                        <a target="_blank" href="https://www.youtube.com/@{{profile.youtubeUsername}}">
                                             {{ profile.youtubeUsername }}
                                         </a>
                                     </h2>