|
|
|
# frozen_string_literal: true
|
|
|
|
|
|
|
|
module Mastodon
|
|
|
|
module Version
|
|
|
|
module_function
|
|
|
|
|
|
|
|
def major
|
|
|
|
4
|
|
|
|
end
|
|
|
|
|
|
|
|
def minor
|
|
|
|
1
|
|
|
|
end
|
|
|
|
|
|
|
|
def patch
|
|
|
|
2
|
|
|
|
end
|
|
|
|
|
|
|
|
def flags
|
|
|
|
ENV.fetch('MASTODON_VERSION_FLAGS', '')
|
|
|
|
end
|
|
|
|
|
|
|
|
def suffix
|
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes, but we had removed it.
Discarded upstream changes.
- `.rubocop_todo.yml`:
Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
Minor upstream code style change where glitch-soc had slightly different code
due to handling of local-only posts.
Updated to match upstream's code style.
- `app/models/status.rb`:
Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
Upstream rewrote a lot of the backup service, glitch-soc had changes because
of exporting local-only posts.
Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
Upstream split the file into different files, while glitch-soc had a few
extra routes.
Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
and `config/routes/admin.rb`
- `db/schema.rb`:
Upstream has new migrations, while glitch-soc had an extra migration.
Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
Upstream added support to set version tags from environment variables, while
glitch-soc has an extra `+glitch` tag.
Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests due to
`directMessage` handling.
Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests.
Applied upstream's changes while keeping glitch-soc's extra tests.
2 years ago
|
|
|
"+glitch#{ENV.fetch('MASTODON_VERSION_SUFFIX', '')}"
|
|
|
|
end
|
|
|
|
|
|
|
|
def to_a
|
|
|
|
[major, minor, patch].compact
|
|
|
|
end
|
|
|
|
|
|
|
|
def to_s
|
|
|
|
[to_a.join('.'), flags, suffix].join
|
|
|
|
end
|
|
|
|
|
|
|
|
def repository
|
|
|
|
ENV.fetch('GITHUB_REPOSITORY', 'glitch-soc/mastodon')
|
|
|
|
end
|
|
|
|
|
|
|
|
def source_base_url
|
|
|
|
ENV.fetch('SOURCE_BASE_URL', "https://github.com/#{repository}")
|
|
|
|
end
|
|
|
|
|
|
|
|
# specify git tag or commit hash here
|
|
|
|
def source_tag
|
|
|
|
ENV.fetch('SOURCE_TAG', nil)
|
|
|
|
end
|
|
|
|
|
|
|
|
def source_url
|
|
|
|
if source_tag
|
|
|
|
"#{source_base_url}/tree/#{source_tag}"
|
|
|
|
else
|
|
|
|
source_base_url
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def user_agent
|
|
|
|
@user_agent ||= "#{HTTP::Request::USER_AGENT} (Mastodon/#{Version}; +http#{Rails.configuration.x.use_https ? 's' : ''}://#{Rails.configuration.x.web_domain}/)"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|