pleroma/pleroma
4
6
Fork 12
Code Issues 352 Pull requests 40 Projects Releases 1 Packages 13 Wiki Activity

Irreversible filter works with user streaming. #6919

Open
kphrx wants to merge 7 commits from gitlab-mr-iid-3542 into develop
pull from: gitlab-mr-iid-3542
merge into: pleroma:develop
Conversation 0 Commits 7 Files changed 10 +201 -86
kphrx commented 2021-11-24 08:22:48 +00:00
Member
Copy link
  • irreversible only works for home and notification timelines in Mastodon.
  • In pleroma, notifications are irreversible, but the home timeline is not. So currently, filtered with SQL when getting them with the Timeline API, but not the Streaming API. It needs to be filtered before streaming.
- `irreversible` only works for home and notification timelines in Mastodon. - In pleroma, notifications are irreversible, but the home timeline is not. So currently, filtered with SQL when getting them with the Timeline API, but not the Streaming API. It needs to be filtered before streaming.
irreversible filter be dropped from home and notifications timeline, but not from public timeline
This pull request has changes conflicting with the target branch.
  • lib/pleroma/web/mastodon_api/websocket_handler.ex
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin gitlab-mr-iid-3542:gitlab-mr-iid-3542
git switch gitlab-mr-iid-3542

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff gitlab-mr-iid-3542
git switch gitlab-mr-iid-3542
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-3542
git switch gitlab-mr-iid-3542
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-3542
git switch develop
git merge --squash gitlab-mr-iid-3542
git switch develop
git merge --ff-only gitlab-mr-iid-3542
git switch develop
git merge gitlab-mr-iid-3542
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
AP C2S

   
AdminAPI

   
Breaking API
Affects clients

  
Breaks existing config

   
Check if still valid

   
Data Protection

   
Do not merge

   
Document in the changelog

   
Doing

   
Feature Request / Enhancement

   
MastoAPI

   
NL2
Improved Mobile Experience

  
NL4
Improved instance customization and QoL options

  
OStatus

   
OTP Releases

   
Refactor

   
Security

   
To Do

   
TwitterAPI

   
bug

   
complicated

   
confirmed

   
deps

   
discussion

   
documentation

   
easy

   
feature: to be merged in stable

   
fix: to be merged in stable

   
incident
Denotes a disruption to IT services and the associated issues require immediate attention

  
needs to be backported to maint

   
needs-changes

   
needs-info

   
needs-review

   
performance

   
regression

   
unclear
No labels
AP C2S
AdminAPI
Breaking API
Breaks existing config
Check if still valid
Data Protection
Do not merge
Document in the changelog
Doing
Feature Request / Enhancement
MastoAPI
NL2
NL4
OStatus
OTP Releases
Refactor
Security
To Do
TwitterAPI
bug
complicated
confirmed
deps
discussion
documentation
easy
feature: to be merged in stable
fix: to be merged in stable
incident
needs to be backported to maint
needs-changes
needs-info
needs-review
performance
regression
unclear
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
pleroma/pleroma!6919
No description provided.