lambda
|
7f79b467b1
|
Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks
See merge request pleroma/pleroma!190
|
2018-06-11 11:19:45 +00:00 |
|
squidboi
|
4f9ecfc77a
|
formatting
|
2018-06-09 04:28:11 +00:00 |
|
squidboi
|
8903f1ad4d
|
more fixes
|
2018-06-08 19:07:14 -07:00 |
|
squidboi
|
16d896f526
|
fixes
|
2018-06-08 19:01:14 -07:00 |
|
squidboi
|
2847fc8f90
|
add option to not unfollow on block, and option to not federate outgoing blocks
|
2018-06-08 17:12:16 -07:00 |
|
William Pitcock
|
09604182d0
|
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
|
2018-06-07 14:38:09 +00:00 |
|
Sir_Boops
|
3f0440ac3c
|
Dedupe uploads
|
2018-06-06 13:25:44 -06:00 |
|
eal
|
29c9c8d93b
|
Extract host from ap_id, add index
|
2018-06-06 21:13:40 +03:00 |
|
eal
|
9075b6d25b
|
ActivityPub.ex: filter domain blocked activities.
|
2018-06-03 23:33:33 +03:00 |
|
eal
|
5d3fdbc082
|
MastoAPI: Add streaming for lists.
|
2018-05-30 16:48:59 +03:00 |
|
lain
|
841ee8e3e4
|
Simplify DM query.
Should also use indexes better.
|
2018-05-26 16:25:32 +02:00 |
|
lain
|
4b3ec53514
|
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
|
2018-05-26 16:00:59 +02:00 |
|
lain
|
3839a11ef5
|
Don't treat remote accepts/rejects as local.
Also, use specialized functions to get safe data.
|
2018-05-26 14:07:46 +02:00 |
|
William Pitcock
|
c0ca9f82b9
|
mastodon api: properly track if an account is locked or not
|
2018-05-25 06:14:09 +00:00 |
|
csaurus
|
4fd9df100f
|
Merge branch 'develop' into feature/mstdn-direct-api
|
2018-05-21 20:19:37 -04:00 |
|
Francis Dinh
|
46427cb90f
|
Pass correct number of arguments to unfollow
|
2018-05-21 11:57:15 -04:00 |
|
Francis Dinh
|
89c5de9096
|
Fix unfollows
|
2018-05-20 21:01:14 -04:00 |
|
Francis Dinh
|
1afd6d37bd
|
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
Fixed some conflicts in transmogrifier.ex
|
2018-05-20 19:17:15 -04:00 |
|
lain
|
434601a5c3
|
Return private / direct posts on user timelines, too.
|
2018-05-20 16:15:18 +02:00 |
|
Thog
|
6f39ecc41b
|
Support Undo like activities (Fix #139)
|
2018-05-19 22:14:15 +02:00 |
|
lambda
|
ad563669c8
|
Merge branch 'feature/remote-user-deactivation' into 'develop'
remote user deactivation
See merge request pleroma/pleroma!154
|
2018-05-19 09:30:09 +00:00 |
|
William Pitcock
|
2051530868
|
activitypub transmogrifier: handle hubzilla AP actor quirks
|
2018-05-19 03:28:29 -05:00 |
|
William Pitcock
|
13d4b6d2b5
|
remote user deactivation: fix test failures
|
2018-05-19 01:26:13 -05:00 |
|
Francis Dinh
|
0ec1abb3b6
|
Add federated blocks
|
2018-05-18 18:09:56 -04:00 |
|
csaurus
|
4dfb40a546
|
Handle cases where a to/cc field is absent on a status
|
2018-05-14 21:54:25 -04:00 |
|
William Pitcock
|
9390492138
|
ActivityPub create: discard activities from deactivated users
|
2018-05-13 19:05:02 -05:00 |
|
csaurus
|
2ce48c1a42
|
Formatting
|
2018-05-13 15:36:41 -04:00 |
|
csaurus
|
9aabff4883
|
Fix tests.
|
2018-05-13 15:33:59 -04:00 |
|
lain
|
c7a85de35c
|
Revert "Remove 'unlisted' handling for now."
This reverts commit 1027d1f696.
|
2018-05-13 12:38:13 +02:00 |
|
lain
|
1027d1f696
|
Remove 'unlisted' handling for now.
It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.
|
2018-05-13 12:07:11 +02:00 |
|
lain
|
a5c9dd0a2a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2018-05-13 11:59:35 +02:00 |
|
lain
|
3c3933e40b
|
Unlisted fetching: Reverse logic
Generates a faster query.
|
2018-05-13 11:58:03 +02:00 |
|
lambda
|
aeff2d6474
|
Merge branch 'feature/unrepeats' into 'develop'
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
|
2018-05-13 09:32:29 +00:00 |
|
lain
|
ec531ca281
|
Add test.
|
2018-05-13 11:18:48 +02:00 |
|
lain
|
29376fcc13
|
Format.
|
2018-05-13 10:56:44 +02:00 |
|
lain
|
76722ea9c8
|
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
|
2018-05-13 10:56:11 +02:00 |
|
csaurus
|
c8d418acdd
|
api/v1/timelines/direct implementation
|
2018-05-12 21:50:59 -04:00 |
|
csaurus
|
392bd9ef56
|
Stream function to handle direct messages.
|
2018-05-12 17:40:59 -04:00 |
|
csaurus
|
c60a5405db
|
Detect and try to stream incoming "direct" messages
|
2018-05-12 17:40:59 -04:00 |
|
href
|
e9e6f37bda
|
Chain policies
- The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies
|
2018-05-10 18:41:06 +02:00 |
|
Francis Dinh
|
54f6628590
|
Change argument order and call correct # of args
|
2018-05-08 23:59:36 -04:00 |
|
Francis Dinh
|
4d5ec883b7
|
Federate correct activity
|
2018-05-08 21:52:21 -04:00 |
|
Mark Felder
|
943820ae29
|
More unused variables
|
2018-05-04 21:16:02 +00:00 |
|
William Pitcock
|
a3d1d4894f
|
ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks
|
2018-04-28 22:32:46 -05:00 |
|
lain
|
4d55d7c95e
|
Insert object after being rewritten.
|
2018-04-28 16:10:24 +02:00 |
|
lambda
|
a7a40bb8f1
|
Merge branch 'fix/blocked-user-boosts' into 'develop'
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
|
2018-04-28 13:49:12 +00:00 |
|
Francis Dinh
|
2d775bf1be
|
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
|
2018-04-25 01:58:50 -04:00 |
|
Francis Dinh
|
9e0dd21ed6
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
|
2018-04-25 00:46:28 -04:00 |
|
lambda
|
7a52c4549c
|
Merge branch 'feature/message-rewrite-facility' into 'develop'
message rewrite facility
See merge request pleroma/pleroma!112
|
2018-04-24 17:21:28 +00:00 |
|
Dashie
|
9972678a68
|
Add User.decrease_note_count and call it from ActivityPub.delete
|
2018-04-24 11:34:18 +02:00 |
|
Francis Dinh
|
8c0806539c
|
Embed announce activity data instead of linking to it
|
2018-04-22 21:28:51 -04:00 |
|
Francis Dinh
|
b1742eca42
|
Revert "Rename make_unannounce_data helper to make_undo_data"
This reverts commit c649ca8958.
|
2018-04-22 19:42:28 -04:00 |
|
Francis Dinh
|
c649ca8958
|
Rename make_unannounce_data helper to make_undo_data
This makes it a bit more easier to adapt for unlikes as well in the
future.
|
2018-04-22 01:55:41 -04:00 |
|
eal
|
22bfeac256
|
Update note count in ActivityPub.create.
|
2018-04-21 12:58:04 +03:00 |
|
Francis Dinh
|
f0798440de
|
Use correct activity for undo
|
2018-04-20 23:22:16 -04:00 |
|
Francis Dinh
|
4b9f2ab526
|
Fix federation of unreblog activity
|
2018-04-20 23:09:19 -04:00 |
|
Francis Dinh
|
7b4f55238e
|
Handle unrepeats via the TwitterAPI
|
2018-04-18 06:00:40 -04:00 |
|
Francis Dinh
|
687db1bc3a
|
Expose unannounce activity so that it can be tested
|
2018-04-18 03:39:42 -04:00 |
|
Francis Dinh
|
0251690e96
|
Add federation for unrepeats
|
2018-04-17 20:35:07 -04:00 |
|
Francis Dinh
|
b949577472
|
Add unrepeat functionality
|
2018-04-14 20:19:48 -04:00 |
|
William Pitcock
|
4a178b3d65
|
ActivityPub: implement MRF core hook and baseline noop policy object
|
2018-04-14 06:32:44 -05:00 |
|
eal
|
48380aeccc
|
ActivityPub.ex: do not return boosted statuses from blocked users.
|
2018-04-14 14:26:20 +03:00 |
|
lain
|
4afbef39f4
|
Format the code.
|
2018-03-30 15:01:53 +02:00 |
|
lain
|
d2099c849d
|
More Jason changes.
|
2018-03-27 16:45:38 +02:00 |
|
William Pitcock
|
381ba256bf
|
activitypub: add restrict_limit
|
2018-03-22 00:26:47 -05:00 |
|
lambda
|
9b97b023c5
|
Merge branch 'feld-Logger' into 'develop'
Logging cleanup
See merge request pleroma/pleroma!76
|
2018-03-20 05:57:47 +00:00 |
|
Mark Felder
|
16d102c153
|
Clarify that this error is about a problem decoding the expected JSON
payload
|
2018-03-19 18:18:52 +00:00 |
|
Mark Felder
|
9a858621d6
|
AP and WebFinger need love here
|
2018-03-19 17:56:49 +00:00 |
|
lain
|
ec83175100
|
Use connection pools.
|
2018-03-19 17:42:09 +01:00 |
|
lain
|
4d5161b16d
|
Only fetch if it's http.
|
2018-03-19 10:28:28 +01:00 |
|
lain
|
1377b2e569
|
Restrict public by recipients.
This is much faster than going through the json. This does break
unlisted, for which we'll probably have to add another table field.
|
2018-02-26 10:09:30 +01:00 |
|
lain
|
4d13cc0dc6
|
Fix specs.
|
2018-02-25 16:52:33 +01:00 |
|
lain
|
e3629af4da
|
Handle remote update activities.
|
2018-02-25 16:14:25 +01:00 |
|
lain
|
2b5d265954
|
Don't deliver to local followers.
|
2018-02-24 19:04:56 +01:00 |
|
lain
|
2583a9f6e8
|
More logging.
|
2018-02-23 15:00:19 +01:00 |
|
lain
|
37e406ae36
|
Get avatar and banner from AP users.
|
2018-02-22 08:14:15 +01:00 |
|
lain
|
4816b09fa7
|
Add user upgrade function.
|
2018-02-21 22:21:40 +01:00 |
|
lain
|
a06b9a3e0b
|
Logging.
|
2018-02-21 16:22:20 +01:00 |
|
lain
|
810cf8618f
|
ActivityPub: Fetch missing activities on reply.
|
2018-02-21 15:22:24 +01:00 |
|
lain
|
9c89916969
|
ActivityPub: One queue item per server.
|
2018-02-20 08:51:19 +01:00 |
|
lain
|
932d346d35
|
fix typo.
|
2018-02-18 23:13:19 +01:00 |
|
lain
|
8b11546334
|
For existing users, just replace info.
|
2018-02-18 23:11:31 +01:00 |
|
lain
|
decbf3a47f
|
fix typo.
|
2018-02-18 23:02:44 +01:00 |
|
lain
|
342d0b01d1
|
Only push to followers if they are addressed.
|
2018-02-18 23:01:37 +01:00 |
|
lain
|
010f818a29
|
Fix conversations.
|
2018-02-18 20:52:07 +01:00 |
|
lain
|
deaad6d97a
|
Fix delivery to CC.
|
2018-02-18 16:59:41 +01:00 |
|
lain
|
803bdc1a67
|
Federate non-public over ActivityPub only, do some better signing.
|
2018-02-18 16:05:25 +01:00 |
|
lain
|
4bc57ef20c
|
Don't relay non-public messages.
|
2018-02-18 15:58:18 +01:00 |
|
lain
|
5d89997a70
|
Respect visibility in API.
|
2018-02-18 15:50:34 +01:00 |
|
lain
|
5729233c36
|
Don't show unlisted in public.
|
2018-02-18 15:32:11 +01:00 |
|
lain
|
c974f6544f
|
Show users their own posts in timeline.
|
2018-02-18 15:20:36 +01:00 |
|
lain
|
b99eeb2bdf
|
Try to fetch AP user data first.
|
2018-02-18 12:27:05 +01:00 |
|
lain
|
77c6c424a6
|
ActivityPub: Make fake Create activities for objects without one.
|
2018-02-18 11:24:54 +01:00 |
|
lain
|
5e36b750c1
|
ActivityPub: Fetch an object from an id.
|
2018-02-17 21:56:33 +01:00 |
|
lain
|
c2d0cb1a29
|
ActivtyPub Delivery: Use shared inbox if possible.
|
2018-02-17 16:18:10 +01:00 |
|
lain
|
7b26443a76
|
ActivityPub: Send out Accept after Follow.
|
2018-02-17 16:08:55 +01:00 |
|
lain
|
05ba6ca1b8
|
Do some transmogrifying for the output.
|
2018-02-17 14:11:20 +01:00 |
|
lain
|
5a371892a0
|
Fix specs.
|
2018-02-17 10:26:44 +01:00 |
|
lain
|
7851b9ba81
|
ActivityPub: Use recipients fields.
|
2018-02-15 20:32:07 +01:00 |
|
lain
|
ae26604378
|
ActivityPub: Refactor create function.
|
2018-02-15 19:59:35 +01:00 |
|