You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

86 lines
1.7 KiB

Bringing Hometown up to date with mastodon/mastodon (#1371) This is a massive PR, so apologies for the poor performance viewing it! This merges in the content of Mastodon 4.3.0. *This PR isn't ready to deploy to production*, and I don't recommend trying it in a production environment. Since I started by merging 4.3.0, this will likely have reverted at least some of the content of the post-4.3.0 security patches in the 4.2.x series; those will be brought back as I merge in 4.4.0 and 4.5.0. I haven't yet tested this PR, so it may not actually run without additional tweaks. I'm putting it up now for discussion and so multiple people can test if we want. --- Here's a few notes on things I ran into and thoughts I had while working on it: * We may want to look at `server_banner.jsx,` where I ended up undoing the v3-style rewrite due to the new react component being used. I'm not sure what the current goal for it is. * I may not have 100% merged in all content from `status_action_bar` correctly. * There's a number of places where I updated the links for remote usernames, and they should be tested to make sure they work. They're all `<Permalink>` elements. I have in my notes that `status_content` might need double-checking. * I may also not have gotten the spoiler display right in `status_content`. * It looks like previous versions of Hometown had customizations to the `media_item` display, not all of which was preserved as-is due to surrounding rewrites. I'm not sure what the vision is and could use another set of eyes. * The character count rendering clashed with the newly-introduced handling of a character count variable upstream, and I'm not sure if the version I've got here 100% works or not. * The navigation bar was completely rewritten and no longer has the components Hometown was customizing; did I properly catch any replacements? Did we handle all links to accounts to make sure they go to the remote instance? * Polls: I reverted the single/multiple choice toggle because upstream has an actual proper UI for this that should be integrated in one of the versions we’re merging in. Please double-check that the current version looks fine to you. * The font icons will need double-checking. Hometown made some custom use of the font-awesome icons, while Mastodon 4.3.0 replaced font-awesome with something else. I may not have caught all places that font-awesome icons were being used. * We’ll want to make sure the post display is correct, including Hometown customizations, because the previous static post page has been replaced with the React one. --------- Co-authored-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Matt Jankowski <matt@jankowski.online> Co-authored-by: Renaud Chaput <renchap@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: David Roetzel <david@roetzel.de> Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com> Co-authored-by: Jeong Arm <kjwonmail@gmail.com> Co-authored-by: Christian Schmidt <github@chsc.dk> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Darius Kazemi <darius.kazemi@gmail.com> Co-authored-by: diondiondion <mail@diondiondion.com> Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com> Co-authored-by: Shugo Maeda <shugo.maeda@gmail.com> Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com> Co-authored-by: Shlee <github@shl.ee> Co-authored-by: Joshua Rogers <MegaManSec@users.noreply.github.com> Co-authored-by: Jessica Stokes <hello@jessicastokes.net> Co-authored-by: PGray <77597544+PGrayCS@users.noreply.github.com>
3 weeks ago
# frozen_string_literal: true
class AsyncRefresh
extend Redisable
include Redisable
NEW_REFRESH_EXPIRATION = 1.day
FINISHED_REFRESH_EXPIRATION = 1.hour
def self.find(id)
redis_key = Rails.application.message_verifier('async_refreshes').verify(id)
new(redis_key) if redis.exists?(redis_key)
rescue ActiveSupport::MessageVerifier::InvalidSignature
nil
end
def self.create(redis_key, count_results: false)
data = { 'status' => 'running' }
data['result_count'] = 0 if count_results
redis.hset(redis_key, data)
redis.expire(redis_key, NEW_REFRESH_EXPIRATION)
new(redis_key)
end
def self.exists?(redis_key)
redis.exists?(redis_key)
end
attr_reader :status, :result_count
def initialize(redis_key)
@redis_key = redis_key
fetch_data_from_redis
end
def id
Rails.application.message_verifier('async_refreshes').generate(@redis_key)
end
def running?
@status == 'running'
end
def finished?
@status == 'finished'
end
def finish!
redis.pipelined do |pipeline|
pipeline.hset(@redis_key, { 'status' => 'finished' })
pipeline.expire(@redis_key, FINISHED_REFRESH_EXPIRATION)
end
@status = 'finished'
end
def increment_result_count(by: 1)
redis.hincrby(@redis_key, 'result_count', by)
fetch_data_from_redis
end
def reload
fetch_data_from_redis
self
end
def to_json(_options)
{
async_refresh: {
id:,
status:,
result_count:,
},
}.to_json
end
private
def fetch_data_from_redis
@status, @result_count = redis.pipelined do |pipeline|
pipeline.hget(@redis_key, 'status')
pipeline.hget(@redis_key, 'result_count')
end
@result_count = @result_count.presence&.to_i
end
end