06cc77e6fb
Merge branch 'faster-user-deactivation' into 'develop'
...
User: Don't pull remote users follower count immediately after deactivating.
Closes #1369
See merge request pleroma/pleroma!1933
5 years ago
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
5 years ago
0c31258616
User: Don't pull remote users follower count immediately after deactivating.
...
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.
Closes #1369
5 years ago
8dd7c099a7
Merge branch 'bugfix/streamer-follows' into 'develop'
...
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
5 years ago
74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
5 years ago
61bcd4595f
Merge branch 'feature/fast_sanitize' into 'develop'
...
Switching to FastSanitize
See merge request pleroma/pleroma!1916
5 years ago
4bf942583f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
5 years ago
1b83a0694a
Fix moderation log crash
5 years ago
d75934b0d0
Undo dialyzer fix
5 years ago
ced9f92327
Fix count
5 years ago
6f9d3d30fa
AdminAPI: Omit relay user from users list
5 years ago
59a149c69a
Fix "the call ... will never return" warning
5 years ago
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
5 years ago
363e76d4da
Fix duplicate recipients
5 years ago
ae59b38203
Rip out the rest of htmlsanitizeex
5 years ago
77cfb08b8c
Remove commented-out code
5 years ago
0c361eeb25
Add pending to handle incoming for Follow activity
5 years ago
08f6837065
Switch from HtmlSanitizeEx to FastSanitize
5 years ago
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
5 years ago
d56bc62275
Fix report parsing
5 years ago
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
5 years ago
0580654485
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
...
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
5 years ago
653054d301
Merge branch 'remove-unsed-info-fields-fn' into 'develop'
...
Remove unused Pleroma.User.info_fields/0
See merge request pleroma/pleroma!1882
5 years ago
dbee53c2df
Remove unused Pleroma.User.info_fields/0
5 years ago
2ab072f949
object fetcher error handling
5 years ago
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
b08b1d5d91
Store status data inside Flag activity
5 years ago
c0246309a5
[ #1304 ] Extra bullet-proofing.
5 years ago
065e9fac12
[ #1304 ] Adjusted User.Info references from Notification.
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
11cd994425
[ #1304 ] Fixed null::jsonb handling in User.Info migration.
5 years ago
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
6281e4795a
Merge branch 'feature/push-subject-for-dm' into 'develop'
...
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
5 years ago
6712b6e4de
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
...
Do not include notifications from blocked users when with_muted is set
See merge request pleroma/pleroma!1869
5 years ago
2dbee29cf5
Do not include notifications from blocked users when with_muted is set
...
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
5 years ago
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
5 years ago
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
a11a7176d5
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
c6fba62666
Fix Relay
5 years ago
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
b4cbf0568b
[ #1304 ] Analysis issue fix.
5 years ago
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
c9280b9730
rework to use properties instead of compound typing, per SocialCG
5 years ago
ef659331b0
implement invisible support for remote users
5 years ago
95871cb462
user: implement User.invisible?/1
5 years ago
1469a084d4
relay: set invisible to true
5 years ago
e7333db72a
user info: add invisible field
5 years ago
kaniini