|
|
|
|
# frozen_string_literal: true
|
|
|
|
|
|
|
|
|
|
require 'rails_helper'
|
|
|
|
|
|
|
|
|
|
RSpec.describe HomeFeed do
|
|
|
|
|
subject { described_class.new(account) }
|
|
|
|
|
|
|
|
|
|
let(:account) { Fabricate(:account) }
|
|
|
|
|
|
|
|
|
|
describe '#get' do
|
|
|
|
|
before do
|
|
|
|
|
Fabricate(:status, account: account, id: 1)
|
|
|
|
|
Fabricate(:status, account: account, id: 2)
|
|
|
|
|
Fabricate(:status, account: account, id: 3)
|
|
|
|
|
Fabricate(:status, account: account, id: 10)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
context 'when feed is generated' do
|
|
|
|
|
before do
|
|
|
|
|
redis.zadd(
|
|
|
|
|
FeedManager.instance.key(:home, account.id),
|
|
|
|
|
[[4, 4], [3, 3], [2, 2], [1, 1]]
|
|
|
|
|
)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
it 'gets statuses with ids in the range from redis' do
|
|
|
|
|
results = subject.get(3)
|
|
|
|
|
|
|
|
|
|
expect(results.map(&:id)).to eq [3, 2]
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
context 'when feed is being generated' do
|
|
|
|
|
before do
|
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
|
|
|
redis.hset("account:#{account.id}:regeneration", { 'status' => 'running' })
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
it 'returns nothing' do
|
|
|
|
|
results = subject.get(3)
|
|
|
|
|
|
|
|
|
|
expect(results.map(&:id)).to eq []
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
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
|
|
|
|
|
|
|
|
describe '#regenerating?' do
|
|
|
|
|
context 'when an old-style string key is still in use' do
|
|
|
|
|
it 'upgrades the key to a hash' do
|
|
|
|
|
redis.set("account:#{account.id}:regeneration", true)
|
|
|
|
|
|
|
|
|
|
expect(subject.regenerating?).to be true
|
|
|
|
|
|
|
|
|
|
expect(redis.type("account:#{account.id}:regeneration")).to eq 'hash'
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
context 'when feed is being generated' do
|
|
|
|
|
before do
|
|
|
|
|
redis.hset("account:#{account.id}:regeneration", { 'status' => 'running' })
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
it 'returns `true`' do
|
|
|
|
|
expect(subject.regenerating?).to be true
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
context 'when feed is not being generated' do
|
|
|
|
|
context 'when the job is marked as finished' do
|
|
|
|
|
before do
|
|
|
|
|
redis.hset("account:#{account.id}:regeneration", { 'status' => 'finished' })
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
it 'returns `false`' do
|
|
|
|
|
expect(subject.regenerating?).to be false
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
context 'when the job key is missing' do
|
|
|
|
|
it 'returns `false`' do
|
|
|
|
|
expect(subject.regenerating?).to be false
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
describe '#regeneration_in_progress!' do
|
|
|
|
|
context 'when an old-style string key is still in use' do
|
|
|
|
|
it 'upgrades the key to a hash' do
|
|
|
|
|
redis.set("account:#{account.id}:regeneration", true)
|
|
|
|
|
|
|
|
|
|
subject.regeneration_in_progress!
|
|
|
|
|
|
|
|
|
|
expect(redis.type("account:#{account.id}:regeneration")).to eq 'hash'
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
it 'sets the corresponding key in redis' do
|
|
|
|
|
expect(redis.exists?("account:#{account.id}:regeneration")).to be false
|
|
|
|
|
|
|
|
|
|
subject.regeneration_in_progress!
|
|
|
|
|
|
|
|
|
|
expect(redis.exists?("account:#{account.id}:regeneration")).to be true
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
describe '#regeneration_finished!' do
|
|
|
|
|
context 'when an old-style string key is still in use' do
|
|
|
|
|
it 'upgrades the key to a hash' do
|
|
|
|
|
redis.set("account:#{account.id}:regeneration", true)
|
|
|
|
|
|
|
|
|
|
subject.regeneration_finished!
|
|
|
|
|
|
|
|
|
|
expect(redis.type("account:#{account.id}:regeneration")).to eq 'hash'
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
it "sets the corresponding key's status to 'finished'" do
|
|
|
|
|
redis.hset("account:#{account.id}:regeneration", { 'status' => 'running' })
|
|
|
|
|
|
|
|
|
|
subject.regeneration_finished!
|
|
|
|
|
|
|
|
|
|
expect(redis.hget("account:#{account.id}:regeneration", 'status')).to eq 'finished'
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|