add Liberapay: field with username as data

Liberapay was originally included using a numeric ID, since they had
not yet finalized the public URLs.  Now it is a username.  So this
logic prefers the username in Liberapay: field, and keeps the old
LiberapayID: to ease migration.  LiberapayID: will not override
Liberapay:.  Clients are expected to prefer Liberapay: over LiberapayID:

tests/metadata/dump/com.politedroid.yaml

@@ -17,6 +17,7 @@ Disabled: null
 Donate: null
 FlattrID: null
 IssueTracker: https://github.com/miguelvps/PoliteDroid/issues
+Liberapay: null
 LiberapayID: null
 License: GPL-3.0-only
 Litecoin: null

tests/metadata/dump/org.adaway.yaml

@@ -40,7 +40,8 @@ Disabled: null
 Donate: http://sufficientlysecure.org/index.php/adaway
 FlattrID: '369138'
 IssueTracker: https://github.com/dschuermann/ad-away/issues
-LiberapayID: null
+Liberapay: null
+LiberapayID: '1234567890'
 License: GPL-3.0-only
 Litecoin: null
 MaintainerNotes: ''

tests/metadata/dump/org.smssecure.smssecure.yaml

@@ -37,6 +37,7 @@ Disabled: null
 Donate: null
 FlattrID: null
 IssueTracker: https://github.com/SMSSecure/SMSSecure/issues
+Liberapay: null
 LiberapayID: null
 License: GPL-3.0-only
 Litecoin: null

tests/metadata/dump/org.videolan.vlc.yaml

@@ -24,6 +24,7 @@ Disabled: null
 Donate: http://www.videolan.org/contribute.html#money
 FlattrID: null
 IssueTracker: http://www.videolan.org/support/index.html#bugs
+Liberapay: null
 LiberapayID: null
 License: GPL-3.0-only
 Litecoin: null

tests/metadata/info.guardianproject.checkey.yml

@@ -7,6 +7,7 @@ SourceCode: https://github.com/guardianproject/checkey
 IssueTracker: https://dev.guardianproject.info/projects/checkey/issues
 Translation: https://www.transifex.com/otf/checkey
 Bitcoin: 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
+Liberapay: GuardianProject
 
 AutoName: Checkey
 

tests/metadata/obb.main.oldversion.yml

@@ -3,6 +3,7 @@ Categories:
 License: GPL-3.0-only
 SourceCode: https://github.com/eighthave/urzip
 Bitcoin: 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
+Liberapay: 12334
 
 AutoName: OBB Main Old Version
 

tests/metadata/org.adaway.yml

@@ -8,6 +8,7 @@ IssueTracker: https://github.com/dschuermann/ad-away/issues
 Translation: https://www.transifex.com/dominikschuermann/adaway
 Donate: http://sufficientlysecure.org/index.php/adaway
 FlattrID: '369138'
+LiberapayID: '1234567890'
 
 AutoName: AdAway
 Summary: Block advertisements

tests/repo/index-v1.json

@@ -104,6 +104,7 @@
         "Development"
       ],
       "suggestedVersionCode": "99999999",
+      "liberapay": "12334",
       "license": "GPL-3.0-only",
       "name": "OBB Main Old Version",
       "sourceCode": "https://github.com/eighthave/urzip",

tests/update.TestCase

@@ -36,6 +36,7 @@ from fdroidserver.common import FDroidPopen
 
 DONATION_FIELDS = (
     'Donate',
+    'Liberapay',
     'OpenCollective',
 )
 
@@ -1008,9 +1009,11 @@ class UpdateTest(unittest.TestCase):
         for field in DONATION_FIELDS:
             self.assertIsNotNone(app.get(field), field)
         self.assertEqual('LINK1', app.get('Donate'))
+        self.assertEqual('USERNAME', app.get('Liberapay'))
         self.assertEqual('USERNAME', app.get('OpenCollective'))
 
         app['Donate'] = 'keepme'
+        app['Liberapay'] = 'keepme'
         app['OpenCollective'] = 'keepme'
         fdroidserver.update.insert_funding_yml_donation_links(apps)
         for field in DONATION_FIELDS: