From 621617cd9e4421ec39c9dd03d06013b77a7faa8d Mon Sep 17 00:00:00 2001 From: Jason <84899178+jasonhenriquez@users.noreply.github.com> Date: Wed, 19 Jun 2024 16:09:37 +0000 Subject: [PATCH] Remove limited donation methods (#5290) * Remove instances to Monero and Liberapay Liberapay references have been temporarily removed as we handle an account issue with Stripe. Monero references have been removed because it hampers our team's ability to ensure that all donations are being allocated to the development of FreeTube. * Update README.md Co-authored-by: efb4f5ff-1298-471a-8973-3d47447115dc <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com> --------- Co-authored-by: efb4f5ff-1298-471a-8973-3d47447115dc <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com> --- .github/FUNDING.yml | 3 --- README.md | 6 +----- src/constants.js | 4 ---- src/main/index.js | 4 +--- src/renderer/main.js | 2 -- src/renderer/views/About/About.js | 12 +----------- 6 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 5e4e8b3f2..000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# These are supported funding model platforms - -liberapay: FreeTube diff --git a/README.md b/README.md index 451014888..5a42b6c49 100644 --- a/README.md +++ b/README.md @@ -150,14 +150,10 @@ If you ever have any questions, feel free to ask it on our [Discussions](https:/ > Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining. ## Donate -If you enjoy using FreeTube, you're welcome to leave a donation using the following methods. - -* [FreeTube on Liberapay](https://liberapay.com/FreeTube) +If you enjoy using FreeTube, you're welcome to leave a donation using the following method. * Bitcoin Address: `1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS` -* Monero Address: `48WyAPdjwc6VokeXACxSZCFeKEXBiYPV6GjfvBsfg4CrUJ95LLCQSfpM9pvNKy5GE5H4hNaw99P8RZyzmaU9kb1pD7kzhCB` - While your donations are much appreciated, only donate if you really want to. Donations are used for keeping the website up and running and eventual code signing costs. > [!TIP] diff --git a/src/constants.js b/src/constants.js index 6904dfab6..7fc27d8e3 100644 --- a/src/constants.js +++ b/src/constants.js @@ -108,9 +108,6 @@ const SEARCH_CHAR_LIMIT = 100 // Displayed on the about page and used in the main.js file to only allow bitcoin URLs with this wallet address to be opened const ABOUT_BITCOIN_ADDRESS = '1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS' -// Displayed on the about page and used in the main.js file to only allow monero URLs with this wallet address to be opened -const ABOUT_MONERO_ADDRESS = '48WyAPdjwc6VokeXACxSZCFeKEXBiYPV6GjfvBsfg4CrUJ95LLCQSfpM9pvNKy5GE5H4hNaw99P8RZyzmaU9kb1pD7kzhCB' - export { IpcChannels, DBActions, @@ -120,5 +117,4 @@ export { PLAYLIST_HEIGHT_FORCE_LIST_THRESHOLD, SEARCH_CHAR_LIMIT, ABOUT_BITCOIN_ADDRESS, - ABOUT_MONERO_ADDRESS } diff --git a/src/main/index.js b/src/main/index.js index e6af7ccc2..a781c33db 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -11,7 +11,6 @@ import { DBActions, SyncEvents, ABOUT_BITCOIN_ADDRESS, - ABOUT_MONERO_ADDRESS } from '../constants' import * as baseHandlers from '../datastores/handlers/base' import { extractExpiryTimestamp, ImageCache } from './ImageCache' @@ -882,8 +881,7 @@ function runApp() { parsedURL.protocol === 'tel:' || // Donation links on the about page - (parsedURL.protocol === 'bitcoin:' && parsedURL.pathname === ABOUT_BITCOIN_ADDRESS) || - (parsedURL.protocol === 'monero:' && parsedURL.pathname === ABOUT_MONERO_ADDRESS) + (parsedURL.protocol === 'bitcoin:' && parsedURL.pathname === ABOUT_BITCOIN_ADDRESS) ) { shell.openExternal(url) return true diff --git a/src/renderer/main.js b/src/renderer/main.js index 63cad6fd7..97b071fc3 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -99,7 +99,6 @@ import { faBitcoin, faGithub, faMastodon, - faMonero } from '@fortawesome/free-brands-svg-icons' import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' import PortalVue from 'portal-vue' @@ -198,7 +197,6 @@ library.add( faGithub, faBitcoin, faMastodon, - faMonero ) registerSwiper() diff --git a/src/renderer/views/About/About.js b/src/renderer/views/About/About.js index 690929cae..8a9e772b1 100644 --- a/src/renderer/views/About/About.js +++ b/src/renderer/views/About/About.js @@ -1,7 +1,7 @@ import { defineComponent } from 'vue' import FtCard from '../../components/ft-card/ft-card.vue' import packageDetails from '../../../../package.json' -import { ABOUT_BITCOIN_ADDRESS, ABOUT_MONERO_ADDRESS } from '../../../constants' +import { ABOUT_BITCOIN_ADDRESS } from '../../../constants' import FtLogoFull from '../../components/ft-logo-full/ft-logo-full.vue' export default defineComponent({ @@ -69,20 +69,10 @@ export default defineComponent({ title: this.$t('About.Credits'), content: `${this.$t('About.FreeTube is made possible by')} ${this.$t('About.these people and projects')}` }, - { - icon: ['fas', 'heart'], - title: `${this.$t('About.Donate')} - Liberapay`, - content: 'https://liberapay.com/FreeTube' - }, { icon: ['fab', 'bitcoin'], title: `${this.$t('About.Donate')} - BTC`, content: `${ABOUT_BITCOIN_ADDRESS}` - }, - { - icon: ['fab', 'monero'], - title: `${this.$t('About.Donate')} - XMR`, - content: `${ABOUT_MONERO_ADDRESS}` } ], }