Commit graph

2963 commits

Author SHA1 Message Date
rinpatch
b028b0f97d Merge branch 'bugfix/missing-announces' into 'develop'
fix up missing announcements with preloads

See merge request pleroma/pleroma!972
2019-03-25 09:24:08 +00:00
William Pitcock
26b0c802c3 fix up missing announcements with preloads 2019-03-25 07:38:09 +00:00
kaniini
bc14c98de1 Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
add overriding truncated_namespace condition for truncating paths for digital ocean

See merge request pleroma/pleroma!969
2019-03-25 02:25:59 +00:00
kaniini
63ffa4842c Merge branch 'fix/mastoapi-liked' into 'develop'
Serve non-public activities in /api/v1/favourites

Closes #648

See merge request pleroma/pleroma!970
2019-03-25 02:24:27 +00:00
rinpatch
a7f58b3c13 Serve non-public activities in /api/v1/favourites
Fixes #648
2019-03-25 02:15:45 +03:00
Austin Lanari
6c96d68f77 add overriding truncated_namespace condition for truncating paths for digital ocean 2019-03-24 11:32:09 -07: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
4aa699271c activity: use left join instead of inner join when fetching activities that may or may not have a child object 2019-03-23 03:17:50 +00:00
William Pitcock
332dc1371b user: use preloads when deleting accounts 2019-03-23 03:06:00 +00:00
William Pitcock
debf7f016d ostatus: use preload objects with Object.normalize() when opportunistic 2019-03-23 03:05:57 +00:00
William Pitcock
3c2350cbee object: downgrade normalize warning to debug severity 2019-03-23 03:05:15 +00:00
William Pitcock
8c70156157 activitypub: object view: use preloaded object when possible 2019-03-23 03:05:14 +00:00
William Pitcock
f9d5c13b21 activity: add get_by_ap_id_with_object() 2019-03-23 03:05:13 +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
aabcecb269 notification: formatting 2019-03-23 02:30:53 +00:00
William Pitcock
07cdd9ed02 streamer: use the preloaded object if possible 2019-03-23 02:29:01 +00:00
William Pitcock
c62220c500 rich media: helpers: only crawl Create activities 2019-03-23 02:28:59 +00:00
William Pitcock
9a06d9f6e8 notification: preload child objects 2019-03-23 02:28:57 +00:00
William Pitcock
4cedf45423 relay: use preloaded object since we always have it 2019-03-23 02:28:56 +00:00
William Pitcock
e430a71d37 ostatus: fetch preloaded object in note handler for testsuite 2019-03-23 01:17:26 +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
a6973a668e formatting 2019-03-23 00:28:16 +00:00
William Pitcock
59518cbcd8 activity: fix credo nitpick 2019-03-23 00:26:12 +00:00
William Pitcock
b3bf523c09 rich media: use optimized Object.normalize() 2019-03-23 00:22:57 +00:00
William Pitcock
e75e43b949 common api: use the optimized Object.normalize whenever possible 2019-03-23 00:22:14 +00:00
William Pitcock
9aea7cc224 activitypub: preload child objects when fetching timelines 2019-03-23 00:10:17 +00:00
William Pitcock
092cedede5 activity: add with_preloaded_object() convenience 2019-03-23 00:09:56 +00:00
William Pitcock
62bccddde0 object: add support for preloading objects when walking an activity graph in normal form 2019-03-22 23:51:12 +00:00
rinpatch
1b33986bfa Fix text being nullable in TwitterAPI 2019-03-23 00:10:50 +03:00
lambda
fee360e581 Merge branch 'safe-mentions' into 'develop'
NodeInfo: Return safe_dm_mentions feature flag.

See merge request pleroma/pleroma!964
2019-03-22 11:03:56 +00:00
lain
e2afce34b6 NodeInfo: Return safe_dm_mentions feature flag. 2019-03-22 11:57:20 +01:00
rinpatch
3229c7a1d6 Ensure fts is prefered over trigram and use union_all instead of union in user search query 2019-03-22 08:39:49 +03:00
William Pitcock
27e03a2177 reports: fix up email generation for remote reports 2019-03-22 01:17:14 +00:00
kaniini
1c3d3d0c2b Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.

See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
William Pitcock
3cc2554fa3 mastodon api: add conversation_id extension (ref #674) 2019-03-21 23:25:41 +00:00
William Pitcock
fea3696799 common api: move context functions from twitterapi 2019-03-21 23:24:04 +00:00
kaniini
bf8b29e080 Merge branch 'feature/move-search-to-db' into 'develop'
Move gluing search results from application to database and get mutuals a higher score multiplier

See merge request pleroma/pleroma!960
2019-03-21 21:41:04 +00:00
rinpatch
88096c65a5 Move gluing search results from application to database and get mutuals
a higher score multiplier
2019-03-21 23:16:32 +03:00
Quentin Rameau
80bc9ed2ba Add a gopher url port config option
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
2019-03-21 19:59:43 +03:00
rinpatch
b92a16aa00 Merge branch 'ecto-3-migration' into 'develop'
Ecto 3.0.7 (ecto_sql 3.0.5) migration

See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
lain
bf27190f7f UtilController: Return state of safe dm mentions. 2019-03-21 16:20:58 +01:00
lain
8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01:00
rinpatch
19a19bdd81 Fix migration timestamp type 2019-03-20 16:04:59 +03:00
rinpatch
9a7b817c9a Ecto 3.0.5 migration
kms
2019-03-20 15:59:54 +03:00
Maxim Filippov
7ac9fff437 Format 2019-03-20 01:40:50 +03:00
Maxim Filippov
ed8a2935f5 Use ILIKE to search users 2019-03-20 01:37:40 +03: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
67ff8d9311 user: properly cope with actors which do not declare a followers collection 2019-03-19 18:23:06 +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
kaniini
43bd7f47db Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
Order users by nickname

See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
kaniini
aba4c27120 Merge branch 'masto-api-notifications' into 'develop'
Add support for exclude_types, limit and min_id in Mastodon notifications

See merge request pleroma/pleroma!949
2019-03-18 19:17:36 +00:00
Ekaterina Vaartis
a1aacc08a4 Check if the user has indeed not been federated with
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
2019-03-18 20:16:31 +03:00
eugenijm
1588688a11 Added support for exclude_types, limit, and min_id in Mastodon
notifications.

Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
Fong-Wan Chau
4ed2618f6c Allow 'rel' attribute on <a> link with specific values (for hashtag recognition). 2019-03-17 11:03:19 -04:00
Maxim Filippov
93291c3d7a Order users by nickname 2019-03-17 13:23:31 +03: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
lambda
28df397454 Merge branch 'feature/oauth-me' into 'develop'
oauth: add me property to token responses

See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
kaniini
c69dc2acf1 Merge branch 'feature/reblog-muting' into 'develop'
Implement mastodon's reblog hiding feature

See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
William Pitcock
e0edc706cf oauth: add me property to token responses 2019-03-16 01:12:50 +00:00
eugenijm
43fb03be5a Allow to mark a single notification as read 2019-03-15 23:56:14 +03:00
kaniini
4b3c86c1a6 Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
MediaProxy: parse filename from content-disposition for non-whitelisted types

See merge request pleroma/pleroma!936
2019-03-15 20:06:08 +00:00
kaniini
8b352af4dd Merge branch 'feature/openldap-support' into 'develop'
OpenLDAP support

Closes #203

See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
d8244c2a1b remove unused function 2019-03-15 15:03:03 +01:00
dfeb3aec44 fix credo warning 2019-03-15 14:36:07 +01:00
094e1ef048 formatting 2019-03-15 14:28:14 +01:00
da53c079db Refactor to store user ap_id, add tests 2019-03-15 14:20:08 +01:00
be465c762b formatting 2019-03-15 14:18:53 +01:00
15b21d1983 refactor filtering mechanism 2019-03-15 14:18:53 +01:00
aa71139e4a Fix elixir 1.8 vs 1.7 format conflict 2019-03-15 14:18:53 +01:00
fe4c1d26fc Add ActivityPub.contain_activity checks to streamer 2019-03-15 14:18:53 +01:00
c8f31e0bc2 Implement mastodon's reblog hiding feature 2019-03-15 14:18:21 +01:00
Haelwenn
41fc67aa49 Merge branch 'mastoapi/mime_type' into 'develop'
Extend MastoAPI to provide attachment mimetypes

See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
rinpatch
d7a34b604b Extend MastoAPI to provide attachment mimetypes 2019-03-15 11:58:12 +03:00
rinpatch
d02f1120f9 Content-Disposition regex improvements 2019-03-15 08:29:51 +03:00
kaniini
0f42ea87d6 Merge branch 'notifications-is-seen' into 'develop'
MastoAPI notifications is_seen

See merge request pleroma/pleroma!934
2019-03-15 02:59:17 +00:00
kaniini
c708656b5e Merge branch 'robotstxt' into 'develop'
Add robots.txt

Closes #723

See merge request pleroma/pleroma!929
2019-03-15 02:50:27 +00:00
William Pearson
3dadaa4432 robots.txt
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
rinpatch
958227d556 MediaProxy: parse filename from content-disposition for non-whitelisted types 2019-03-15 01:36:29 +03:00
eugenijm
100413bf2c Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests 2019-03-15 01:35:48 +03: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
rinpatch
cbdd11c381 Merge develop to bump elixir version in the CI so I don't get failing formatting 2019-03-14 22:33:20 +03:00
William Pitcock
3b48d5f0c2 common api: add support for forwarding reports 2019-03-14 19:29:33 +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
e2fe796c63 Add some tests 2019-03-14 22:02:48 +03: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
link0ff
54e7087ab4 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-14 17:43:30 +02:00
kaniini
59333f2d56 Merge branch 'admin-api-account-view-namespace' into 'develop'
MastodonAPI.Admin.AccountView → AdminAPI.AccountView

See merge request pleroma/pleroma!930
2019-03-14 02:01:10 +00:00
kaniini
86871c8a04 Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
Add "local" & "tags" to users admin API

See merge request pleroma/pleroma!932
2019-03-14 02:00:47 +00:00
Maxim Filippov
f3964f4024 Ensure empty array is returned for tags 2019-03-14 03:17:09 +03:00
Maxim Filippov
257d8e78e5 Add tags 2019-03-14 01:52:24 +03:00