lain
|
81d1aa424d
|
Streamer: Stream out Conversations/Participations.
|
2019-05-03 13:39:14 +02:00 |
|
lain
|
45f790becc
|
Merge remote-tracking branch 'origin/develop' into conversations_three
|
2019-05-01 18:40:41 +02:00 |
|
Alex S
|
f11e7037c2
|
test fixes
|
2019-05-01 16:09:53 +07:00 |
|
Alex S
|
bdfa3a6fa8
|
Merging with develop
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
|
2019-05-01 12:29:33 +07:00 |
|
rinpatch
|
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 |
|
Egor Kislitsyn
|
c157e27a00
|
Merge branch 'develop' into feature/disable-account
|
2019-04-25 13:41:10 +07:00 |
|
William Pitcock
|
0fd0ffcd76
|
activitypub: transmogrifier: send reject follow if following does not succeed
|
2019-04-25 00:48:45 +00:00 |
|
rinpatch
|
d21d921def
|
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
|
2019-04-22 11:27:29 +03:00 |
|
Egor
|
b9cdf6d3b9
|
Use User.get_cached* everywhere
|
2019-04-22 07:20:43 +00:00 |
|
Egor Kislitsyn
|
e8c2f9a73a
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
2019-04-22 13:08:30 +07:00 |
|
Roman Chvanikov
|
24073f829f
|
Refactor query to return only 1 message instead of 20
|
2019-04-21 00:40:41 +07:00 |
|
kaniini
|
9da8b287f8
|
Merge branch 'feature/database-compaction' into 'develop'
database compaction
See merge request pleroma/pleroma!473
|
2019-04-19 16:55:33 +00:00 |
|
rinpatch
|
f9865cf943
|
Stream out deletes, mistakingly removed when resolving merge conflicts
|
2019-04-19 00:47:02 +03:00 |
|
rinpatch
|
83589ca6a5
|
Merge branch 'develop' into feature/database-compaction
|
2019-04-18 12:56:38 +03:00 |
|
rinpatch
|
6069d0fd36
|
Fix object search depending on embeded object
|
2019-04-18 09:28:20 +03:00 |
|
rinpatch
|
e31a22043b
|
Fix media timeline depending on embeded object and add some guards
|
2019-04-18 08:31:08 +03:00 |
|
rinpatch
|
2abc09570f
|
Use the preloaded object in tag queries
|
2019-04-18 01:37:04 +03:00 |
|
William Pitcock
|
36f78c6dcd
|
activitypub: fix filtering of boosts from blocked users
|
2019-04-17 22:27:59 +00:00 |
|
William Pitcock
|
2140e164d7
|
activitypub: properly filter out transitive activities concerning blocked users
|
2019-04-17 20:05:09 +00:00 |
|
rinpatch
|
35ac672b8d
|
Remove containment tests from transmogrifier and fix thread visibility solver
|
2019-04-17 17:59:15 +03:00 |
|
rinpatch
|
8e4d950f31
|
Remove updating reply count for embeded objects
|
2019-04-17 15:54:09 +03:00 |
|
rinpatch
|
ad681877df
|
Make credo happy
|
2019-04-17 14:52:01 +03:00 |
|
rinpatch
|
627e5a0a49
|
Merge branch 'develop' into feature/database-compaction
|
2019-04-17 12:22:32 +03:00 |
|
William Pitcock
|
750b369d04
|
activitypub: allow indirect messages from users being followed at a personal inbox
|
2019-04-16 18:31:12 +00:00 |
|
rinpatch
|
5d73dca064
|
Remove inReplyToStatusId
|
2019-04-15 11:50:36 +03:00 |
|
lambda
|
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 |
|
lambda
|
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 |
|
Egor Kislitsyn
|
db4badc6aa
|
move user disable into deactivation
|
2019-04-11 17:22:42 +07:00 |
|
Egor Kislitsyn
|
0f2f7d2cec
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
2019-04-11 15:51:52 +07:00 |
|
lain
|
280172f6f6
|
Conversations: Create or bump on inserting a dm.
|
2019-04-10 16:33:45 +02:00 |
|
Haelwenn (lanodan) Monnier
|
cae0231731
|
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
|
2019-04-10 06:33:20 +02:00 |
|
Haelwenn (lanodan) Monnier
|
1791ee8ec4
|
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
|
2019-04-10 06:33:19 +02:00 |
|
kaniini
|
0ab563d334
|
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
|
2019-04-10 02:10:47 +00:00 |
|
Haelwenn (lanodan) Monnier
|
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.
|
2019-04-10 02:32:04 +02:00 |
|
lambda
|
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
|
2019-04-08 11:42:20 +00:00 |
|
Alexander Strizhakov
|
36c0a10fdf
|
adding language tag
|
2019-04-08 11:03:10 +00:00 |
|
Egor Kislitsyn
|
cfa6e7289f
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
|
2019-04-04 16:10:43 +07:00 |
|
Haelwenn
|
0cb94cfa94
|
Merge branch 'fix-slow-relationships' into 'develop'
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
|
2019-04-02 18:43:48 +00:00 |
|
lambda
|
a79ce94dd4
|
Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit
See merge request pleroma/pleroma!995
|
2019-04-02 14:17:43 +00:00 |
|
lain
|
39bcf93007
|
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
|
2019-04-02 16:10:38 +02:00 |
|
lain
|
fd07745d1b
|
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
|
2019-04-02 16:08:55 +02:00 |
|
Egor Kislitsyn
|
4212527928
|
change Repo.get(Activity, id) => Activity.get_by_id(id)
|
2019-04-02 16:50:31 +07:00 |
|
rinpatch
|
fe5145eeaa
|
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
|
2019-04-01 12:25:53 +03:00 |
|
rinpatch
|
975482f091
|
insert object defaults for fake activities and make credo happy
|
2019-04-01 12:16:51 +03:00 |
|
rinpatch
|
d866b59eea
|
oof
|
2019-04-01 11:58:08 +03:00 |
|
rinpatch
|
45ba10bf47
|
Fix the issue with HTML scrubber
|
2019-04-01 11:55:59 +03:00 |
|
rinpatch
|
cd387f8693
|
Add a fake option to lazy_put_actvity_defaults
|
2019-03-30 13:57:54 +03:00 |
|
rinpatch
|
1bb4d5d65b
|
Implement fake status submit
|
2019-03-29 21:59:04 +03:00 |
|
Haelwenn (lanodan) Monnier
|
6f15224053
|
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
|
2019-03-28 17:18:59 +01:00 |
|
rinpatch
|
ce6d64bbd8
|
Fix missing announces in MastoAPI home timeline
Closes #762
|
2019-03-27 12:28:53 +03:00 |
|
lambda
|
ff3b09f6b3
|
Merge branch 'fix/ap-icon' into 'develop'
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
|
2019-03-26 16:12:50 +00:00 |
|
lain
|
10a7a4a868
|
AP UserView: Refactor banner / avatar display code, add test.
|
2019-03-26 16:59:28 +01:00 |
|
eugenijm
|
568e348588
|
Increment replies_count on replies (MastoAPI)
|
2019-03-26 15:27:04 +03:00 |
|
Mark Felder
|
c410296120
|
Try sending an empty map
|
2019-03-25 19:00:35 -05:00 |
|
Mark Felder
|
6f090f981b
|
Attempt to fix incorrect federation of default instance avatars
|
2019-03-25 18:47:04 -05:00 |
|
rinpatch
|
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
|
2019-03-24 15:02:13 +00:00 |
|
Haelwenn (lanodan) Monnier
|
eab9425cc4
|
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
|
2019-03-24 15:47:50 +01:00 |
|
William Pitcock
|
8c70156157
|
activitypub: object view: use preloaded object when possible
|
2019-03-23 03:05:14 +00:00 |
|
William Pitcock
|
ce47eb8b29
|
activitypub: when fetching objects, use the preloaded object from the synthesized activity
|
2019-03-23 03:05:10 +00:00 |
|
William Pitcock
|
4cedf45423
|
relay: use preloaded object since we always have it
|
2019-03-23 02:28:56 +00:00 |
|
William Pitcock
|
73efe95368
|
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
|
2019-03-23 01:09:12 +00:00 |
|
William Pitcock
|
ba7299fc87
|
activitypub: add missing with_preloaded_object()
|
2019-03-23 00:53:35 +00:00 |
|
William Pitcock
|
e4307cadc8
|
activitypub: splice in the child object if we have one
|
2019-03-23 00:40:08 +00:00 |
|
William Pitcock
|
9aea7cc224
|
activitypub: preload child objects when fetching timelines
|
2019-03-23 00:10:17 +00:00 |
|
William Pitcock
|
1685e4258f
|
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
|
2019-03-19 18:39:33 +00:00 |
|
William Pitcock
|
cd055983c3
|
transmogrifier: when determining followers collection URI, we may need to fetch the actor
|
2019-03-19 18:04:57 +00:00 |
|
William Pitcock
|
d487b753c3
|
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
|
2019-03-19 17:30:25 +00:00 |
|
William Pitcock
|
798da28812
|
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
|
2019-03-19 17:27:42 +00:00 |
|
Zachary Dunn
|
5ba14c664b
|
Fix missing end brace
|
2019-03-18 14:05:10 +00:00 |
|
Zachary Dunn
|
a2e03d4f3c
|
Initial attempt at updating return type
|
2019-03-18 13:56:59 +00:00 |
|
kaniini
|
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 |
|
William Pitcock
|
423fd07928
|
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
|
2019-03-14 19:52:08 +00:00 |
|
William Pitcock
|
5c7b774f09
|
reports: unify sending e-mail for both remote and local reports
|
2019-03-14 19:44:08 +00:00 |
|
William Pitcock
|
64b0120d67
|
activitypub: add support for forwarding reports
|
2019-03-14 19:36:17 +00:00 |
|
William Pitcock
|
379442ad17
|
activitypub: utils: also match Activity objects
|
2019-03-14 19:29:04 +00:00 |
|
William Pitcock
|
0f3ecb2bfb
|
activitypub: transmogrifier: accept remote Flag activities
|
2019-03-14 19:06:02 +00:00 |
|
William Pitcock
|
f86f7dbb8f
|
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
|
2019-03-14 19:05:42 +00:00 |
|
rinpatch
|
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 |
|
rinpatch
|
e630e5e135
|
Fix delete activities not federating
|
2019-03-14 20:43:14 +03:00 |
|
Haelwenn (lanodan) Monnier
|
23960309a0
|
[Credo] Change quoted string with 3+ quotes to sigils
|
2019-03-13 04:26:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
c42d34b2ec
|
[Credo] fix Credo.Check.Readability.MaxLineLength
|
2019-03-13 04:26:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
c3d41b2b6e
|
[Credo] make all variables use snake_case
|
2019-03-13 04:26:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
fb82f6fc7c
|
[Credo] Remove parentesis on argument-less functions
|
2019-03-13 04:26:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
2019-03-13 04:26:54 +01:00 |
|
eugenijm
|
6038c8a753
|
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
|
2019-03-11 09:02:03 +03:00 |
|
kaniini
|
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
|
2019-03-08 22:33:31 +00:00 |
|
Ekaterina Vaartis
|
5021b7836f
|
Fetch user's outbox posts on first federation with that user
|
2019-03-08 16:27:56 +03:00 |
|
William Pitcock
|
e53a9fd15e
|
MRF: anti followbot: gracefully handle accounts without a display name
|
2019-03-07 12:13:48 +00:00 |
|
rinpatch
|
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
|
2019-03-07 11:31:08 +00: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 |
|
rinpatch
|
33c614bce0
|
Stop adresssing like activities to actor's follower collection on non-public posts
|
2019-03-04 18:09:58 +03:00 |
|
Egor Kislitsyn
|
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 |
|
kaniini
|
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 |
|
