fe7a0d660e
Merge branch 'develop' into issue/1276-2
2020-05-04 06:08:49 +03:00
92efb888c7
Made follow request notifications non-optional (removed config switch).
2020-05-01 09:51:41 +03:00
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03:00
bef34568f0
Dismiss the follow request notification on rejection
2020-04-30 18:38:19 +03:00
6aa116eca7
Create activity handling: Flip it and reverse it
...
Both objects and create activities will now go through the common
pipeline and will be validated. Objects are now created as a side
effect of the Create activity, rolling back a transaction if it's
not possible to insert the object.
2020-04-28 16:26:19 +02:00
b03aeae8b9
Apply suggestion to lib/pleroma/notification.ex
2020-04-22 15:31:41 +00:00
bb5d0eafa4
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
2020-04-21 08:20:50 +03:00
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
f7e623c11c
[ #1364 ] Resolved merge conflicts with `develop`.
2020-04-14 20:19:08 +03:00
0cda80f266
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 20:10:02 +03:00
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
650853fc89
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 11:58:38 +03:00
99b0bc1989
[ #1364 ] Resolved merge conflicts with `develop`. Refactoring.
2020-04-13 13:24:31 +03:00
c556efb761
[ #1364 ] Enabled notifications on followed domain-blocked users' activities.
2020-04-12 21:53:03 +03:00
88b16fdfb7
[ #1364 ] Disabled notifications on activities from blocked domains.
2020-04-11 16:01:09 +03:00
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
3fa3d45dbe
[ #1364 ] Minor improvements / comments.
...
Further fixes of incorrect usage of "relations" as a short form of "relationships".
2020-03-25 13:05:00 +03:00
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
7438833685
[ #1364 ] Improved notification-related tests.
2020-03-16 21:58:10 +03:00
f3791add99
removing with_move parameter
2020-03-16 20:07:45 +03:00
7c8003c3fc
[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
2020-03-15 21:00:12 +03:00
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
cd040691bd
maked `unread_count` as virtual field
2020-02-10 09:01:45 +03:00
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +03:00
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
e442ea5722
Merge branch 'develop' into issue/1276
2020-01-27 15:20:47 +03:00
615b72238e
Notifications: Add emoji reaction notifications
2020-01-22 20:06:12 +01:00
b3c80b8404
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
...
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
2019-12-09 14:55:42 +00:00
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
2019-12-08 13:07:05 +00:00
3fe7a1fd35
Merge branch 'develop' into issue/1342
2019-12-05 15:46:27 +03:00
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
624e720aa4
Add `with_move` query param to the notifications API
2019-12-03 22:13:38 +07:00
a52da55eb9
added User.NotificationSetting struct
2019-11-28 22:08:30 +03:00
555edd01ab
[ #1335 ] User AP ID relations fetching performance optimizations.
2019-11-20 12:19:07 +03:00
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19 23:22:10 +03:00
b5b62f42b2
update Marker.multi_set_unread_count
2019-11-12 15:59:34 +03:00
27cd1374e3
Add a notification for Move activities
2019-11-12 18:48:14 +07:00
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
2019-11-11 23:57:30 +03:00
ddbfc995ac
clean sql query
2019-11-11 17:06:41 +03:00
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
922e3d082c
add test
2019-10-24 12:17:50 +03:00
99cf1ef9be
Merge branch 'develop' into issue/1276
2019-10-24 09:23:59 +03:00
065e9fac12
[ #1304 ] Adjusted User.Info references from Notification.
2019-10-23 17:31:02 +03:00
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
9a4afbd2a0
added update unread_count for notifications
2019-10-23 11:22:48 +03:00
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.
2019-10-21 19:27:38 +03:00
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
2019-10-20 20:43:18 +03:00
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
b4b147000c
Merge develop
2019-09-26 10:38:54 +03:00
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
2019-09-25 17:14:31 +07:00
76c3e290fc
Merge develop
2019-09-16 20:30:42 +03:00
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
0bd2b85edb
Separate Subscription Notifications from regular Notifications
2019-09-13 18:25:27 +03:00
7c3838090f
Apply suggestion to lib/pleroma/notification.ex
2019-09-04 10:14:15 +00:00
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
2019-09-04 12:38:27 +03:00
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
33fd4c0ed7
query fix
2019-07-15 20:53:52 +03:00
168dc97c37
Make opts optional in Pleroma.Notification.for_user_query/2
2019-07-14 22:04:55 +03:00
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
6426301407
notifications: fix notification generation for non-create activities
...
in 300d94c62
2019-06-22 06:44:47 +00:00
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
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
2019-06-01 16:17:46 +03:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
750ede5764
notification: remove local/remote match rules (too complicated)
2019-05-26 00:05:47 +00:00
4030837d91
notification: add non_follows/non_followers notification control settings
2019-05-25 05:19:47 +00:00
0f0cc2703b
Merge develop
2019-04-30 20:17:52 +07:00
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
b9cdf6d3b9
Use `User.get_cached*` everywhere
2019-04-22 07:20:43 +00:00
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
aeafa0b2ef
Add Notification.for_user_since/2
2019-04-19 22:16:17 +07:00
dc21181f65
Update updated_at field on notification read
2019-04-14 22:29:05 +07:00
711ade961e
adding destroy multiple for mastofe
2019-04-12 02:28:46 +00:00
db4badc6aa
move user disable into deactivation
2019-04-11 17:22:42 +07:00
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-11 15:51:52 +07:00
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
007762e767
Add notification checks
2019-04-05 15:30:23 +01:00
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
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
2019-03-28 07:52:07 +03:00
aabcecb269
notification: formatting
2019-03-23 02:30:53 +00:00
9a06d9f6e8
notification: preload child objects
2019-03-23 02:28:57 +00:00
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
eb84de0143
allow users to disable their own account
2019-03-04 19:55:11 +07:00
ac72b578da
Merge branch 'develop' into feature/thread-muting
2019-02-11 12:10:49 +01:00
Maksim Pechnikov