Merge pull request #829 from gpodder/ft/archive-old

inactive user data archival

Author: elelay

.github/workflows/pr-build.yml

@@ -5,10 +5,10 @@ on: [pull_request, workflow_dispatch]
 jobs:
   build: 
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.12]
     env:
       POSTGRES_DB: mygpo
       POSTGRES_PASSWORD: mygpo

.travis.yml

@@ -35,7 +35,7 @@ Or:
 .. code-block:: bash
 
     sudo apt-get install libpq-dev libjpeg-dev zlib1g-dev libwebp-dev \
-		build-essential python3-dev virtualenv libffi-dev redis postgresql
+		build-essential python3-dev virtualenv libffi-dev redis postgresql python3-pip
 
 
 Now install additional dependencies locally:

doc/dev/installation.rst

@@ -39,10 +39,10 @@ install-deps:
 		gettext
 
 format-code:
-	black --target-version py38 --skip-string-normalization mygpo/
+	black --target-version py312 --skip-string-normalization mygpo/
 
 check-code-format:
-	black --check --target-version py38 --skip-string-normalization mygpo/
+	black --check --target-version py312 --skip-string-normalization mygpo/
 
 
 .PHONY: all help test clean unittest coverage install-deps format-code

makefile

@@ -363,16 +363,21 @@ def post(self, request):
             return HttpResponseRedirect(reverse("admin-resend-activation"))
 
         if user.is_active:
-            messages.success(request, "User {username} is already activated")
-
+            messages.success(
+                request,
+                _("User {username} is already activated").format(username=username),
+            )
+        elif user.profile.archived_date is not None:
+            messages.error(
+                self.request,
+                _("User {username} data has been archived.").format(username=username),
+            )
         else:
             send_activation_email(user, request)
             messages.success(
                 request,
-                _(
-                    "Email for {username} ({email}) resent".format(
-                        username=user.username, email=user.email
-                    )
+                _("Email for {username} ({email}) resent").format(
+                    username=user.username, email=user.email
                 ),
             )
 

mygpo/administration/views.py

@@ -179,10 +179,12 @@ def episode_data(episode, domain, podcast=None):
         "podcast_url": podcast.url if podcast else "",
         "description": episode.description,
         "website": episode.link,
-        "mygpo_link": "http://%(domain)s%(res)s"
-        % dict(domain=domain, res=get_episode_link_target(episode, podcast))
-        if podcast
-        else "",
+        "mygpo_link": (
+            "http://%(domain)s%(res)s"
+            % dict(domain=domain, res=get_episode_link_target(episode, podcast))
+            if podcast
+            else ""
+        ),
     }
 
     if episode.released:

mygpo/api/advanced/directory.py

@@ -1,5 +1,4 @@
-""" This module contains abstract models that are used in multiple apps """
-
+"""This module contains abstract models that are used in multiple apps"""
 
 from django.db import models, connection
 

mygpo/core/models.py

@@ -1,5 +1,4 @@
-""" This module contains models for the publisher pages """
-
+"""This module contains models for the publisher pages"""
 
 from django.db import models
 from django.conf import settings

mygpo/publisher/models.py

@@ -28,18 +28,4 @@ <h2>{% trans "Example Podcasts" %}</h2>
  <h2>{% trans "Visitors" %}</h2>
  <p>{% blocktrans %}Both the front page and the list of example podcasts are accessed by more than 1000 people daily, who are actively looking for interesting podcasts. We do, however, not guarantee a certain number of visitors during your advertisement period.{% endblocktrans %}</p>
 
- <h2>{% trans "Start your Advertisement" %}</h2>
- <p>{% blocktrans with site as sitename %}Contact <a href="mailto:stefan@gpodder.net">stefan@gpodder.net</a> if you would like to advertise on {{ sitename }} or if you have any questions.{% endblocktrans %}</p>
-
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="hosted_button_id" value="QZUSX4U6SDNB2">
-<input type="image"
-src="https://www.paypal.com/en_US/i/btn/btn_buynow_LG.gif" border="0"
-name="submit" alt="PayPal - The safer, easier way to pay online!">
-<img alt="" border="0"
-src="https://www.paypal.com/de_DE/i/scr/pixel.gif" width="1" height="1">
-</form>
-
 {% endblock %}
-

mygpo/publisher/templates/publisher/advertise.html

@@ -1,4 +1,4 @@
-""" Contains code for searching podcasts
+"""Contains code for searching podcasts
 
 Uses django.contrib.postgres.search for searching. See docs at
 https://docs.djangoproject.com/en/1.11/ref/contrib/postgres/search/