Haelwenn
657e1583f8
Merge branch 'features/put_if_present' into 'develop'
...
Create Pleroma.Maps.put_if_present(map, key, value, value_function // &{:ok, &1}) :: map
See merge request pleroma/pleroma!2436
2020-06-05 14:48:02 +00:00
Haelwenn
54bae06b4f
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
...
Unifies all the similar functions to one and simplify some blocks with it.
2020-06-05 14:48:02 +00:00
lain
115d08a754
Pipeline: Add a side effects step after the transaction finishes
...
This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously.
2020-06-05 16:47:02 +02:00
lain
65689ba9bd
If Credo fixes is so good, why is there no Credo fixes 2?
2020-06-05 13:10:48 +02:00
lain
f3ea6ee2c8
Credo fixes.
2020-06-05 12:45:25 +02:00
lain
0efa8aa0b9
Transmogrifier: For follows, create notifications last.
...
As the notification type changes depending on the follow state,
the notification should not be created and streamed out before the
state settles. For this reason, the notification creation has been
delayed until it's clear if the user has been followed or not.
This is a bit hacky but it will be properly rewritten using the
pipeline soon.
2020-06-05 12:26:07 +02:00
lain
cc8a7dc205
SideEffects / ChatView: Add an unread cache.
...
This is to prevent wrong values in the stream.
2020-06-05 12:01:33 +02:00
lain
aa2ac76510
Notification: Don't break on figuring out the type of old EmojiReactions
2020-06-04 20:40:46 +02:00
lain
d44da91bbf
SubscriptionOperation: Let chat mentions through.
2020-06-04 20:28:33 +02:00
Egor Kislitsyn
317e2b8d61
Use atoms as keys in ActivityPub.fetch_* functions options
2020-06-04 21:36:26 +04:00
lain
74edd4f391
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-04 19:24:07 +02:00
lain
56dfa0e0fb
Transmogrifier: Update notification after accepting.
2020-06-04 19:22:49 +02:00
lain
9a53f619e0
Apply suggestion to test/chat_message_reference_test.exs
2020-06-04 15:16:15 +00:00
lain
41503b1673
Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs
2020-06-04 15:16:10 +00:00
lain
00748e9650
ChatMessageReferences: Change seen -> unread
2020-06-04 17:14:42 +02:00
stwf
a42d135cce
test fix
2020-06-04 10:51:24 -04:00
minibikini
b57e4ad1ab
Merge branch 'develop' into 'openapi/admin/relay'
...
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04 13:29:32 +00:00
lain
f5cb1f3616
Merge branch 'openapi/admin/config' into 'develop'
...
Add OpenAPI spec to AdminAPI.ConfigController
See merge request pleroma/pleroma!2606
2020-06-04 13:00:13 +00:00
lain
6e103a18af
Docs: Document WebPush changes.
2020-06-04 14:49:36 +02:00
lain
b952f3f379
WebPush: Push out chat message notications.
2020-06-04 14:49:10 +02:00
lain
5d7dda883e
SideEffectsTest: More tests.
2020-06-04 14:46:41 +02:00
Egor Kislitsyn
a8132690bd
Fix credo
2020-06-04 13:46:13 +04:00
Egor Kislitsyn
70f054b083
Merge branch 'develop' into openapi/admin/relay
2020-06-04 13:30:14 +04:00
Egor Kislitsyn
b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
2020-06-04 13:28:00 +04:00
stwf
75e886b506
fix config
2020-06-03 17:32:03 -04:00
stwf
906ac57ba8
Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
...
# Conflicts:
# lib/pleroma/web/preload/status_net.ex
2020-06-03 17:25:53 -04:00
stwf
5677b21e82
clean up
2020-06-03 17:24:35 -04:00
stwf
3b8180d7d1
add status_net/config
2020-06-03 16:34:03 -04:00
stwf
dbcc1b105e
encode data properly
2020-06-03 16:34:03 -04:00
stwf
29ae5bb771
preload data into index.html
2020-06-03 16:34:03 -04:00
lain
e46aecda55
Notification: Fix notifications backfill for compacted activities
2020-06-03 20:51:59 +02:00
stwf
aa26dc6a13
add status_net/config
2020-06-03 13:40:48 -04:00
lain
e213e31577
Changelog: Add chats to changelog.
2020-06-03 19:25:57 +02:00
lain
286bd8eb83
Docs: Add mark_message_as_read to docs
2020-06-03 19:24:37 +02:00
lain
b3407344d3
ChatController: Add function to mark single message as read.
2020-06-03 19:21:23 +02:00
lain
d6693a9102
Merge branch 'openapi/admin/reports' into 'develop'
...
Add OpenAPI spec for AdminAPI.ReportController
See merge request pleroma/pleroma!2628
2020-06-03 17:00:59 +00:00
lain
c020fd4352
ChatMessageReferenceView: Return read status as unread.
2020-06-03 18:58:58 +02:00
Egor Kislitsyn
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
2020-06-03 19:17:05 +04:00
Egor Kislitsyn
9d572f2f66
Move report actions to AdminAPI.ReportController
2020-06-03 19:17:04 +04:00
lain
fb4ae9c720
Streamer, SideEffects: Stream out ChatMessageReferences
...
Saves us a few calles to fetch things from the DB that we already
have.
2020-06-03 16:45:04 +02:00
Haelwenn
18b050dfd1
Merge branch 'openapi/update-admin-api/status' into 'develop'
...
Update OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2624
2020-06-03 14:04:12 +00:00
lain
903955b189
FollowingRelationship: Remove meaningless change
2020-06-03 14:40:44 +02:00
lain
7b79871e97
Migrations: Add chat_id, seen index to ChatMessageReferences
...
This ensures fast count of unseen messages
2020-06-03 14:34:33 +02:00
lain
1e9efcf7c3
Migrations: Fix migration module name
2020-06-03 14:27:54 +02:00
lain
7f5c5b11a5
Chats: Remove unread from the db, calculate from unseen messages.
2020-06-03 14:26:50 +02:00
lain
d28d88766b
Merge branch 'admin-api/account-view' into 'develop'
...
Use AdminAPI.StatusView in api/admin/users
Closes #1836
See merge request pleroma/pleroma!2627
2020-06-03 11:28:56 +00:00
lain
8edead7c1d
Migration: Remove superfluous imports
2020-06-03 13:19:38 +02:00
lain
73127cff75
Credo fixes.
2020-06-03 13:17:29 +02:00
lain
6413e06a86
Migrations: Add unique index to ChatMessageReferences.
2020-06-03 13:13:44 +02:00
lain
2591745fc2
ChatMessageReferences: Move tests
2020-06-03 12:56:39 +02:00
