Skip to content

Enable to show unlisted tagged toots on the hashtag timeline#32

Merged
takayamaki merged 3 commits intoimas:imastodonfrom
fvh-P:hashtag-timeline
Aug 9, 2017
Merged

Enable to show unlisted tagged toots on the hashtag timeline#32
takayamaki merged 3 commits intoimas:imastodonfrom
fvh-P:hashtag-timeline

Conversation

@fvh-P
Copy link
Copy Markdown
Collaborator

@fvh-P fvh-P commented Aug 6, 2017

Based on #29

Currently, only "public" toots with hashtags are flowing to the hashtag timeline (/api/v1/streaming/hashtag), but this modifying enables to flow "unlisted" toots to the hash tag timeline.

現在、ハッシュタグ付きのトゥートについてはpublicなもののみがハッシュタグタイムライン(/api/v1/streaming/hashtag)に流れていますが、unlistedなトゥートでもハッシュタグタイムラインに流れるようにします。

takayamaki
takayamaki previously approved these changes Aug 7, 2017
Copy link
Copy Markdown
Member

@takayamaki takayamaki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
LGTM

PRの規模的に念のため #34 を先にマージしてから取り込むつもり

@deflis deflis self-requested a review August 8, 2017 06:38
Copy link
Copy Markdown

@deflis deflis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

実際の確認まだしてないですが、懸念がありそうな雰囲気があるので修正依頼にしておきます。

end

return if status.account.silenced? || !status.public_visibility? || status.reblog?
return if status.account.silenced? || !status.public_visibility? && !status.unlisted_visibility? || status.reblog?
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

この下のif文も修正しないと、deliver_to_publicにunlistedも行かないですかね?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

あー書き忘れてましたね()
直します
あとrender_anonymous_payload(status)ってこのままで大丈夫ですかね

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unlistedなのにLTLまで流れて行ってしまうバグを見落とすとかあまりにもガバガバだったので恥じ入るばかり

render_anonymous_payloadはnodeにredis pub/sub経由でぶん投げるメッセージを生成しているだけなので問題なさそう

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ハッシュタグの付いたリプライはハッシュタグに乗るっぽいけど元からの仕様っぽいので大丈夫そう

@takayamaki takayamaki dismissed their stale review August 8, 2017 07:07

目が節穴だったことが判明しました(バグ見逃し

@fvh-P
Copy link
Copy Markdown
Collaborator Author

fvh-P commented Aug 8, 2017

記憶が1分も持たないことが判明しました(直しました

Copy link
Copy Markdown
Member

@takayamaki takayamaki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2017-08-08-164450_3840x2028_scrot
2017-08-08-164524_3840x2028_scrot

2017-08-08-165341_1920x2004_scrot
テスト用に使ってる南東タグのリンクをクリックすると初期表示用に/api/v1/timelines/tag/南東が呼ばれるのだけれど、その中で思いっきりdirectとprivateが漏れてる

@fvh-P
Copy link
Copy Markdown
Collaborator Author

fvh-P commented Aug 8, 2017

修正しました。自環境で確認したところ大丈夫でした。
確認お願いします。

@fvh-P fvh-P force-pushed the hashtag-timeline branch from cf3c547 to 81691c0 Compare August 8, 2017 08:18
@takayamaki
Copy link
Copy Markdown
Member

LGTM

Copy link
Copy Markdown

@deflis deflis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@takayamaki
Copy link
Copy Markdown
Member

というわけで #34 をマージした後でこっちも一緒に取り込みまーす

@takayamaki takayamaki merged commit 5d9dd46 into imas:imastodon Aug 9, 2017
@fvh-P fvh-P deleted the hashtag-timeline branch September 6, 2017 00:38
takayamaki pushed a commit to takayamaki/mastodon that referenced this pull request Nov 17, 2017
imas#32
* Enable to show unlisted tagged toots on the hashtag timeline

* Add missing conditional expression

* Correcting visibility filtering
YaQ00 referenced this pull request in YaQ00/mastodon Jan 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants