From 0a4101f0347fefbfc058daa86c355abbff7f670a Mon Sep 17 00:00:00 2001 From: Jason Henriquez Date: Tue, 18 Jun 2024 16:14:05 -0500 Subject: [PATCH] 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. --- .github/FUNDING.yml | 3 --- README.md | 4 ---- src/constants.js | 4 ---- src/main/index.js | 4 +--- src/renderer/main.js | 2 -- src/renderer/views/About/About.js | 12 +----------- 6 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 5e4e8b3f2b0e..000000000000 --- 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 45101488864b..d3134dcc78b0 100644 --- a/README.md +++ b/README.md @@ -152,12 +152,8 @@ If you ever have any questions, feel free to ask it on our [Discussions](https:/ ## Donate If you enjoy using FreeTube, you're welcome to leave a donation using the following methods. -* [FreeTube on Liberapay](https://liberapay.com/FreeTube) - * 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 36ad4ee471e1..6fda5ab4d37e 100644 --- a/src/constants.js +++ b/src/constants.js @@ -98,9 +98,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, @@ -110,5 +107,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 3b88eaab2442..711c6d094e0a 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 63cad6fd7b30..97b071fc301f 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 2fe693896598..b9557dcb5b53 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' export default defineComponent({ name: 'About', @@ -67,20 +67,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}` } ] }