sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,248 Commits 1 Branch 0 Tags 184 MiB
81293e5aad
Commit Graph

1784 Commits

Author SHA1 Message Date
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
Egor Kislitsyn
317e2b8d61
Use atoms as keys in ActivityPub.fetch_* functions options 2020-06-04 21:36:26 +04:00
lain
56dfa0e0fb Transmogrifier: Update notification after accepting. 2020-06-04 19:22:49 +02:00
lain
00748e9650 ChatMessageReferences: Change seen -> unread 2020-06-04 17:14:42 +02:00
Egor Kislitsyn
c16315d055
Add OpenAPI spec for AdminAPI.ReportController 2020-06-03 19:17:05 +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
lain
7f5c5b11a5 Chats: Remove unread from the db, calculate from unseen messages. 2020-06-03 14:26:50 +02:00
lain
aa22fce8f4 ChatMessageReference: Introduce and switch in chat controller. 2020-06-03 12:30:12 +02:00
lain
879304dcd9 Merge branch 'replies-domain-block' into 'develop' 
Replies domain block

Closes #1650

See merge request pleroma/pleroma!2622
 2020-06-02 14:14:23 +00:00
lain
904295d53b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-02 14:28:01 +02:00
lain
805ab86933 Notifications: Make notifications save their type. 2020-06-02 13:24:34 +02:00
rinpatch
165a4b2a69 Do not include activities of invisible users unless explicitly requested 
Closes #1833
 2020-06-02 13:34:12 +03:00
Alexander Strizhakov
19f468c5bc
replies filtering for blocked domains 2020-06-02 09:00:10 +03:00
Alexander Strizhakov
7e6ec778d9
exclude replies on blocked domains 2020-06-01 21:17:32 +03:00
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-06-01 15:48:51 +04:00
lain
6ff079ca9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-30 12:31:12 +02:00
lain
2c9465cc51 SafeText: Let through basic html. 2020-05-30 12:17:18 +02:00
Haelwenn (lanodan) Monnier
a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox 2020-05-29 16:14:45 +02:00
Haelwenn (lanodan) Monnier
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S 2020-05-29 16:14:45 +02:00
lain
3898dd69a6 SideEffects: Ensure a chat is present before streaming something out. 2020-05-29 16:05:02 +02:00
lain
863c02b25d SideEffects: Stream out chat messages. 2020-05-29 15:44:03 +02:00
lain
9848978109 Merge branch 'fix-relay-repeat-notification' into 'develop' 
Fix relay repeat notification

See merge request pleroma/pleroma!2590
 2020-05-29 10:42:49 +00:00
lain
af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-29 12:36:17 +02:00
kPherox
228ff3760e
Use User.is_internal_user? instead 2020-05-29 19:07:05 +09:00
kPherox
9df5b1e6ae
Don't make relay announce notification 2020-05-29 19:06:38 +09:00
kPherox
48fd9be65a
Exclude post actor from to of relay announce 2020-05-27 23:51:15 +09:00
rinpatch
d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop' 
Fix ObjectView calling into strange functions

Closes #1807

See merge request pleroma/pleroma!2580
 2020-05-27 14:17:12 +00:00
lain
7e13200869 ActivityPub: Change ordering to nulls last in favorites query 
This makes it use our existing index and speeds up the query.
 2020-05-27 09:46:12 +02:00
Ivan Tashkinov
d7a57004ef [#1501] Made user feed contain public and unlisted activities. 2020-05-25 23:27:47 +03:00
lain
6bd7070b00 Transmogrifier: Use a simpler way to get mentions. 2020-05-25 15:08:43 +02:00
lain
ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-25 13:57:27 +02:00
lain
355aa3bdc7 ActivityPubController: Add Mastodon activity compat route. 2020-05-22 17:06:12 +02:00
lain
ca755f9a73 ActivityPubController: Add Mastodon compatibility route. 2020-05-22 16:15:29 +02:00
Haelwenn
7b02bfca51 Merge branch 'announce-validator' into 'develop' 
Announce validator

See merge request pleroma/pleroma!2567
 2020-05-22 05:47:53 +00:00
lain
578ed3a37f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-21 15:35:13 +02:00
lain
cdc6ba8d7b AnnounceValidator: Check for announcability 2020-05-21 13:58:18 +02:00
lain
c76267afb9 Credo fixes. 2020-05-21 13:31:52 +02:00
lain
23e248694d Announcements: Fix all tests. 2020-05-21 13:16:21 +02:00
lain
d9d425708e SideEffects: Builed out Announce effects. 2020-05-21 12:43:09 +02:00
lain
39031f4860 Pipeline: Don't federate if federation is disabled. 2020-05-20 16:36:55 +02:00
lain
e42bc5f557 Announcements: Handle through common pipeline. 2020-05-20 15:44:37 +02:00
lain
d19c716770 AttachmentValidator: Handle empty mediatypes 2020-05-18 20:17:28 +02:00
lain
be4db41d71 ChatMessageValidator: Allow one message in an array, too. 2020-05-18 18:45:33 +02:00
lain
0d5bce018d AnnounceValidator: Validate for existing announce 2020-05-18 16:54:10 +02:00
lain
17a8342c1e ObjectValidators: Add basic Announce validator. 2020-05-18 16:45:11 +02:00
lain
7d381b16b7 Transmogrifier Test: Extract Announce handling. 2020-05-18 14:48:37 +02:00
lain
baf051a59e SideEffects: Don't update unread count for actor in chatmessages. 2020-05-17 12:22:26 +02:00
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy 
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
 2020-05-14 09:59:56 +02:00
lain
0f0acc740d Chat: Allow posting without content if an attachment is present. 2020-05-13 15:31:28 +02:00
lain
3cff4e24cd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-13 12:44:16 +02:00
rinpatch
24c8c13640 Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop' 
ActivityPub: Fix non-federating blocks.

Closes #1757

See merge request pleroma/pleroma!2514
 2020-05-12 16:45:46 +00:00
lain
b5aa204eb8 ChatController: Support deletion of chat messages. 2020-05-12 13:13:03 +02:00
lain
ca31af473c Transmogrifier: On incoming follow accept, update follow counts. 2020-05-12 12:29:37 +02:00
lain
d0ba1844b0 ActivityPub: Fix non-federating blocks. 2020-05-12 10:52:46 +02:00
lain
f28ed36b4d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-11 17:14:58 +02:00
lain
5367a00257 Deletion: Handle the case of pruned objects. 2020-05-11 15:06:23 +02:00
lain
03529f6a05 Transmogrifier: Don't modify attachments for chats. 2020-05-08 18:26:35 +02:00
lain
d0bf8cfb8f Credo fixes. 2020-05-08 14:11:58 +02:00
lain
7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-08 13:13:37 +02:00
lain
fbcc53760e Merge branch 'feature/emojireactvalidator' into 'develop' 
Move EmojiReacts to the Pipeline.

See merge request pleroma/pleroma!2473
 2020-05-08 10:41:41 +00:00
lain
6acbe45eb2 Builder: Extract common features of likes and reactions. 2020-05-08 11:30:31 +02:00
Haelwenn
769d95644d Merge branch 'feature/restrict-c2s' into 'develop' 
AP C2S: Restrict creation to `Note`s for now.

See merge request pleroma/pleroma!2472
 2020-05-07 22:29:16 +00:00
lain
ef55d24054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 18:53:34 +02:00
lain
d11eea62b1 Credo fixes 2020-05-07 15:09:37 +02:00
lain
fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-07 15:05:40 +02:00
lain
7ac0cffb34 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 15:03:12 +02:00
lain
788b7e7bbd Merge fixes. 2020-05-07 14:52:37 +02:00
lain
f0c22df226 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced 2020-05-07 14:45:20 +02:00
href
9491ba3e49 Streamer rework 2020-05-07 09:13:32 +00:00
lain
1748e26948 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-06 17:36:08 +02:00
rinpatch
473b0d9f3d Merge branch 'feature/delete-validator' into 'develop' 
Move deletions to the common pipeline

Closes #1497

See merge request pleroma/pleroma!2441
 2020-05-06 14:32:58 +00:00
lain
fc9d0b6eec Credo fixes. 2020-05-06 16:31:21 +02:00
lain
20baa2eaf0 ChatMessages: Add attachments. 2020-05-06 16:12:36 +02:00
lain
205313e541 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-06 11:44:30 +02:00
lain
07e7c80bc9 Merge branch 'plug-if-unless-func-options-refactoring' into 'develop' 
Refactoring of :if_func / :unless_func plug options

See merge request pleroma/pleroma!2446
 2020-05-06 09:14:05 +00:00
lain
df846eda71 Merge branch 'bugfix/sensitive_object' into 'develop' 
Transmogrifier.set_sensitive/1: Keep sensitive set to true

Closes #954

See merge request pleroma/pleroma!2470
 2020-05-06 09:04:13 +00:00
lain
92caae5923 Undoing: Move undoing blocks to the pipeline everywhere. 2020-05-05 18:02:24 +02:00
lain
a3bb2e5474 Undoing: Move undoing announcements to the pipeline everywhere. 2020-05-05 16:42:34 +02:00
lain
b34debe615 Undoing: Move undoing reactions to the pipeline everywhere. 2020-05-05 16:17:09 +02:00
lain
a3071f0231 Undoing: Move undoing likes to the pipeline everywhere. 2020-05-05 15:08:41 +02:00
lain
f1da8882f9 UndoValidator: Add UndoValidator. 2020-05-05 14:17:47 +02:00
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration 2020-05-05 14:28:54 +04:00
lain
db55dc9445 ActivityPub: Remove react_with_emoji. 2020-05-05 12:28:28 +02:00
lain
ad771546d8 Transmogrifier: Move emoji reactions to common pipeline. 2020-05-05 12:11:46 +02:00
lain
f21f538293 LikeValidator: Add defaults for recipients back in. 2020-05-05 10:38:59 +02:00
lain
c297667f16 Merge branch 'fix/issue-1729' into 'develop' 
Only update follower/following stats for actor types of users and bots.

Closes #1565 and #1729

See merge request pleroma/pleroma!2464
 2020-05-05 08:21:39 +00:00
lain
2cb3f8a8cf Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator 2020-05-05 10:19:01 +02:00
lain
6400998820 AP C2S: Restrict creation to Notes for now. 2020-05-05 10:12:37 +02:00
Haelwenn (lanodan) Monnier
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true 2020-05-04 23:36:00 +02:00
lain
c23cb8d37a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-04 19:24:04 +02:00
lain
3559dd1085 Transmogrifier: Rely on LikeValidator. 2020-05-04 17:18:38 +02:00
lain
0f9bed022f LikeValidator: Fix up context. 2020-05-04 17:18:17 +02:00
lain
e03c301ebe LikeValidator: Fix up missing recipients. 2020-05-04 17:08:31 +02:00
lain
13ab8defc0 Pipeline: Move transctioning to common pipeline. 2020-05-04 14:34:19 +02:00
lain
ec24c70db8 ActivityPub: Don't fetch Application follower counts. 2020-05-04 14:22:54 +02:00
lain
c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-04 10:43:20 +02:00
lain
9249742f13 Types.Recipients: Simplify reducer. 2020-05-03 15:28:24 +02:00
lain
a35b76431c Credo fixes. 2020-05-03 14:58:24 +02:00
lain
1974d0cc42 DeleteValidator: The deleted activity id is an object id 2020-05-03 13:02:57 +02:00
lain
6fb96f64c1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator 2020-05-03 12:55:29 +02:00
lain
4dfc617cdf Transmogrifier: Don't fetch actor that's guaranteed to be there. 2020-05-03 12:51:28 +02:00
Lain Soykaf
f20a1a27ef DeleteValidator: Improve code readability 2020-05-03 12:19:01 +02:00
Mark Felder
370e313e2d Only update follower/following stats for actor types of users and bots. 2020-05-02 13:28:10 -05:00
Ivan Tashkinov
2d07ed7747 [#1732] Made AP C2S :followers and :following endpoints serve on no auth 
(as for related :api pipeline endpoints).
 2020-05-02 18:28:04 +03:00
lain
44fbd09709 Merge branch 'issue/1577' into 'develop' 
[#1577] fix mediaType of object

See merge request pleroma/pleroma!2372
 2020-05-01 12:38:46 +00:00
lain
5f42e6629d DeleteValidator: Only allow deletion of certain types. 2020-05-01 13:34:47 +02:00
lain
32b8386ede DeleteValidator: Don't federate local deletions of remote objects. 
Closes #1497
 2020-04-30 21:23:18 +02:00
lain
999d639873 ActivityPub: Remove delete function. 
This is handled by the common pipeline now.
 2020-04-30 20:13:47 +02:00
lain
5da08c2b73 SideEffects: Fix comment 2020-04-30 19:53:30 +02:00
lain
500f5ec14e SideEffects: On deletion, reduce the reply count cache 2020-04-30 19:47:13 +02:00
lain
60db58a1c6 Credo fixes. 2020-04-30 18:38:37 +02:00
lain
ab60ee1776 SideEffects: On deletion, reduce the User note count. 2020-04-30 18:19:39 +02:00
lain
c832d96fc9 SideEffects: Stream out deletes. 2020-04-30 17:58:09 +02:00
lain
4500fdc04c DeleteValidator: Add internal helper field after validation. 2020-04-30 17:53:02 +02:00
Ivan Tashkinov
2c4844237f Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug. 2020-04-30 18:19:51 +03:00
lain
14c6672193 AP C2S: Use common pipelin for deletes. 2020-04-30 16:49:41 +02:00
lain
fdd8e7f276 CommonAPI: Use common pipeline for deletions. 2020-04-30 16:15:38 +02:00
lain
417eed4a2b SideEffects: Handle deletions. 2020-04-30 15:57:27 +02:00
lain
1fb383f368 DeleteValidator: Deleting a user is valid. 2020-04-30 15:42:30 +02:00
lain
4dc5302f45 Transmogrifier: Handle incoming deletes for non-user objects. 2020-04-30 15:26:23 +02:00
lain
db184a8eb4 DeleteValidator: Mastodon sends unaddressed deletes. 2020-04-30 14:37:14 +02:00
lain
42ce7c5164 ObjectValidator: Add actor fetcher. 2020-04-30 14:13:08 +02:00
lain
64bb72f98a Typo fix. 2020-04-30 13:57:47 +02:00
lain
589ce1e96b Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex 2020-04-29 19:47:16 +00:00
lain
503de4b8df ObjectValidator: Add validation for Deletes. 2020-04-29 19:09:51 +02:00
lain
78c864cbee LikeValidator: Use Recipients Type. 2020-04-29 19:08:36 +02:00
lain
b8056e69e0 Object Validator Types: Add Recipients. 2020-04-29 19:08:08 +02:00
lain
20587aa931 Chat message creation: Check actor. 2020-04-29 14:53:53 +02:00
lain
a88734a0a2 Transmogrifier: Fetch missing actors for chatmessages. 2020-04-29 14:25:33 +02:00
lain
53e3063bd0 Transmogrifier: Remove ChatMessageHandling module. 2020-04-29 13:52:23 +02:00
lain
e055b8d203 Pipeline: Always run common_pipeline in a transaction for now. 2020-04-29 13:45:50 +02:00
lain
dedffd100c Pipeline: Unify, refactor, DRY. 2020-04-28 17:29:54 +02:00
lain
abd0928229 CreateChatMessageValidator: Validate object existence 2020-04-28 16:45:28 +02:00
lain
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
lain
b5dc59c8fa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-28 14:16:21 +02:00
lain
f8e56d4271 SideEffects: Use Object.normalize to get the object. 2020-04-28 13:43:58 +02:00
lain
906cf53ab9 Recipient Type: Cast all elements as ObjectIDs. 2020-04-28 13:38:02 +02:00
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration 2020-04-28 14:13:53 +04:00
Maksim Pechnikov
ea5142b94b convert markdown content to html 2020-04-28 09:32:43 +03:00
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account 2020-04-27 14:33:00 +04:00
lain
c86143ed73 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-27 12:07:08 +02:00
rinpatch
8addbd948c Merge branch 'bugfix/announce-race-condition' into 'develop' 
Announcements: Prevent race condition.

See merge request pleroma/pleroma!2423
 2020-04-24 16:58:24 +00:00
lain
d89cd0a197 Reply Filtering: Refactor. 2020-04-24 18:25:26 +02:00
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration 2020-04-24 18:37:58 +04:00
Alexander
6e625a427c
reply filtering 2020-04-24 15:43:49 +03:00
lain
cb12585098 Announcements: Prevent race condition. 2020-04-24 14:37:53 +02:00
lain
1df6af2a4c Credo fixes. 2020-04-24 13:59:48 +02:00
lain
bbf8554c97 ActivitPub: Remove like function. 
We don't need another way to build likes.
 2020-04-24 13:48:13 +02:00
lain
1e28d34592 ChatMessage: Correctly ingest emoji tags. 2020-04-23 16:19:49 +02:00
lain
ec7335535d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-23 15:47:08 +02:00
lain
850377a7b8 Merge branch 'bugfix/1629-fav-race-condition' into 'develop' 
SideEffects: Run in transaction.

Closes #1629

See merge request pleroma/pleroma!2417
 2020-04-22 19:26:32 +00:00
lain
1bcbdc7a9f SideEffects: Use less cryptic syntax. 2020-04-22 21:21:21 +02:00
lain
e62173dfc8 SideEffects: Run in transaction. 
This fixes race conditions.
 2020-04-22 18:40:53 +02:00
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account 2020-04-22 20:18:12 +04:00
lain
5102468d0f Polls: Persist and show voters' count 2020-04-22 14:06:39 +02:00
lain
2e62a63749 ChatMessageValidator: Validation changes 
Don't validate if the recipient is blocking the actor.
 2020-04-22 12:48:52 +02:00
lain
5165287ff4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-21 12:00:33 +02:00
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration 2020-04-20 20:37:56 +04:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes 2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy 2020-04-20 10:11:06 -05:00
Egor Kislitsyn
736fead494 Merge branch 'develop' into openapi/account 2020-04-20 18:40:02 +04:00
Ilja
8b4de61d64 Fix ObjectAgePolicyTest 
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
 2020-04-20 12:59:16 +00:00
lain
7e53da250e ChatMessage: Support emoji. 2020-04-20 14:08:54 +02:00
lain
b836d3d104 ChatMessageValidator: Require published field 2020-04-20 13:14:59 +02:00
lain
139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-20 12:37:17 +02:00
lain
970b74383b Credo fixes. 2020-04-20 12:29:19 +02:00
lain
ce23673ca1 ChatMessageValidator: Don't validate messages that are too long. 2020-04-20 11:45:11 +02:00
Haelwenn
79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' 
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403
 2020-04-18 06:59:23 +00:00
Haelwenn
24f760c2f7 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex 2020-04-17 22:48:37 +00:00
Haelwenn (lanodan) Monnier
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo 2020-04-17 23:57:22 +02:00
lain
c845820911 Notifications: Create a chat notification. 2020-04-17 16:55:01 +02:00
rinpatch
e0d7847bc5 Merge branch 'sideeffects-test' into 'develop' 
SideEffects: Test for notification creation.

See merge request pleroma/pleroma!2399
 2020-04-17 14:03:04 +00:00
lain
8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-17 15:51:24 +02:00
lain
26d9c83316 SideEffects: Test for notification creation. 2020-04-17 15:50:15 +02:00
lain
372614cfd3 ChatView: Add a mastodon api representation of the recipient. 2020-04-17 15:37:54 +02:00
Haelwenn (lanodan) Monnier
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering 2020-04-17 14:32:15 +02:00
rinpatch
942d7467ca Merge branch 'develop' into features/remove-user-source_data 2020-04-16 21:28:52 +03:00
lain
e983f70884 ChatMessagesHandling: Strip HTML of incoming messages. 2020-04-16 17:50:24 +02:00
rinpatch
252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop' 
Remove User.upgrade_changeset in favor of remote_user_creation

See merge request pleroma/pleroma!2368
 2020-04-16 14:59:11 +00:00
lain
e2ced04917 ChatMessages: Better validation. 2020-04-16 15:21:47 +02:00
lain
6ace22b56a Chat: Add views, don't return them in timeline queries. 2020-04-15 18:23:16 +02:00
Egor Kislitsyn
65f04b7806
Fix credo warning 2020-04-15 17:16:32 +04:00
Egor Kislitsyn
16f4787bf7
Add a TODO note 2020-04-15 16:51:37 +04:00
lain
44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-15 14:41:43 +02:00
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses 2020-04-13 18:17:07 +04:00
Egor Kislitsyn
dc8fa04192
Merge branch 'develop' into global-status-expiration 2020-04-13 14:12:51 +04:00
Maksim Pechnikov
c5c09fc61b fix mediaType of object 2020-04-13 07:02:57 +03:00
Alex Gleason
9a3c74b244
Always accept deletions through SimplePolicy 2020-04-12 20:26:35 -05:00
rinpatch
5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop' 
FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332
 2020-04-11 19:46:04 +00:00
rinpatch
c077ad0b33 Remove User.upgrade_changeset in favor of remote_user_creation 
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).

Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.

I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
 2020-04-11 22:31:46 +03:00
Egor Kislitsyn
dd612f86ae
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-04-10 20:00:05 +04:00
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration 2020-04-10 14:20:48 +04:00
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination 2020-04-10 14:18:57 +04:00
Haelwenn
4d33e0bd50 Merge branch 'bugfix/apc2s_upload_activity' into 'develop' 
bugfix: AP C2S activity with attachments

See merge request pleroma/pleroma!2316
 2020-04-10 04:31:13 +00:00
Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data 2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier
3420dec494
Remove User.fields/1 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
b6bed1a284
Types.URI: New 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
19eedb3d04
User: Move public_key from source_data to own field 2020-04-10 06:16:18 +02:00
lain
d35e114acd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-09 13:25:27 +02:00
lain
2e78686686 SideEffects: Handle ChatMessage creation. 2020-04-09 12:44:20 +02:00
Haelwenn (lanodan) Monnier
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""} 2020-04-09 04:36:39 +02:00
lain
3775683a04 ChatMessage: Basic incoming handling. 2020-04-08 15:55:43 +02:00
lain
349b9d86dc Merge branch 'remake-remodel-2' into 'develop' 
Ingestion Pipeline Revamp

See merge request pleroma/pleroma!2315
 2020-04-06 11:59:01 +00:00
lain
772bc258cd ObjectID Validator: Refactor. 2020-04-06 13:53:24 +02:00
lain
e67cde0ed6 Transmogrifier: Refactoring / Renaming. 2020-04-06 13:46:34 +02:00
feld
ef7d2b0f11 Merge branch 'gun' into 'develop' 
Gun adapter

Closes #945

See merge request pleroma/pleroma!1861
 2020-04-01 17:05:09 +00:00
lain
037b49c415 Validators: Correct ObjectID filename 2020-04-01 16:10:17 +02:00
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1 2020-03-31 23:55:29 +02:00
lain
c982093cc2 Transmogrifier: Fix BAD code by RINPATCH 2020-03-31 19:33:41 +02:00
lain
1b323ce1c6 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex 2020-03-31 17:28:18 +00:00
lain
ecac57732a Transmogrifier: Only add context if it really is onne. 2020-03-31 19:16:45 +02:00
lain
288f2b5a7c Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex 2020-03-31 17:00:55 +00:00
lain
0be1fa0a86 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex 2020-03-31 17:00:48 +00:00
lain
643f15e77b Validators: ObjectID is an http uri. 2020-03-31 16:11:38 +02:00
lain
f6835333be Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex 2020-03-31 12:55:25 +00:00
Ivan Tashkinov
9c94b6a327 [#2332] Misc. fixes per code change requests. 2020-03-30 19:08:37 +03:00
Alexander Strizhakov
b607ae1a1c
removing grouped reports admin api endpoint 2020-03-30 13:51:45 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun 2020-03-30 12:15:23 +03:00
Haelwenn
e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop' 
Add support for funkwhale Audio activity

Closes #764 and #1624

See merge request pleroma/pleroma!2287
 2020-03-29 19:18:22 +00:00
Ivan Tashkinov
be9d18461a FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.). 2020-03-28 18:49:03 +03:00
lain
29ab1d9f8d Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 2020-03-26 17:24:10 +01:00
lain
69fc1dd69f Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex 2020-03-26 14:45:28 +00:00
lain
0c60c0a76a Validators: Use correct type for IDs. 2020-03-26 15:44:14 +01:00
lain
0adaab8e75 Bump copyright dates. 2020-03-26 15:37:42 +01:00
lain
eaacc64839 Refactors. 2020-03-26 15:33:10 +01:00
lain
ee979dd6d7 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 2020-03-26 15:24:06 +01:00
lain
d7aa0b645b Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex 2020-03-26 14:23:19 +00:00
lain
4cf1007a7d ActivityPub: Small refactor. 2020-03-26 15:16:54 +01:00
Ivan Tashkinov
012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control 2020-03-25 09:05:17 +03:00
Ivan Tashkinov
e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships". 2020-03-25 09:04:00 +03:00
rinpatch
f316882464 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex 2020-03-24 18:37:53 +00:00
lain
aaf00f1ff5 Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex 2020-03-24 18:24:09 +00:00
lain
74560e888e Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex 2020-03-24 18:20:58 +00:00
Egor Kislitsyn
4a2538967c
Support pagination in conversations 2020-03-24 20:18:27 +04:00
Egor Kislitsyn
d1a9716a98
Fix activity deletion 2020-03-24 17:38:18 +04:00
rinpatch
981e015f1b Mastodon API Account view: Remove an outdated hack 
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
 2020-03-22 17:10:37 +03:00
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration 2020-03-20 22:08:34 +04:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun 2020-03-20 20:47:54 +03:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
Haelwenn (lanodan) Monnier
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR 2020-03-19 19:10:03 +01:00
lain
9b9d67bbec Fix linting. 2020-03-19 18:16:12 +01:00
lain
3c2c32b460 Merge branch 'remake-remodel' into develop 2020-03-19 18:00:55 +01:00
Haelwenn (lanodan) Monnier
f9d622d25a
WIP 2020-03-19 15:39:11 +01:00
Ivan Tashkinov
0e07c5ef57 Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control 2020-03-16 17:58:42 +03:00
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration 2020-03-16 15:31:31 +04:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
Haelwenn (lanodan) Monnier
8176ca9e40 static_fe: Sanitize HTML in users 2020-03-15 20:44:04 +01:00
lain
fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' 
[#1560] Restricted AP- & OStatus-related routes for non-federating instances

Closes #1560

See merge request pleroma/pleroma!2235
 2020-03-15 19:15:20 +00:00
Ivan Tashkinov
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
rinpatch
e87a32bcd7 rip out fetch_initial_posts 
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.

idea acked by lain and feld on irc

Closes #1595 #1422
 2020-03-15 15:59:17 +03:00
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun 2020-03-12 18:31:10 +03:00
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-03-12 16:02:24 +04:00
Ivan Tashkinov
bd40880fa0 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 
# Conflicts:
#	test/web/activity_pub/activity_pub_controller_test.exs
 2020-03-12 12:07:07 +03:00
feld
f92c447bbc Merge branch 'relay-list-change' into 'develop' 
Relay list shows hosts without accepted follow

See merge request pleroma/pleroma!2240
 2020-03-11 15:10:09 +00:00
Haelwenn (lanodan) Monnier
863ec33ba2
Add support for funkwhale Audio activity 
reel2bits fixture not included as it lacks the Actor fixture for it.

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
 2020-03-11 13:46:42 +01:00
Ivan Tashkinov
5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring. 2020-03-09 20:51:44 +03:00
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun 2020-03-07 12:41:37 +03:00
Ivan Tashkinov
027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-06 11:48:30 +03:00
Ivan Tashkinov
40765875d4 [#1560] Misc. improvements in ActivityPubController federation state restrictions. 2020-03-05 21:19:21 +03:00
lain
6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop' 
Do not fail when user has no email

See merge request pleroma/pleroma!2249
 2020-03-04 12:43:06 +00:00
Alexander Strizhakov
22d52f5691
same copyright date format 2020-03-04 09:41:23 +03:00
Mark Felder
4427161ca3 Merge branch 'develop' into gun 2020-03-03 17:15:49 -06:00
Mark Felder
05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
Ivan Tashkinov
b6fc98d9cd [#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests. 2020-03-03 22:22:02 +03:00
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun 2020-03-03 10:08:07 +03:00
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-03-03 00:32:34 +04:00
Ivan Tashkinov
99a6c660a9 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-02 18:41:12 +03:00
Haelwenn
764a50f8a6 Merge branch 'feature/1482-activity_pub_transactions' into 'develop' 
ActivityPub actions & side-effects in transaction

Closes #1482

See merge request pleroma/pleroma!2089
 2020-03-02 07:58:01 +00:00
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow 2020-03-02 09:27:20 +03:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07 
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
 2020-03-02 06:08:45 +01:00
Alexander Strizhakov
34f1d09f3a
spec fix 2020-03-01 12:01:39 +03:00
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction 2020-03-01 12:01:39 +03:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun 2020-02-29 11:34:50 +03:00
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email 2020-02-27 17:27:49 +04:00
eugenijm
e2a6a40367 Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only) 2020-02-26 20:21:38 +03:00
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings 2020-02-25 18:34:56 +04:00
Ivan Tashkinov
0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances. 2020-02-22 19:48:41 +03:00
Egor Kislitsyn
011ede4536
Update documentation 2020-02-21 14:42:43 +04:00
Egor Kislitsyn
819cd46717
Auto-expire Create activities only 2020-02-20 22:04:02 +04:00
Mark Felder
cf94349287 Merge branch 'develop' into gun 2020-02-18 09:06:27 -06:00
Ivan Tashkinov
61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-18 17:46:09 +03:00
lain
3fa2ac68df Merge branch 'chore/standardize-mrf-behavior' into 'develop' 
Standardize @behaviour usage in MRFs

See merge request pleroma/pleroma!2212
 2020-02-18 14:36:10 +00:00
Alexander Strizhakov
514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
rinpatch
472132215e Use floki's new APIs for parsing fragments 2020-02-16 01:55:26 +03:00
Ivan Tashkinov
269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction). 2020-02-15 20:41:38 +03:00
Mark Felder
478619782b Standardize @behaviour usage in MRFs 2020-02-14 11:02:24 -06:00
Egor Kislitsyn
57878f8708
Improve readability 2020-02-14 15:50:31 +04:00
Egor Kislitsyn
4d459b0e99
Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4 2020-02-13 22:27:10 +04:00
Egor Kislitsyn
241a3d744a
Add ActivityExpirationPolicy 2020-02-13 22:27:10 +04:00
feld
237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" 
This reverts merge request !2194
 2020-02-11 16:55:18 +00:00
rinpatch
ea1631d7e6 Make Floki use fast_html 2020-02-11 16:17:21 +03:00
Ivan Tashkinov
24e49d14f2 [#1505] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests. 2020-02-09 17:34:48 +03:00
Ivan Tashkinov
6ea3c06d8d [#1505] Minor refactoring. 2020-02-09 14:09:01 +03:00
Ivan Tashkinov
7c3991f59e [#1505] Fixed replies serialization (included objects' ids instead of activities' ids). 2020-02-09 10:17:21 +03:00
Ivan Tashkinov
4e6bbdc7b5 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-08 19:59:37 +03:00
Ivan Tashkinov
d458f4fdca [#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation. 2020-02-08 19:58:02 +03:00