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
6 years ago
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
6 years ago
db4badc6aa
move user disable into deactivation
6 years ago
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
6 years ago
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
0ab563d334
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
...
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
6 years ago
cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1
...
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
6 years ago
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
36c0a10fdf
adding language tag
6 years ago
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
6 years ago
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
6 years ago
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
6 years ago
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
6 years ago
4212527928
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
6 years ago
fe5145eeaa
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
6 years ago
975482f091
insert object defaults for fake activities and make credo happy
6 years ago
d866b59eea
oof
6 years ago
45ba10bf47
Fix the issue with HTML scrubber
6 years ago
cd387f8693
Add a fake option to lazy_put_actvity_defaults
6 years ago
1bb4d5d65b
Implement fake status submit
6 years ago
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
6 years ago
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
6 years ago
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
6 years ago
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
c410296120
Try sending an empty map
6 years ago
6f090f981b
Attempt to fix incorrect federation of default instance avatars
6 years ago
750de7d842
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
...
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
6 years ago
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
6 years ago
8c70156157
activitypub: object view: use preloaded object when possible
6 years ago
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
6 years ago
4cedf45423
relay: use preloaded object since we always have it
6 years ago
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
6 years ago
ba7299fc87
activitypub: add missing with_preloaded_object()
6 years ago
e4307cadc8
activitypub: splice in the child object if we have one
6 years ago
9aea7cc224
activitypub: preload child objects when fetching timelines
6 years ago
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
6 years ago
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
6 years ago
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
6 years ago
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
6 years ago
5ba14c664b
Fix missing end brace
6 years ago
a2e03d4f3c
Initial attempt at updating return type
6 years ago
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
6 years ago
d8244c2a1b
remove unused function
6 years ago
15b21d1983
refactor filtering mechanism
6 years ago
c8f31e0bc2
Implement mastodon's reblog hiding feature
6 years ago
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
6 years ago
5c7b774f09
reports: unify sending e-mail for both remote and local reports
6 years ago
64b0120d67
activitypub: add support for forwarding reports
6 years ago
379442ad17
activitypub: utils: also match Activity objects
6 years ago
0f3ecb2bfb
activitypub: transmogrifier: accept remote Flag activities
6 years ago
f86f7dbb8f
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
6 years ago
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
6 years ago
e630e5e135
Fix delete activities not federating
6 years ago
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
c3d41b2b6e
[Credo] make all variables use snake_case
6 years ago
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
6 years ago
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
6 years ago
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
e53a9fd15e
MRF: anti followbot: gracefully handle accounts without a display name
6 years ago
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
6 years ago
c2faae70df
Adjust delete activity audience to match the deleted object
6 years ago
6a69ece437
Revert existing object check
6 years ago
28d5b40d0a
Add handling of objects not in database
6 years ago
33c614bce0
Stop adresssing like activities to actor's follower collection on non-public posts
6 years ago
eb84de0143
allow users to disable their own account
6 years ago
1445dc25d4
fix format
6 years ago
aab86698a5
Expand "to" of delete activities
6 years ago
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
6 years ago
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.
6 years ago
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
6 years ago
c46950d3b1
Increment user note count only on public activities
6 years ago
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).
6 years ago
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
6 years ago
c4235f96bd
Add `with_muted` param.
6 years ago
9e0686efa6
Move visibility into own module.
6 years ago
62296f5a25
Fix private post card handling.
6 years ago
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
6 years ago
f8a72f2997
activitypub: sign http date header
6 years ago
bff9eb5ef7
Reports
6 years ago
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)
6 years ago
f41f017bbc
Implement muting, add it to the mastodon API
6 years ago
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
6 years ago
96dcacade1
properly check for follower address in is_private?
6 years ago
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
8f98d970c1
Fix recipient count in hellthread policy
6 years ago
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
6 years ago
c2e0a0c8d4
Readd threshold is not 0 check, optmization?
6 years ago
dca6bee2f7
Rename test, add check for follower collection when delisting
6 years ago
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
6 years ago
d943c90249
Add tests, change default config values, fix a bug
6 years ago
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.
6 years ago
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
6 years ago
56862f4ce1
activitypub: clean up logging statements a little
6 years ago
72ba5b4ab7
activitypub: user view: formatting
6 years ago
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
6 years ago
6542b86292
activitypub: user view: remove totalItems from user outbox
...
(this is based on a counter in User.Info, but the counter is not reliable.)
6 years ago
ee2fa1a314
activitypub: user view: remove totalInbox from user inbox view
...
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
6 years ago
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
6 years ago
e05bf2940f
activitypub: transmogrifier: correctly handle nil inReplyTo value
6 years ago
94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
6 years ago
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
6 years ago
29e946ace4
activitypub: user view: add oauthRegistrationEndpoint to user profiles
6 years ago
db8abd958d
activitypub: user view: fix up endpoints rendering
6 years ago
90facd3598
user view: add AP C2S oauth endpoints to local user profiles
6 years ago
bef9b9cb66
refactored code
6 years ago
adcdd21f16
Merge branch 'develop' into hellthread-filter-fix
6 years ago
1d727cd069
added checks for public url and follower collections
6 years ago
379d04692c
Filter summary in keywordpolicy
6 years ago
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
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
6 years ago
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
6 years ago
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
6 years ago
6a6a5b3251
de-group alias/es
6 years ago
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
6 years ago
60ea29dfe6
Credo fixes: alias grouping/ordering
6 years ago
8bcfac93a8
Make credo happy
6 years ago
7356659273
wow
6 years ago
f88dec8b33
What idiot did that? (me)
6 years ago
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
46aa8c18a2
Add keyword policy
6 years ago
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
6 years ago
f753043ce0
Fix if clause in activity_pub user_view
6 years ago
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
6 years ago
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
6 years ago
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
6 years ago
e71ab5a10f
activitypub: transmogrifier: fix bare tags
6 years ago
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
6 years ago
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
6 years ago
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
6 years ago
64a3993425
activitypub: mrf: tag policy: add support for subscription control
6 years ago
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
6 years ago
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
6 years ago
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
6 years ago
88e32a32ce
mrf: add initial MRF.TagPolicy engine
6 years ago
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
6 years ago
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
58262a8b8a
removed a debug thingy
6 years ago
4430641349
squished a bug
6 years ago
3cf046babb
actually commited the changes
6 years ago
lambda