norm/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
10096 commits 32 branches 57 tags 277 MiB
Commit graph

130 commits

Author SHA1 Message Date
Maksim Pechnikov
cd040691bd maked unread_count as virtual field 2020-02-10 09:01:45 +03:00
Maksim Pechnikov
e442ea5722 Merge branch 'develop' into issue/1276 2020-01-27 15:20:47 +03:00
lain
615b72238e Notifications: Add emoji reaction notifications 2020-01-22 20:06:12 +01:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5 2020-01-20 12:17:14 +01:00
Ivan Tashkinov
7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. 2019-12-15 22:32:42 +03:00
Maksim Pechnikov
95e6a2acd9 Merge branch 'develop' into issue/1342 2019-12-08 21:25:26 +03:00
Maksim Pechnikov
6fbafb1cdc Merge branch 'develop' into issue/1276 2019-12-08 20:14:28 +03:00
rinpatch
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
Maksim Pechnikov
3fe7a1fd35 Merge branch 'develop' into issue/1342 2019-12-05 15:46:27 +03:00
Maksim Pechnikov
49bb0a130f Merge branch 'develop' into issue/1276 2019-12-05 12:22:19 +03:00
Ivan Tashkinov
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
lain
e9993acdbb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel 2019-12-04 16:35:59 +01:00
Egor Kislitsyn
624e720aa4 Add with_move query param to the notifications API 2019-12-03 22:13:38 +07:00
Maksim Pechnikov
a52da55eb9 added User.NotificationSetting struct 2019-11-28 22:08:30 +03:00
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification 2019-11-27 17:52:02 +07:00
Ivan Tashkinov
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
Ivan Tashkinov
c31ddce51e [#1335] Reorganized users.mutes as relation to UserMute entity. 2019-11-15 21:38:54 +03:00
Ivan Tashkinov
3db988250b [#1335] User: refactored :blocks field into :blocked_users relation. 
Introduced UserBlock.
 2019-11-10 16:30:21 +03:00
lain
1bd1f62af5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel 2019-11-05 15:21:00 +01:00
Maksim Pechnikov
99cf1ef9be Merge branch 'develop' into issue/1276 2019-10-24 09:23:59 +03:00
Maksim Pechnikov
d3fb9e02cc add tests 2019-10-23 22:48:04 +03:00
Ivan Tashkinov
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
Maksim Pechnikov
9a4afbd2a0 added update unread_count for notifications 2019-10-23 11:22:48 +03:00
rinpatch
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
lain
15bbc34c07 Tests: Capture log. 2019-10-18 12:44:53 +02:00
Ivan Tashkinov
10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
lain
6e4f52f8a2 Introduce new ingestion pipeline structure, implement internal Likes with it. 2019-10-16 16:16:39 +02:00
rinpatch
e9d1aa75d5 Revert subscription refactoring. 
As discussed in pleroma-meta#2

This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
 2019-09-29 18:43:27 +03:00
Roman Chvanikov
b4b147000c Merge develop 2019-09-26 10:38:54 +03:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019 
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
 2019-09-18 23:21:11 +02:00
Roman Chvanikov
76c3e290fc Merge develop 2019-09-16 20:30:42 +03:00
Egor Kislitsyn
96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'" 
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
 2019-09-16 17:55:04 +07:00
kaniini
c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'" 
This reverts merge request !1653
 2019-09-16 09:09:21 +00:00
Steven Fuchs
aab264db82 Streamer refactoring 2019-09-16 07:44:03 +00:00
Roman Chvanikov
0bd2b85edb Separate Subscription Notifications from regular Notifications 2019-09-13 18:25:27 +03:00
Ivan Tashkinov
ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs
 2019-09-06 13:26:05 +03:00
rinpatch
90c2dae9a4 Remove most of Pleroma.Web.TwitterAPI.TwitterAPI 2019-08-31 10:20:34 +03:00
Ivan Tashkinov
0e1c481a94 [#1149] Added more oban workers. Refactoring. 2019-08-13 20:20:26 +03:00
Roman Chvanikov
9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
Ariadne Conill
492d854e7a transmogrifier: use User.delete() instead of handrolled user deletion code for remote users 
Closes #1104
 2019-07-28 21:32:04 +00:00
Roman Chvanikov
d2da3d30f3 Merge branch 'develop' into feature/digest-email 2019-07-24 16:37:52 +03:00
Mark Felder
ec7b085b76 Fix test 2019-07-23 13:57:22 -05:00
Mark Felder
fd287387a0 Do not notify subscribers for messages from users which are replies to others 2019-07-23 13:14:26 -05:00
Roman Chvanikov
c729883936 Merge branch 'develop' into feature/digest-email 2019-07-14 21:43:30 +03:00
Alexander Strizhakov
e7c39b7ac8 Feature/1072 muting notifications 2019-07-14 13:29:31 +00:00
Roman Chvanikov
657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
Maksim
a04bf131e0 [#570] add user:notification stream 2019-06-16 10:33:25 +00:00
Mark Felder
6ef145b4fc Merge branch 'develop' into feature/digest-email 2019-06-03 15:29:53 -05:00
William Pitcock
45e4642a58 tests: chase remote/local removal 2019-05-26 00:20:54 +00:00
William Pitcock
0f7eeb0943 tests: add tests for non-follows/non-followers settings 2019-05-25 05:25:40 +00:00
Roman Chvanikov
0f0cc2703b Merge develop 2019-04-30 20:17:52 +07:00
Egor
b9cdf6d3b9 Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
Roman Chvanikov
724311e151 Fix Credo warnings 2019-04-20 19:57:43 +07:00
Roman Chvanikov
bc7862106d Fix tests 2019-04-19 23:26:41 +07:00
Roman Chvanikov
aeafa0b2ef Add Notification.for_user_since/2 2019-04-19 22:16:17 +07:00
Roman Chvanikov
2f0203a4a1 Resolve conflicts 2019-04-17 16:59:05 +07:00
Roman Chvanikov
dc21181f65 Update updated_at field on notification read 2019-04-14 22:29:05 +07:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
Sadposter
76fdfd1c7f Add check on activity visibility in sub notification 2019-04-07 15:11:29 +01:00
Sadposter
a270e7a191
Mix format everything 2019-04-05 17:07:58 +01:00
Sadposter
f6e131eeb9 Don't use twitterAPI for subscription tests 2019-04-05 17:02:09 +01:00
Sadposter
06cd547fc6 Format subscriptions related stuff 2019-04-05 15:30:34 +01:00
Sadposter
75c4ceb4a2 Add tests for subscriptions 2019-04-05 15:30:29 +01:00
eugenijm
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
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00
Haelwenn (lanodan) Monnier
74579115a7
test: Change lenght(…) == 0 to Enum.empty?(…) 2019-02-11 03:44:16 +01:00
Haelwenn (lanodan) Monnier
8bb7e19b38
test: de-group alias/es 2019-02-11 03:44:15 +01:00
Sadposter
042852ecf3 Add check to prevent multiple follow notifications from the same user 2019-01-05 22:54:25 +00:00
William Pitcock
3c08d229db tests: add legal boilerplate 2018-12-23 20:57:10 +00:00
Maksim Pechnikov
89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
William Pitcock
dfc26d0fdd tests: add testing for new notification behavior 2018-11-09 09:37:12 +00:00
William Pitcock
50bf174651 tests: add tests for Notification.set_read_up_to() 2018-11-06 23:02:55 +00:00
William Pitcock
504a25f812 tests: add notification smoketests (ref #265) 2018-08-26 22:42:02 +00:00
Pierrick Brun
89603eda9e do not create notification for yourself 2018-05-11 11:31:17 +02:00
lain
4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
lain
26ccb768d3 Make test output easier to read. 2018-02-12 10:14:11 +01:00
Roger Braun
4501094606 Make specs less breaky. 2018-01-30 12:20:14 +01:00
eal
e6a78c6ed0 MastoAPI: Add notification get, clear and dismiss. 2017-11-10 15:24:52 +02:00
Roger Braun
632da6c927 Don't create notifications if the user is blocked. 2017-11-02 22:08:22 +01:00
Roger Braun
61adf676d5 Add basic mastodon notification support. 2017-09-11 18:53:19 +02:00