Merge pull request #1 from JC5/main

Merge upstream changes

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# code owners for this Firefly III related repository
+* @JC5 @SDx3

.github/funding.yml

@@ -1,4 +1,6 @@
-# These are supported funding model platforms
+# Firefly III sponsor options
 
 github: jc5
 patreon: JC5
+ko_fi: jamesc5
+liberapay: JC5

.github/pull_request_template.md

@@ -1,14 +1,19 @@
 <!--
-Before you create a new PR, please consider:
+Thank you for submitting new code to Firefly III, or any of the related projects. Please read the following rules carefully.
 
-1) Pull requests for the MAIN branch will be closed.
+- Please do not submit solutions for problems that are not already reported in an issue.
-2) We cannot accept pull requests to add new currencies.
+- Unfortunately, Firefly III can't be your learning experience. If you're new to all of this, please open an issue first.
-3) DO NOT include translations in your PR. Only English US sentences.
+- Please do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I simply don't have time for that.
+- Pull requests for the MAIN branch will be closed.
+- DO NOT include translated strings in your PR.
+
+If it feels necessary to open an issue first, please do so, before you open a PR.
+
+See also: https://docs.firefly-iii.org/explanation/support/#contributing-code
 
-Thanks.
 -->
     
-Fixes issue # (if relevant)
+This PR fixes issue # (if relevant).
 
 Changes in this pull request:
 

readme.md

@@ -129,22 +129,25 @@ No. Use at your own risk. This script can show you how powerful the API can be.
 This script requires Firefly III v5.4.0-alpha.1 minimum.
 
 <!-- HELP TEXT -->
-## Need help?
 
-If you need support using Firefly III or the associated tools, come find us!
+## Do you need help, or do you want to get in touch?
 
-- [GitHub Discussions for questions and support](https://github.com/firefly-iii/firefly-iii/discussions/)
+Do you want to contact me? You can email me at [james@firefly-iii.org](mailto:james@firefly-iii.org) or get in touch through one of the following support channels:
-- [Gitter.im for a good chat and a quick answer](https://gitter.im/firefly-iii/firefly-iii)
+
-- [GitHub Issues for bugs and issues](https://github.com/firefly-iii/firefly-iii/issues)
+- [GitHub Discussions](https://github.com/firefly-iii/firefly-iii/discussions/) for questions and support
-- [Follow me around for news and updates on Mastodon](https://fosstodon.org/@ff3)
+- [Gitter.im](https://gitter.im/firefly-iii/firefly-iii) for a good chat and a quick answer
+- [GitHub Issues](https://github.com/firefly-iii/firefly-iii/issues) for bugs and issues
+- <a rel="me" href="https://fosstodon.org/@ff3">Mastodon</a> for news and updates
 
 <!-- END OF HELP TEXT -->
 
 <!-- SPONSOR TEXT -->
-## Donate
 
-If you feel Firefly III made your life better, consider contributing as a sponsor. Please check out my [Patreon](https://www.patreon.com/jc5) and [GitHub Sponsors](https://github.com/sponsors/JC5) page for more information. Thank you for considering.
+## Support the development of Firefly III
 
+If you like Firefly III and if it helps you save lots of money, why not send me a dime for every dollar saved! 🥳
 
-<!-- END OF SPONSOR -->
+OK that was a joke. If you feel Firefly III made your life better, please consider contributing as a sponsor. Please check out my [Patreon](https://www.patreon.com/jc5) and [GitHub Sponsors](https://github.com/sponsors/JC5) page for more information. You can also [buy me a ☕️ coffee at ko-fi.com](https://ko-fi.com/Q5Q5R4SH1). Thank you for your consideration.
+
+<!-- END OF SPONSOR TEXT -->