Remove all mentions of Flattr

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

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"),

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']),