Skip to content

Commit 52a9517

Browse files
committed
update visible mentions of Mastodon to Ecko
1 parent 2ff6467 commit 52a9517

25 files changed

+66
-62
lines changed

.env.production.sample

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ REDIS_PORT=6379
1818
# PostgreSQL
1919
# ----------
2020
DB_HOST=/var/run/postgresql
21-
DB_USER=mastodon
22-
DB_NAME=mastodon_production
21+
DB_USER=ecko
22+
DB_NAME=ecko_production
2323
DB_PASS=
2424
DB_PORT=5432
2525

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Note: Below is the changelog for Mastodon at the time Ecko was forked. The file has been kept for historical reasons but currently, there are no plans to update this file. The best way to review recent changees in Ecko is the commit log at https://github.com/magicstone-dev/ecko/commits/main.
2+
3+
----
4+
15
Changelog
26
=========
37

Vagrantfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo deb
2020
echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections
2121
sudo apt-get install iptables-persistent -y
2222
23-
# Add packages to build and run Mastodon
23+
# Add packages to build and run Ecko
2424
sudo apt-get install \
2525
git-core \
2626
g++ \
@@ -56,14 +56,14 @@ rvm reinstall ruby-$RUBY_VERSION --disable-binary
5656
5757
# Configure database
5858
sudo -u postgres createuser -U postgres vagrant -s
59-
sudo -u postgres createdb -U postgres mastodon_development
59+
sudo -u postgres createdb -U postgres ecko_development
6060
6161
# Install gems and node modules
6262
gem install bundler foreman
6363
bundle install
6464
yarn install
6565
66-
# Build Mastodon
66+
# Build Ecko
6767
export RAILS_ENV=development
6868
export $(cat ".env.vagrant" | xargs)
6969
bundle exec rails db:setup
@@ -88,7 +88,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
8888
config.vm.box = "ubuntu/bionic64"
8989

9090
config.vm.provider :virtualbox do |vb|
91-
vb.name = "mastodon"
91+
vb.name = "ecko"
9292
vb.customize ["modifyvm", :id, "--memory", "2048"]
9393
# Increase the number of CPUs. Uncomment and adjust to
9494
# increase performance
@@ -106,13 +106,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
106106
end
107107

108108
# This uses the vagrant-hostsupdater plugin, and lets you
109-
# access the development site at http://mastodon.local.
109+
# access the development site at http://ecko.local.
110110
# If you change it, also change it in .env.vagrant before provisioning
111111
# the vagrant server to update the development build.
112112
#
113113
# To install:
114114
# $ vagrant plugin install vagrant-hostsupdater
115-
config.vm.hostname = "mastodon.local"
115+
config.vm.hostname = "ecko.local"
116116

117117
if defined?(VagrantPlugins::HostsUpdater)
118118
config.vm.network :private_network, ip: "192.168.42.42", nictype: "virtio"

app/javascript/mastodon/features/compose/components/search_results.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class SearchResults extends ImmutablePureComponent {
104104
<h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
105105

106106
<div className='search-results__info'>
107-
<FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching toots by their content is not enabled on this Mastodon server.' />
107+
<FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching toots by their content is not enabled on this server.' />
108108
</div>
109109
</div>
110110
);

app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class NotificationsPermissionBanner extends React.PureComponent {
3939
</div>
4040

4141
<h2><FormattedMessage id='notifications_permission_banner.title' defaultMessage='Never miss a thing' /></h2>
42-
<p><FormattedMessage id='notifications_permission_banner.how_to_control' defaultMessage="To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled." values={{ icon: <Icon id='sliders' /> }} /></p>
42+
<p><FormattedMessage id='notifications_permission_banner.how_to_control' defaultMessage="To receive notifications when Ecko isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled." values={{ icon: <Icon id='sliders' /> }} /></p>
4343
<Button onClick={this.handleClick}><FormattedMessage id='notifications_permission_banner.enable' defaultMessage='Enable desktop notifications' /></Button>
4444
</div>
4545
);

app/javascript/mastodon/features/ui/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import { closeOnboarding, INTRODUCTION_VERSION } from 'mastodon/actions/onboardi
6161
import '../../components/status';
6262

6363
const messages = defineMessages({
64-
beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave Mastodon.' },
64+
beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave Ecko.' },
6565
});
6666

6767
const mapStateToProps = state => ({

app/serializers/nodeinfo/serializer.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def version
1010
end
1111

1212
def software
13-
{ name: 'mastodon', version: Mastodon::Version.to_s }
13+
{ name: 'ecko', version: Mastodon::Version.to_s }
1414
end
1515

1616
def services

app/views/admin/dashboard/index.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
%h4= t 'admin.dashboard.software'
8484
%ul
8585
%li
86-
Mastodon
86+
Ecko
8787
%span.pull-right= @version
8888
%li
8989
Ruby

app/views/layouts/admin.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.sidebar-wrapper__inner
99
.sidebar
1010
= link_to root_path do
11-
= image_pack_tag 'logo.svg', class: 'logo', alt: 'Mastodon'
11+
= image_pack_tag 'logo.svg', class: 'logo', alt: 'Ecko'
1212

1313
.sidebar__toggle
1414
.sidebar__toggle__logo

app/views/layouts/mailer.html.haml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
%tr
2525
%td.column-cell
2626
= link_to root_url do
27-
= image_tag full_pack_url('media/images/mailer/logo_full.png'), alt: 'Mastodon', height: 34, class: 'logo'
27+
= image_tag full_pack_url('media/images/mailer/logo_full.png'), alt: 'Ecko', height: 34, class: 'logo'
2828

2929
= yield
3030

@@ -49,4 +49,4 @@
4949
%p= link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
5050
%td.column-cell.text-right
5151
= link_to root_url do
52-
= image_tag full_pack_url('media/images/mailer/logo_transparent.png'), alt: 'Mastodon', height: 24
52+
= image_tag full_pack_url('media/images/mailer/logo_transparent.png'), alt: 'Ecko', height: 24

chart/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
2-
name: mastodon
3-
description: Mastodon is a free, open-source social network server based on ActivityPub.
2+
name: ecko
3+
description: Ecko is a free, open-source social network server based on Mastodon and ActivityPub.
44

55
# A chart can be either an 'application' or a 'library' chart.
66
#

chart/readme.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Introduction
22

3-
This is a [Helm](https://helm.sh/) chart for installing Mastodon into a
3+
This is a [Helm](https://helm.sh/) chart for installing Ecko into a
44
Kubernetes cluster. The basic usage is:
55

66
1. edit `values.yaml` or create a separate yaml file for custom values
77
1. `helm dep update`
8-
1. `helm install --namespace mastodon --create-namespace my-mastodon ./ -f path/to/additional/values.yaml`
8+
1. `helm install --namespace ecko --create-namespace my-ecko ./ -f path/to/additional/values.yaml`
99

1010
This chart has been tested on Helm 3.0.1 and above.
1111

1212
# Configuration
1313

1414
The variables that _must_ be configured are:
1515

16-
- password and keys in the `mastodon.secrets`, `postgresql`, and `redis` groups; if
16+
- password and keys in the `ecko.secrets`, `postgresql`, and `redis` groups; if
1717
left blank, some of those values will be autogenerated, but will not persist
1818
across upgrades.
1919

20-
- SMTP settings for your mailer in the `mastodon.smtp` group.
20+
- SMTP settings for your mailer in the `ecko.smtp` group.
2121

2222
# Missing features
2323

@@ -32,6 +32,6 @@ Currently this chart does _not_ support:
3232

3333
Because database migrations are managed as a Job separate from the Rails and
3434
Sidekiq deployments, it’s possible they will occur in the wrong order. After
35-
upgrading Mastodon versions, it may sometimes be necessary to manually delete
35+
upgrading Ecko versions, it may sometimes be necessary to manually delete
3636
the Rails and Sidekiq pods so that they are recreated against the latest
3737
migration.

chart/values.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
replicaCount: 1
22

33
image:
4-
repository: tootsuite/mastodon
4+
repository: dsterry/ecko
55
# https://hub.docker.com/r/tootsuite/mastodon/tags
66
#
77
# alternatively, use `latest` for the latest release or `edge` for the image
@@ -26,7 +26,7 @@ mastodon:
2626
schedule: "0 0 * * 0"
2727
# available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
2828
locale: en
29-
local_domain: mastodon.local
29+
local_domain: ecko.local
3030
persistence:
3131
assets:
3232
# ReadWriteOnce is more widely supported than ReadWriteMany, but limits
@@ -94,13 +94,13 @@ ingress:
9494
# for the NGINX ingress controller:
9595
# nginx.org/client-max-body-size: 40m
9696
hosts:
97-
- host: mastodon.local
97+
- host: ecko.local
9898
paths:
9999
- path: '/'
100100
tls:
101-
- secretName: mastodon-tls
101+
- secretName: ecko-tls
102102
hosts:
103-
- mastodon.local
103+
- ecko.local
104104

105105
# https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters
106106
elasticsearch:

config/environments/production.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym
116116

117117
config.action_dispatch.default_headers = {
118-
'Server' => 'Mastodon',
118+
'Server' => 'Ecko',
119119
'X-Frame-Options' => 'DENY',
120120
'X-Content-Type-Options' => 'nosniff',
121121
'X-XSS-Protection' => '1; mode=block',

config/initializers/statsd.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
host, port = ENV['STATSD_ADDR'].split(':')
55

66
$statsd = ::Statsd.new(host, port)
7-
$statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }
7+
$statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Ecko', Rails.env].join('.') }
88

99
::NSA.inform_statsd($statsd) do |informant|
1010
informant.collect(:action_controller, :web)

config/initializers/webauthn.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
config.origin = "#{Rails.configuration.x.use_https ? 'https' : 'http' }://#{Rails.configuration.x.web_domain}"
55

66
# Relying Party name for display purposes
7-
config.rp_name = "Mastodon"
7+
config.rp_name = "Ecko"
88

99
# Optionally configure a client timeout hint, in milliseconds.
1010
# This hint specifies how long the browser should wait for an

config/locales/devise.en.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -23,59 +23,59 @@ en:
2323
explanation: You have created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email.
2424
explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can login to change your details or delete your account, but you cannot access most of the functions until your account is approved. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email.
2525
extra_html: Please also check out <a href="%{terms_path}">the rules of the server</a> and <a href="%{policy_path}">our terms of service</a>.
26-
subject: 'Mastodon: Confirmation instructions for %{instance}'
26+
subject: 'Ecko: Confirmation instructions for %{instance}'
2727
title: Verify email address
2828
email_changed:
2929
explanation: 'The email address for your account is being changed to:'
3030
extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
31-
subject: 'Mastodon: Email changed'
31+
subject: 'Ecko: Email changed'
3232
title: New email address
3333
password_change:
3434
explanation: The password for your account has been changed.
3535
extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
36-
subject: 'Mastodon: Password changed'
36+
subject: 'Ecko: Password changed'
3737
title: Password changed
3838
reconfirmation_instructions:
3939
explanation: Confirm the new address to change your email.
40-
extra: If this change wasn't initiated by you, please ignore this email. The email address for the Mastodon account won't change until you access the link above.
41-
subject: 'Mastodon: Confirm email for %{instance}'
40+
extra: If this change wasn't initiated by you, please ignore this email. The email address for the account won't be changed until you access the link above.
41+
subject: 'Ecko: Confirm email for %{instance}'
4242
title: Verify email address
4343
reset_password_instructions:
4444
action: Change password
4545
explanation: You requested a new password for your account.
4646
extra: If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.
47-
subject: 'Mastodon: Reset password instructions'
47+
subject: 'Ecko: Reset password instructions'
4848
title: Password reset
4949
two_factor_disabled:
5050
explanation: Two-factor authentication for your account has been disabled. Login is now possible using only e-mail address and password.
51-
subject: 'Mastodon: Two-factor authentication disabled'
51+
subject: 'Ecko: Two-factor authentication disabled'
5252
title: 2FA disabled
5353
two_factor_enabled:
5454
explanation: Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.
55-
subject: 'Mastodon: Two-factor authentication enabled'
55+
subject: 'Ecko: Two-factor authentication enabled'
5656
title: 2FA enabled
5757
two_factor_recovery_codes_changed:
5858
explanation: The previous recovery codes have been invalidated and new ones generated.
59-
subject: 'Mastodon: Two-factor recovery codes re-generated'
59+
subject: 'Ecko: Two-factor recovery codes re-generated'
6060
title: 2FA recovery codes changed
6161
unlock_instructions:
62-
subject: 'Mastodon: Unlock instructions'
62+
subject: 'Ecko: Unlock instructions'
6363
webauthn_credential:
6464
added:
6565
explanation: The following security key has been added to your account
66-
subject: 'Mastodon: New security key'
66+
subject: 'Ecko: New security key'
6767
title: A new security key has been added
6868
deleted:
6969
explanation: The following security key has been deleted from your account
70-
subject: 'Mastodon: Security key deleted'
70+
subject: 'Ecko: Security key deleted'
7171
title: One of your security keys has been deleted
7272
webauthn_disabled:
7373
explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
74-
subject: 'Mastodon: Authentication with security keys disabled'
74+
subject: 'Ecko: Authentication with security keys disabled'
7575
title: Security keys disabled
7676
webauthn_enabled:
7777
explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
78-
subject: 'Mastodon: Security key authentication enabled'
78+
subject: 'Ecko: Security key authentication enabled'
7979
title: Security keys enabled
8080
omniauth_callbacks:
8181
failure: Could not authenticate you from %{kind} because “%{reason}”.

config/locales/simple_form.en.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ en:
7070
form_challenge:
7171
current_password: You are entering a secure area
7272
imports:
73-
data: CSV file exported from another Mastodon server
73+
data: CSV file exported from another Ecko or Mastodon server
7474
invite_request:
7575
text: This will help us review your application
7676
ip_block:

config/locales/simple_form.en_GB.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ en_GB:
3838
featured_tag:
3939
name: 'You might want to use one of these:'
4040
imports:
41-
data: CSV file exported from another Mastodon server
41+
data: CSV file exported from another Ecko or Mastodon server
4242
sessions:
4343
otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
4444
user:

config/settings.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Most every setting can be adjusted from the admin interface.
33

44
defaults: &defaults
5-
site_title: Mastodon
5+
site_title: Ecko
66
site_short_description: ''
77
site_description: ''
88
site_extended_description: ''

lib/cli.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def self.exit_on_failure?
7474
long_desc <<~LONG_DESC
7575
Erase the server from the federation by broadcasting account delete
7676
activities to all known other servers. This allows a "clean exit" from
77-
running a Mastodon server, as it leaves next to no cache behind on
77+
running an Ecko server, as it leaves next to no cache behind on
7878
other servers.
7979
8080
This command is always interactive and requires confirmation twice.

lib/tasks/db.rake

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace :db do
3131

3232
task :pre_migration_check do
3333
version = ActiveRecord::Base.connection.select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
34-
abort 'ERROR: This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon.' if version < 90_500
34+
abort 'ERROR: This version of Ecko requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Ecko.' if version < 90_500
3535
end
3636

3737
Rake::Task['db:migrate'].enhance(['db:pre_migration_check'])

0 commit comments

Comments
 (0)