49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
624e720aa4
Add `with_move` query param to the notifications API
5 years ago
a52da55eb9
added User.NotificationSetting struct
5 years ago
555edd01ab
[ #1335 ] User AP ID relations fetching performance optimizations.
5 years ago
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
b5b62f42b2
update Marker.multi_set_unread_count
5 years ago
27cd1374e3
Add a notification for Move activities
5 years ago
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
5 years ago
ddbfc995ac
clean sql query
5 years ago
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
922e3d082c
add test
5 years ago
99cf1ef9be
Merge branch 'develop' into issue/1276
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
9a4afbd2a0
added update unread_count for notifications
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
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
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
5 years ago
b4b147000c
Merge develop
5 years ago
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
76c3e290fc
Merge develop
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
7c3838090f
Apply suggestion to lib/pleroma/notification.ex
5 years ago
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
9bca70b10a
Merge develop
5 years ago
33fd4c0ed7
query fix
5 years ago
168dc97c37
Make opts optional in Pleroma.Notification.for_user_query/2
5 years ago
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
657277ffc0
Resolve conflicts
5 years ago
6426301407
notifications: fix notification generation for non-create activities
...
in 300d94c62
5 years ago
a04bf131e0
[ #570 ] add user:notification stream
5 years ago
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
5 years ago
ce47017c89
Merge develop
5 years ago
750ede5764
notification: remove local/remote match rules (too complicated)
5 years ago
4030837d91
notification: add non_follows/non_followers notification control settings
5 years ago
0f0cc2703b
Merge develop
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
aeafa0b2ef
Add Notification.for_user_since/2
6 years ago
dc21181f65
Update updated_at field on notification read
6 years ago
711ade961e
adding destroy multiple for mastofe
6 years ago
db4badc6aa
move user disable into deactivation
6 years ago
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
007762e767
Add notification checks
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
6 years ago
aabcecb269
notification: formatting
6 years ago
9a06d9f6e8
notification: preload child objects
6 years ago
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
43fb03be5a
Allow to mark a single notification as read
6 years ago
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
eb84de0143
allow users to disable their own account
6 years ago
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
638456ce8f
elixir too new for CI's mix format lol
6 years ago
a0d732ec55
it works!!
6 years ago
6a6a5b3251
de-group alias/es
6 years ago
8018ae7ae5
Join on preloads to avoid N+1 queries
6 years ago
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
9274cabe01
Use correct logic to determine "attentions" list
6 years ago
28d77e373c
Flake Ids for Users and Activities
6 years ago
042852ecf3
Add check to prevent multiple follow notifications from the same user
6 years ago
980b5288ed
update copyright years to 2019
6 years ago
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
6 years ago
ca2e9ce9cc
Revert unneeded changes
6 years ago
2bbec33c71
Fix failing tests
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
074fa790ba
fix compile warnings
6 years ago
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
04a48286e6
Add web push support
6 years ago
b3c360ce2c
notification: add fallback get_notified_from_activity()
6 years ago
cdfdd77e30
notification: implement new Notification.get_notified_from_activity()
6 years ago
f16c2e0b1b
notification: add Notification.set_read_up_to()
6 years ago
89603eda9e
do not create notification for yourself
6 years ago
4afbef39f4
Format the code.
7 years ago
59770c3f5c
Fix all compilation warnings
7 years ago
a743940463
MastoAPI: Implement all streaming functions.
7 years ago
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
7 years ago
632da6c927
Don't create notifications if the user is blocked.
7 years ago
cda01285f4
Add pagination to notifications.
7 years ago
464c33e9a1
Add follow notifications.
7 years ago
3bad294058
Add reblogs to notifications.
7 years ago
bcce3e5dd2
Add favorites to notifications.
7 years ago
61adf676d5
Add basic mastodon notification support.
7 years ago
Maksim Pechnikov