Merge branch 'remove-flattr' into 'master'

Remove all mentions of Flattr See merge request fdroid/fdroidserver!1530
2024-11-14 19:10:11 +01:00 · 2024-09-23 07:59:08 +00:00 · 2024-09-23 07:59:08 +00:00 · a57a612982
commit a57a612982
parent 96ec2da0e7 0cee694c43
19 changed files with 2 additions and 28 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -59,6 +59,7 @@ metadata_v0:
    - ../tests/dump_internal_metadata_format.py
    - sed -i
          -e '/ArchivePolicy:/d'
+          -e '/FlattrID:/d'
          -e '/RequiresRoot:/d'
          metadata/dump_*/*.yaml
    - diff -uw metadata/dump_*
--- a/fdroidserver/index.py
+++ b/fdroidserver/index.py
@ -509,7 +509,6 @@ def package_metadata(app, repodir):
        "AuthorPhone",
        "AuthorWebSite",
        "Bitcoin",
-        "FlattrID",
        "Liberapay",
        "Litecoin",
        "OpenCollective",
@ -1169,7 +1168,6 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fing
        addElementNonEmpty('donate', app.Donate, doc, apel)
        addElementNonEmpty('bitcoin', app.Bitcoin, doc, apel)
        addElementNonEmpty('litecoin', app.Litecoin, doc, apel)
-        addElementNonEmpty('flattr', app.FlattrID, doc, apel)
        addElementNonEmpty('openCollective', app.OpenCollective, doc, apel)

        # These elements actually refer to the current version (i.e. which
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@ -159,10 +159,6 @@ regex_checks = {
    ],
    'Donate': http_checks
    + [
-        (
-            re.compile(r'.*flattr\.com'),
-            _("Flattr donation methods belong in the FlattrID: field"),
-        ),
        (
            re.compile(r'.*liberapay\.com'),
            _("Liberapay donation methods belong in the Liberapay: field"),
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@ -67,7 +67,6 @@ yaml_app_field_order = [
    'Translation',
    'Changelog',
    'Donate',
-    'FlattrID',
    'Liberapay',
    'OpenCollective',
    'Bitcoin',
@ -128,7 +127,6 @@ class App(dict):
        self.Translation = ''
        self.Changelog = ''
        self.Donate = None
-        self.FlattrID = None
        self.Liberapay = None
        self.OpenCollective = None
        self.Bitcoin = None
@ -408,10 +406,6 @@ class FieldValidator:

 # Generic value types
 valuetypes = {
-    FieldValidator("Flattr ID",
-                   r'^[0-9a-z]+$',
-                   ['FlattrID']),
-
    FieldValidator("Liberapay",
                   VALID_USERNAME_REGEX,
                   ['Liberapay']),
--- a/tests/funding-usernames.yaml
+++ b/tests/funding-usernames.yaml
@ -17,7 +17,6 @@ custom:
  - https://email.faircode.eu/donate/
  - https://etchdroid.depau.eu/donate/
  - https://f-droid.org/about/
-  - https://flattr.com/github/bk138
  - https://gultsch.de/donate.html
  - https://jahir.dev/donate
  - https://kodi.tv/contribute/donate
--- a/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
+++ b/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
@ -7,7 +7,6 @@ IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues
 Translation: https://hosted.weblate.org/projects/f-droid/f-droid
 Changelog: https://gitlab.com/fdroid/fdroidclient/raw/HEAD/CHANGELOG.md
 Donate: https://f-droid.org/about
-FlattrID: '343053'
 Bitcoin: 15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18

 AutoName: F-Droid
--- a/tests/metadata/dump/app.with.special.build.params.yaml
+++ b/tests/metadata/dump/app.with.special.build.params.yaml
@ -345,7 +345,6 @@ Description: 'To configure, go to "Settings => Accounts & Sync => Add Account".
  Appbrain SDK was removed before building.'
 Disabled: null
 Donate: null
-FlattrID: null
 IssueTracker: https://github.com/loadrunner/Facebook-Contact-Sync/issues
 Liberapay: null
 License: GPL-3.0-only
--- a/tests/metadata/dump/com.politedroid.yaml
+++ b/tests/metadata/dump/com.politedroid.yaml
@ -170,7 +170,6 @@ CurrentVersionCode: 6
 Description: Activates silent mode during calendar events.
 Disabled: null
 Donate: null
-FlattrID: null
 IssueTracker: https://github.com/miguelvps/PoliteDroid/issues
 Liberapay: null
 License: GPL-3.0-only
--- a/tests/metadata/dump/org.adaway.yaml
+++ b/tests/metadata/dump/org.adaway.yaml
@ -1113,7 +1113,6 @@ Description: 'An ad blocker that uses the hosts file. The hosts file
  read-only.'
 Disabled: null
 Donate: http://sufficientlysecure.org/index.php/adaway
-FlattrID: '369138'
 IssueTracker: https://github.com/dschuermann/ad-away/issues
 Liberapay: null
 License: GPL-3.0-only
--- a/tests/metadata/dump/org.smssecure.smssecure.yaml
+++ b/tests/metadata/dump/org.smssecure.smssecure.yaml
@ -383,7 +383,6 @@ Description: 'SMSSecure is an SMS/MMS application that allows you to protect you
  security by auditing the code.'
 Disabled: null
 Donate: null
-FlattrID: null
 IssueTracker: https://github.com/SMSSecure/SMSSecure/issues
 Liberapay: null
 License: GPL-3.0-only
--- a/tests/metadata/dump/org.videolan.vlc.yaml
+++ b/tests/metadata/dump/org.videolan.vlc.yaml
@ -2604,7 +2604,6 @@ Description: 'Video and audio player that supports a wide range of formats,
  '
 Disabled: null
 Donate: http://www.videolan.org/contribute.html#money
-FlattrID: null
 IssueTracker: http://www.videolan.org/support/index.html#bugs
 Liberapay: null
 License: GPL-3.0-only
--- a/tests/metadata/org.adaway.yml
+++ b/tests/metadata/org.adaway.yml
@ -7,7 +7,6 @@ SourceCode: https://github.com/dschuermann/ad-away
 IssueTracker: https://github.com/dschuermann/ad-away/issues
 Translation: https://www.transifex.com/dominikschuermann/adaway
 Donate: http://sufficientlysecure.org/index.php/adaway
-FlattrID: '369138'

 AutoName: AdAway
 Summary: Block advertisements
--- a/tests/metadata/org.fdroid.fdroid.yml
+++ b/tests/metadata/org.fdroid.fdroid.yml
@ -7,7 +7,6 @@ IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues
 Translation: https://hosted.weblate.org/projects/f-droid/f-droid
 Changelog: https://gitlab.com/fdroid/fdroidclient/raw/HEAD/CHANGELOG.md
 Donate: https://f-droid.org/about
-FlattrID: '343053'
 Bitcoin: 15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18

 AutoName: F-Droid
--- a/tests/metadata/souch.smsbypass.yml
+++ b/tests/metadata/souch.smsbypass.yml
@ -5,7 +5,6 @@ WebSite: https://gitlab.com/souch/SMSbypass
 SourceCode: https://gitlab.com/souch/SMSbypass/tree/HEAD
 IssueTracker: https://gitlab.com/souch/SMSbypass/issues
 Donate: http://rodolphe.souchaud.free.fr/donate
-FlattrID: cad90e036b975ed129a3ce80a0750466

 AutoName: Battery level
 Summary: Filter SMS and show them in a fake app
--- a/tests/repo/entry.json
+++ b/tests/repo/entry.json
@ -3,7 +3,7 @@
  "version": 20002,
  "index": {
    "name": "/index-v2.json",
-    "sha256": "4a36d8cdb5b7a9e59d8c2e9e2a81b968db975901ff7dac12ca15449acf07cf35",
+    "sha256": "bef31251dd4bdfc34f9a9e7b93dbf3e0bc7172e17d1d72a550c10d1bc183c01c",
    "size": 53527,
    "numPackages": 10
  },
--- a/tests/repo/index-v1.json
+++ b/tests/repo/index-v1.json
@ -29,7 +29,6 @@
      "suggestedVersionCode": "9",
      "description": "In order to keep away curious eyes, SMS-bypass filters incoming SMS messages\nbefore they reach your inbox. Based on bughunter2.smsfilter.\n\nFeatures:\n\n* Discrete fake app \"Battery level\": Long tap on Battery percentage will show SMS.\n* Filter incoming SMS specified address: redirect the SMS to SMS-bypass messages list; remove SMS arrival sound or vibration; show a discreet notification icon (battery level); vibrate if checked in settings\n* Add contact from contact list\n* Export messages to a text file",
      "donate": "http://rodolphe.souchaud.free.fr/donate",
-      "flattrID": "cad90e036b975ed129a3ce80a0750466",
      "issueTracker": "https://gitlab.com/souch/SMSbypass/issues",
      "license": "GPL-3.0-only",
      "sourceCode": "https://gitlab.com/souch/SMSbypass/tree/HEAD",
--- a/tests/repo/index-v2.json
+++ b/tests/repo/index-v2.json
@ -1392,7 +1392,6 @@
        "license": "GPL-3.0-only",
        "sourceCode": "https://gitlab.com/souch/SMSbypass/tree/HEAD",
        "webSite": "https://gitlab.com/souch/SMSbypass",
-        "flattrID": "cad90e036b975ed129a3ce80a0750466",
        "name": {
          "en-US": "Battery level"
        },
--- a/tests/repo/index.xml
+++ b/tests/repo/index.xml
@ -31,7 +31,6 @@ Features:
 		<source>https://gitlab.com/souch/SMSbypass/tree/HEAD</source>
 		<tracker>https://gitlab.com/souch/SMSbypass/issues</tracker>
 		<donate>http://rodolphe.souchaud.free.fr/donate</donate>
-		<flattr>cad90e036b975ed129a3ce80a0750466</flattr>
 		<marketversion>0.9</marketversion>
 		<marketvercode>9</marketvercode>
 		<package>
--- a/tests/update.TestCase
+++ b/tests/update.TestCase
@ -1390,7 +1390,6 @@ class UpdateTest(unittest.TestCase):
                    Translation:
                    Changelog:
                    Donate:
-                    FlattrID:
                    Bitcoin:
                    Litecoin:
                    Name:
@ -1435,7 +1434,6 @@ class UpdateTest(unittest.TestCase):
                        'CurrentVersionCode': None,
                        'Disabled': '',
                        'Donate': '',
-                        'FlattrID': '',
                        'IssueTracker': '',
                        'License': '',
                        'Litecoin': '',