a3dc02d282
Add addressable lists
2019-05-01 16:11:17 +07:00
ce4825c1dc
Do not normalize objects in stream_out unless the activity type is
...
Create
Saves quite a bit of time with delete activities because they would
always query the db
2019-04-30 20:21:28 +03:00
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
2019-04-22 11:27:29 +03: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
24073f829f
Refactor query to return only 1 message instead of 20
2019-04-21 00:40:41 +07:00
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
2019-04-19 16:55:33 +00:00
f9865cf943
Stream out deletes, mistakingly removed when resolving merge conflicts
2019-04-19 00:47:02 +03:00
83589ca6a5
Merge branch 'develop' into feature/database-compaction
2019-04-18 12:56:38 +03:00
e31a22043b
Fix media timeline depending on embeded object and add some guards
2019-04-18 08:31:08 +03:00
2abc09570f
Use the preloaded object in tag queries
2019-04-18 01:37:04 +03:00
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
2019-04-17 22:27:59 +00:00
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
2019-04-17 20:05:09 +00:00
8e4d950f31
Remove updating reply count for embeded objects
2019-04-17 15:54:09 +03:00
627e5a0a49
Merge branch 'develop' into feature/database-compaction
2019-04-17 12:22:32 +03:00
5d73dca064
Remove inReplyToStatusId
2019-04-15 11:50:36 +03:00
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
2019-04-12 10:41:09 +00:00
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
2019-04-12 09:34:12 +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
280172f6f6
Conversations: Create or bump on inserting a dm.
2019-04-10 16:33:45 +02:00
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
2019-04-10 06:33:20 +02:00
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
2019-04-10 06:33:19 +02:00
fe5145eeaa
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
2019-04-01 12:25:53 +03:00
d866b59eea
oof
2019-04-01 11:58:08 +03:00
45ba10bf47
Fix the issue with HTML scrubber
2019-04-01 11:55:59 +03:00
cd387f8693
Add a fake option to lazy_put_actvity_defaults
2019-03-30 13:57:54 +03:00
1bb4d5d65b
Implement fake status submit
2019-03-29 21:59:04 +03:00
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
2019-03-28 17:18:59 +01:00
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
2019-03-27 12:28:53 +03:00
568e348588
Increment replies_count on replies (MastoAPI)
2019-03-26 15:27:04 +03:00
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
2019-03-23 03:05:10 +00:00
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
2019-03-23 01:09:12 +00:00
ba7299fc87
activitypub: add missing with_preloaded_object()
2019-03-23 00:53:35 +00:00
e4307cadc8
activitypub: splice in the child object if we have one
2019-03-23 00:40:08 +00:00
9aea7cc224
activitypub: preload child objects when fetching timelines
2019-03-23 00:10:17 +00:00
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
d8244c2a1b
remove unused function
2019-03-15 15:03:03 +01:00
15b21d1983
refactor filtering mechanism
2019-03-15 14:18:53 +01:00
c8f31e0bc2
Implement mastodon's reblog hiding feature
2019-03-15 14:18:21 +01:00
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
2019-03-14 19:52:08 +00:00
5c7b774f09
reports: unify sending e-mail for both remote and local reports
2019-03-14 19:44:08 +00:00
64b0120d67
activitypub: add support for forwarding reports
2019-03-14 19:36:17 +00:00
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
2019-03-14 17:49:00 +00:00
e630e5e135
Fix delete activities not federating
2019-03-14 20:43:14 +03:00
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
2019-03-13 04:26:56 +01:00
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 04:26:56 +01:00
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
2019-03-11 09:02:03 +03:00
c2faae70df
Adjust delete activity audience to match the deleted object
2019-03-07 12:26:03 +01:00
6a69ece437
Revert existing object check
2019-03-07 11:53:15 +01:00
28d5b40d0a
Add handling of objects not in database
2019-03-05 23:15:22 +01:00
eb84de0143
allow users to disable their own account
2019-03-04 19:55:11 +07:00
1445dc25d4
fix format
2019-03-04 11:18:45 +01:00
aab86698a5
Expand "to" of delete activities
2019-03-04 11:18:45 +01:00
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
2019-03-03 15:49:19 +00:00
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
2019-03-03 18:42:27 +03:00
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
2019-03-03 11:13:59 +00:00
c46950d3b1
Increment user note count only on public activities
2019-03-03 14:08:43 +03:00
689b0730f8
activitypub: fix date header format
...
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
2019-03-01 12:22:45 +00:00
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
2019-03-01 09:37:29 +03:00
c4235f96bd
Add `with_muted` param.
2019-02-27 16:37:42 +01:00
9e0686efa6
Move visibility into own module.
2019-02-22 13:29:52 +01:00
62296f5a25
Fix private post card handling.
2019-02-22 12:02:51 +01:00
f8a72f2997
activitypub: sign http date header
2019-02-21 00:23:17 +00:00
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
5a46d37af9
Update the mute implementation to the current codebase
...
Make it part of the info thing (and do a migration to ensure it's there)
2019-02-19 23:09:16 +03:00
f41f017bbc
Implement muting, add it to the mastodon API
2019-02-19 21:49:55 +03:00
f25a3f4f78
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
...
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
2019-02-19 14:08:19 +00:00
96dcacade1
properly check for follower address in is_private?
2019-02-19 13:23:13 +03:00
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
2019-02-18 19:43:06 +00:00
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
2019-02-18 04:01:26 +00:00
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
2019-02-15 12:20:20 +03:00
56862f4ce1
activitypub: clean up logging statements a little
2019-02-14 19:42:33 +00:00
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
6a6a5b3251
de-group alias/es
2019-02-09 16:31:17 +01:00
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
2019-02-09 14:59:21 +01:00
60ea29dfe6
Credo fixes: alias grouping/ordering
2019-02-09 14:59:20 +01:00
8bcfac93a8
Make credo happy
2019-02-09 14:59:20 +01:00
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
2019-02-06 11:33:00 +07:00
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
2019-02-04 23:47:29 +01:00
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07:00
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
...
Added tests.
2019-02-03 13:28:13 +03:00
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
2019-02-03 12:41:27 +03:00
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
2019-01-31 15:07:49 +07:00
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
2019-01-29 13:12:28 +03:00
55affbca7f
add a job queue
2019-01-28 22:17:17 +07:00
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
2019-01-28 15:39:14 +03:00
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
2019-01-28 15:25:06 +03:00
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
2019-01-28 11:03:52 +03:00
91ef64a1ec
activitypub: prime OGP crawler cache when new messages are inserted into the database
2019-01-28 06:07:18 +00:00
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
2019-01-27 12:45:50 +00:00
5a84def6a6
Fix the logic in multi-hashtag TLs
2019-01-26 04:46:02 +01:00
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
2019-01-26 04:46:01 +01:00
1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
...
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
2019-01-26 04:46:01 +01:00
f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines
2019-01-26 04:45:36 +01:00
15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
2019-01-26 03:50:49 +01:00
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
2019-01-25 05:19:32 +00:00
3e9399ec0b
[ #534 ] Optimized bulk publish ops to filter on reachability early. `Instance` refactoring.
2019-01-24 19:15:23 +03:00
8654a591f0
[ #534 ] Updating external instances reachability on incoming federation.
2019-01-24 17:37:23 +03:00
20b54366ee
[ #534 ] Federation publish requests status control (enforced 2xx response code check).
2019-01-24 11:54:52 +03:00
f161a92cb1
[ #534 ] Initial implementation of unreachable federation targets retirement.
2019-01-23 18:37:25 +03:00
cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param
2019-01-23 11:26:35 +01:00
8cd853ce0c
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
...
[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
2019-01-21 13:03:32 +00:00
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
2019-01-21 12:35:10 +00:00
a4d3fec8a7
[ #502 ] Code comments update.
2019-01-21 14:52:41 +03:00
aa480f4a8b
[ #530 ] Prevents user `info` from being overwritten because of race conditions
...
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
2019-01-21 14:16:51 +03:00
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
2019-01-20 13:00:46 +01:00
aa37313416
activitypub: short-circuit is_public?() with directMessage flag check
2019-01-20 02:33:21 +00:00
ddae43eb43
activitypub: add is_private?/is_direct? helpers
2019-01-20 02:27:48 +00:00
e116e55cab
Add actor to recipients
2019-01-18 22:40:52 +03:00
75a9b2a851
activitypub: add a match clause for objects, not just activities
2019-01-17 23:32:16 +00:00
33b473cc02
activitypub: allow is_public?() to work on any type of map representing an AS2 object
2019-01-17 23:21:31 +00:00
2479e88815
activitypub: announce: add new public parameter
2019-01-17 23:21:31 +00:00
fd2f1258fb
Merge branch 'load-all-dms' into 'develop'
...
Remove recent activity restriction.
See merge request pleroma/pleroma!644
2019-01-14 18:49:53 +00:00
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
2019-01-10 02:39:53 +00:00
5027f82cde
Add activity visibility index.
2019-01-09 16:45:09 +01:00
9854978b8b
Remove recent activity restriction.
...
This should be fine now, everything should be covered by indices.
2019-01-09 12:38:23 +01:00
380e9fba21
add pinned posts
2019-01-07 20:45:33 +07:00
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
2019-01-05 11:16:05 +01:00
096a927805
Merge remote-tracking branch 'origin/develop' into pool-usage
2019-01-01 14:19:55 +01:00
d4799e0dc2
Remove default pool, it's used automatically anyway.
2019-01-01 13:49:24 +01:00
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
2018-12-29 11:46:06 +00:00
e4562105e7
Implement exclude_reblogs and include_rts
2018-12-26 21:38:00 -08:00
5811e65e67
Add some hard limits on inserted activities.
2018-12-26 12:39:35 +01:00
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
2018-12-06 15:57:56 +00:00
a09ed0f5af
avoid mix format bug
2018-12-06 18:41:29 +09:00
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
2018-12-06 07:36:21 +00:00
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
2018-12-06 10:26:17 +03:00
96ba95df2e
remove follow_redirect options
2018-12-06 11:38:33 +09:00
27792b2d77
remove pool and timeout options which duplicate with the default
2018-12-06 11:23:15 +09:00
3b5be09f45
[ #210 ] Stylistic change.
2018-12-05 21:48:21 +03:00
c4f3c5e939
[ #210 ] Stylistic change.
2018-12-05 20:23:28 +03:00
848151f7cb
[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check
...
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
2018-12-05 13:37:06 +03:00
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
f85949cc69
object: factor out fetching functions into Pleroma.Object.Fetcher module
2018-12-04 04:52:09 +00:00
e8caecb5c7
object: move object containment out of transmogrifier into it's own module
2018-12-04 04:52:09 +00:00
6f90f2c3ac
activitypub: rework thread filtering for split object view
2018-12-04 04:52:09 +00:00
d13d953385
activitypub: implement activity flattening
2018-12-04 04:52:09 +00:00
4482ce7e2d
activitypub: normalize objects when streaming them out
2018-12-04 04:52:09 +00:00
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-12-01 09:55:46 +01:00
b19597f602
reverse proxy / uploads
2018-11-30 18:00:47 +01:00
0896cf4c0f
Fix most mastodon api bugs.
2018-11-20 20:12:39 +01:00
4c918392c6
Fix most User tests.
2018-11-18 21:40:52 +01:00
c88533209c
activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
2018-11-17 20:16:03 +00:00
daa8ec3d62
activitypub: factor out AP object fetching to it's own function and add ID-based containment
2018-11-17 20:15:59 +00:00
603fccf175
activitypub: fetch_object_from_id(): prefer `actor` over `attributedTo` to avoid spoofing
2018-11-17 18:17:17 +00:00
5bb88fd174
Runtime configuration
...
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
2018-11-06 19:41:15 +01:00
10f3958468
object: return the deleted object as well
2018-11-01 07:47:50 +00:00
2bf358d7b4
activitypub: use Object.delete() instead of mutating the database and cache directly
2018-11-01 07:29:12 +00:00
b92e38d2d4
Add user reactivation task.
2018-10-29 23:13:15 +00:00
167d3789a5
activitypub: upload: pass through an upload limit if one is provided
2018-10-29 16:43:05 +00:00
72ea54de6e
activitypub: fix possible false positives with broken thread filtering
2018-10-28 05:45:33 +00:00
26eb11c172
activitypub: add support for filtering broken threads out of timelines
2018-10-26 06:16:51 +00:00
4db1bc2c0e
activitypub: fix error condition match
2018-09-30 05:26:13 +00:00
707077edde
activitypub: don't fall back to OStatus fetching when MRF rejects an object
2018-09-28 00:45:10 +00:00
523757be52
[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]
2018-09-27 20:00:45 +02:00
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
2018-09-03 12:33:36 +00:00
0b2c051a04
activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor
2018-09-01 23:20:02 +00:00
29b5e30c46
activity: drop recipients_to/recipients_cc fields
2018-08-29 18:41:02 +00:00
de9acebbf3
activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.
2018-08-29 18:41:02 +00:00
643fae6e36
activitypub: allow querying the activity/object graph bounded to a specific to/cc set
2018-08-29 08:51:23 +00:00
81673b8136
activity: add recipients_to and recipients_cc fields
2018-08-29 08:42:33 +00:00
97e20d2932
[MastodonAPI] the tag field isn’t fixed to a static type in pleroma
2018-08-27 15:08:25 +02:00
83efaa3af6
[MastodonAPI] Add streaming of hashtags
2018-08-27 15:08:25 +02:00
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
2018-08-27 08:29:25 +00:00
440b459cd1
Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
...
activitypub: filter destination list for announce activities differently than normal (closes #164 )
Closes #164
See merge request pleroma/pleroma!227
2018-08-27 08:25:27 +00:00
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
51a21284c6
ActivityPub: follow redirects when fetching user
2018-08-20 15:03:25 +03:00
0ca9b9ff96
run mix format
2018-08-06 08:26:36 +00:00
1c90f88393
user: remote actors can have no nickname if they are virtual services
2018-08-06 08:22:11 +00:00
3be58ad34e
activitypub: actually send digest header when federating
...
this is needed for backwards compatibility with non-digest pleroma instances
2018-08-01 10:32:02 +00:00
2890aef9e8
activitypub: add digest header to outbound messages and sign it
2018-07-31 23:24:30 +00:00
7c63e70de1
activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.
2018-06-27 13:08:12 +00:00
15d624e077
activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.
2018-06-27 13:07:29 +00:00
dfc96f222c
Merge branch 'feature/configurable-blocks' into 'develop'
...
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
2018-06-25 06:12:29 +00:00
ea214b8ba6
combined outgoing_blocks with statement
2018-06-24 23:05:44 -07:00
c4038ede07
fix mind-crushingly dumb syntax error
2018-06-23 14:32:00 -07:00
f4990283de
change moved attributes into normal variables
2018-06-23 14:27:07 -07:00
4e099fcfa9
move configurable module attributes into relevant functions
2018-06-23 14:16:08 -07:00
90cf75f4a7
Merge branch 'features/column_media_streaming' into 'develop'
...
Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225
2018-06-19 09:50:05 +00:00
591c82620e
activitypub: filter destination list for announce activities differently than normal ( closes #164 )
2018-06-18 04:36:25 +00:00
4f589998ee
activitypub: support filtering activities by whether or not they are a reply ( closes #109 )
2018-06-18 03:21:32 +00:00
b670d4d683
MastodonAPI: Add streaming to media tabs of federated and local TLs
2018-06-17 16:17:15 +02:00
2e294ee44a
Merge branch 'develop' into feature/configurable-blocks
2018-06-16 15:37:16 -07:00
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
2018-06-14 07:19:36 +00:00
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
2018-06-13 21:33:36 -04:00
3f42806b1b
Merge branch 'develop' into 'develop'
...
Dedupe uploads
See merge request pleroma/pleroma!115
2018-06-12 08:26:26 +00:00
564c73ab24
Merge branch 'feature/list-streaming' into 'develop'
...
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
2018-06-12 07:19:45 +00:00
76f80ba8c2
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
2018-06-11 22:15:53 +00:00
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
2018-06-11 11:19:45 +00:00
4f9ecfc77a
formatting
2018-06-09 04:28:11 +00:00
8903f1ad4d
more fixes
2018-06-08 19:07:14 -07:00
16d896f526
fixes
2018-06-08 19:01:14 -07:00
2847fc8f90
add option to not unfollow on block, and option to not federate outgoing blocks
2018-06-08 17:12:16 -07:00
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
3f0440ac3c
Dedupe uploads
2018-06-06 13:25:44 -06:00
29c9c8d93b
Extract host from ap_id, add index
2018-06-06 21:13:40 +03:00
9075b6d25b
ActivityPub.ex: filter domain blocked activities.
2018-06-03 23:33:33 +03:00
5d3fdbc082
MastoAPI: Add streaming for lists.
2018-05-30 16:48:59 +03:00
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
2018-05-26 16:25:32 +02:00
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
2018-05-26 16:00:59 +02:00
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
c0ca9f82b9
mastodon api: properly track if an account is locked or not
2018-05-25 06:14:09 +00:00
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
2018-05-21 20:19:37 -04:00
46427cb90f
Pass correct number of arguments to unfollow
2018-05-21 11:57:15 -04:00
89c5de9096
Fix unfollows
2018-05-20 21:01:14 -04:00
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
434601a5c3
Return private / direct posts on user timelines, too.
2018-05-20 16:15:18 +02:00
6f39ecc41b
Support Undo like activities ( Fix #139 )
2018-05-19 22:14:15 +02:00
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
2051530868
activitypub transmogrifier: handle hubzilla AP actor quirks
2018-05-19 03:28:29 -05:00
13d4b6d2b5
remote user deactivation: fix test failures
2018-05-19 01:26:13 -05:00
0ec1abb3b6
Add federated blocks
2018-05-18 18:09:56 -04:00
4dfb40a546
Handle cases where a to/cc field is absent on a status
2018-05-14 21:54:25 -04:00
9390492138
ActivityPub create: discard activities from deactivated users
2018-05-13 19:05:02 -05:00
2ce48c1a42
Formatting
2018-05-13 15:36:41 -04:00
9aabff4883
Fix tests.
2018-05-13 15:33:59 -04:00
c7a85de35c
Revert "Remove 'unlisted' handling for now."
...
This reverts commit 1027d1f696
2018-05-13 12:38:13 +02:00
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
a5c9dd0a2a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-05-13 11:59:35 +02:00
3c3933e40b
Unlisted fetching: Reverse logic
...
Generates a faster query.
2018-05-13 11:58:03 +02:00
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
ec531ca281
Add test.
2018-05-13 11:18:48 +02:00
29376fcc13
Format.
2018-05-13 10:56:44 +02:00
76722ea9c8
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
2018-05-13 10:56:11 +02:00
c8d418acdd
api/v1/timelines/direct implementation
2018-05-12 21:50:59 -04:00
392bd9ef56
Stream function to handle direct messages.
2018-05-12 17:40:59 -04:00
c60a5405db
Detect and try to stream incoming "direct" messages
2018-05-12 17:40:59 -04:00
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
54f6628590
Change argument order and call correct # of args
2018-05-08 23:59:36 -04:00
4d5ec883b7
Federate correct activity
2018-05-08 21:52:21 -04:00
943820ae29
More unused variables
2018-05-04 21:16:02 +00:00
a3d1d4894f
ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks
2018-04-28 22:32:46 -05:00
4d55d7c95e
Insert object after being rewritten.
2018-04-28 16:10:24 +02:00
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
2d775bf1be
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
2018-04-25 01:58:50 -04:00
9e0dd21ed6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-25 00:46:28 -04:00
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
9972678a68
Add User.decrease_note_count and call it from ActivityPub.delete
2018-04-24 11:34:18 +02:00
8c0806539c
Embed announce activity data instead of linking to it
2018-04-22 21:28:51 -04:00
b1742eca42
Revert "Rename make_unannounce_data helper to make_undo_data"
...
This reverts commit c649ca8958
2018-04-22 19:42:28 -04:00
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
22bfeac256
Update note count in ActivityPub.create.
2018-04-21 12:58:04 +03:00
f0798440de
Use correct activity for undo
2018-04-20 23:22:16 -04:00
Egor Kislitsyn