a2a64ecd3e
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
64 lines
966 B
Ruby
64 lines
966 B
Ruby
# frozen_string_literal: true
|
|
|
|
module Mastodon
|
|
module Version
|
|
module_function
|
|
|
|
def major
|
|
2
|
|
end
|
|
|
|
def minor
|
|
7
|
|
end
|
|
|
|
def patch
|
|
0
|
|
end
|
|
|
|
def pre
|
|
nil
|
|
end
|
|
|
|
def flags
|
|
'rc1'
|
|
end
|
|
|
|
def to_a
|
|
[major, minor, patch, pre].compact
|
|
end
|
|
|
|
def suffix
|
|
'+glitch'
|
|
end
|
|
|
|
def to_s
|
|
[to_a.join('.'), flags, suffix].join
|
|
end
|
|
|
|
def repository
|
|
'glitch-soc/mastodon'
|
|
end
|
|
|
|
def source_base_url
|
|
"https://github.com/#{repository}"
|
|
end
|
|
|
|
# specify git tag or commit hash here
|
|
def 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
|