akkoma
5 years agoMerge branch 'bugfix/improve-boost-targeting' into 'develop'
kaniini [Sat, 19 Jan 2019 23:44:08 +0000 (23:44 +0000)]
Merge branch 'bugfix/improve-boost-targeting' into 'develop'

improve handling of non-public Announces

See merge request pleroma/pleroma!681

5 years agoMerge branch '491_full_mentions_in_user_bio' into 'develop'
kaniini [Sat, 19 Jan 2019 07:36:58 +0000 (07:36 +0000)]
Merge branch '491_full_mentions_in_user_bio' into 'develop'

[#491] Made user bio preserve full nicknames (nick@host)

Closes #491

See merge request pleroma/pleroma!676

5 years agotest: add regression test for to/cc clobbering
William Pitcock [Fri, 18 Jan 2019 22:32:01 +0000 (22:32 +0000)]
test: add regression test for to/cc clobbering

5 years ago[#491] Made full nicknames be preserved in user links text only in Bio.
Ivan Tashkinov [Fri, 18 Jan 2019 06:30:16 +0000 (09:30 +0300)]
[#491] Made full nicknames be preserved in user links text only in Bio.

5 years agoactivitypub: add a match clause for objects, not just activities
William Pitcock [Thu, 17 Jan 2019 23:32:16 +0000 (23:32 +0000)]
activitypub: add a match clause for objects, not just activities

5 years agoactivitypub: transmogrifier: do not clobber the addressing on relayed announcements
William Pitcock [Thu, 17 Jan 2019 23:19:15 +0000 (23:19 +0000)]
activitypub: transmogrifier: do not clobber the addressing on relayed announcements

5 years agoactivitypub: allow is_public?() to work on any type of map representing an AS2 object
William Pitcock [Thu, 17 Jan 2019 23:17:59 +0000 (23:17 +0000)]
activitypub: allow is_public?() to work on any type of map representing an AS2 object

5 years agoactivitypub: relay: chase selective public announce changes
William Pitcock [Thu, 17 Jan 2019 23:13:54 +0000 (23:13 +0000)]
activitypub: relay: chase selective public announce changes

5 years agoactivitypub: announce: add new public parameter
William Pitcock [Thu, 17 Jan 2019 23:12:42 +0000 (23:12 +0000)]
activitypub: announce: add new public parameter

5 years agoMerge branch '502_instance_stats_active_users_count_fix' into 'develop'
kaniini [Thu, 17 Jan 2019 19:27:15 +0000 (19:27 +0000)]
Merge branch '502_instance_stats_active_users_count_fix' into 'develop'

[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users

Closes #502

See merge request pleroma/pleroma!678

5 years agoMerge branch 'bad-copy-paste' into 'develop'
kaniini [Thu, 17 Jan 2019 19:22:21 +0000 (19:22 +0000)]
Merge branch 'bad-copy-paste' into 'develop'

Fix bad link in likes collection

See merge request pleroma/pleroma!679

5 years agoMerge branch 'attachment-links' into 'develop'
kaniini [Thu, 17 Jan 2019 19:21:54 +0000 (19:21 +0000)]
Merge branch 'attachment-links' into 'develop'

Make attachment links configurable

See merge request pleroma/pleroma!677

5 years agoMerge branch 'change-mix-location' into 'develop'
kaniini [Thu, 17 Jan 2019 19:21:07 +0000 (19:21 +0000)]
Merge branch 'change-mix-location' into 'develop'

systemd: Add comments and change default path of the Mix binary.

See merge request pleroma/pleroma!680

5 years agoAdd comments and change default path of the Mix binary.
shibayashi [Thu, 17 Jan 2019 18:49:54 +0000 (19:49 +0100)]
Add comments and change default path of the Mix binary.

5 years agoFix bad link in likes collection
sxsdv1 [Thu, 17 Jan 2019 17:21:43 +0000 (18:21 +0100)]
Fix bad link in likes collection

Don't copy and paste, mkay

5 years ago[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.
Ivan Tashkinov [Thu, 17 Jan 2019 16:16:02 +0000 (19:16 +0300)]
[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.

5 years agoformatting
Mark Felder [Thu, 17 Jan 2019 16:10:26 +0000 (16:10 +0000)]
formatting

5 years agoDefault to disabled in the code in case the setting is absent from config.exs
Mark Felder [Thu, 17 Jan 2019 16:01:25 +0000 (16:01 +0000)]
Default to disabled in the code in case the setting is absent from config.exs

5 years agoAlso add to default config
Mark Felder [Thu, 17 Jan 2019 15:50:34 +0000 (15:50 +0000)]
Also add to default config

5 years agoMake attachment links configurable
Mark Felder [Thu, 17 Jan 2019 15:48:14 +0000 (15:48 +0000)]
Make attachment links configurable

Thanks @href!

5 years ago[#491] Made user bio preserve full nicknames (nick@host).
Ivan Tashkinov [Thu, 17 Jan 2019 15:03:49 +0000 (18:03 +0300)]
[#491] Made user bio preserve full nicknames (nick@host).

5 years agoMerge branch 'resilient-user-view-2' into 'develop'
kaniini [Thu, 17 Jan 2019 03:19:55 +0000 (03:19 +0000)]
Merge branch 'resilient-user-view-2' into 'develop'

MastoAPI: Don't break on missing users.

See merge request pleroma/pleroma!675

5 years agoMastoAPI: Don't break on missing users.
lain [Wed, 16 Jan 2019 14:13:09 +0000 (15:13 +0100)]
MastoAPI: Don't break on missing users.

5 years agoMerge branch 'feature/improve-microformats' into 'develop'
lambda [Wed, 16 Jan 2019 09:06:47 +0000 (09:06 +0000)]
Merge branch 'feature/improve-microformats' into 'develop'

improve microformats support

See merge request pleroma/pleroma!672

5 years agoMerge branch '518_instance_stats_fix' into 'develop'
lambda [Wed, 16 Jan 2019 08:59:40 +0000 (08:59 +0000)]
Merge branch '518_instance_stats_fix' into 'develop'

[#518] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers

Closes #518

See merge request pleroma/pleroma!673

5 years ago[#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers respo...
Ivan Tashkinov [Wed, 16 Jan 2019 08:07:46 +0000 (11:07 +0300)]
[#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.

5 years agotests: fixup
William Pitcock [Wed, 16 Jan 2019 04:09:01 +0000 (04:09 +0000)]
tests: fixup

5 years agoformatter: improve microformats markup
William Pitcock [Wed, 16 Jan 2019 03:53:36 +0000 (03:53 +0000)]
formatter: improve microformats markup

5 years agohtml: allow microformats-related markup through the html filter
William Pitcock [Wed, 16 Jan 2019 03:48:43 +0000 (03:48 +0000)]
html: allow microformats-related markup through the html filter

5 years agoMerge branch 'bugfix/websub-hardening' into 'develop'
lambda [Tue, 15 Jan 2019 20:02:56 +0000 (20:02 +0000)]
Merge branch 'bugfix/websub-hardening' into 'develop'

websub: improve error handling

See merge request pleroma/pleroma!670

5 years agoMerge branch 'bugfix/tesla-query-params' into 'develop'
lambda [Tue, 15 Jan 2019 20:00:22 +0000 (20:00 +0000)]
Merge branch 'bugfix/tesla-query-params' into 'develop'

Make OStatus Work Again

See merge request pleroma/pleroma!671

5 years agohttp: add support for query parameters, use Jason for JSON encoding instead of Poison...
William Pitcock [Tue, 15 Jan 2019 19:31:13 +0000 (19:31 +0000)]
http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else

5 years agowebsub: improve error handling
William Pitcock [Tue, 15 Jan 2019 18:00:20 +0000 (18:00 +0000)]
websub: improve error handling

5 years agoMerge branch 'fix/elixir-1-8-type-annotation' into 'develop'
lambda [Tue, 15 Jan 2019 08:51:59 +0000 (08:51 +0000)]
Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'

Fix Elixir 1.8 type annotation issue

Closes #523

See merge request pleroma/pleroma!668

5 years agoMerge branch 'bugfix/upload_with_question_mark' into 'develop'
rinpatch [Tue, 15 Jan 2019 07:01:50 +0000 (07:01 +0000)]
Merge branch 'bugfix/upload_with_question_mark' into 'develop'

Upload: Fix uploading with a ? in the filename

See merge request pleroma/pleroma!669

5 years agoUpload: Fix uploading with a : in the filename
Haelwenn (lanodan) Monnier [Tue, 15 Jan 2019 06:57:48 +0000 (07:57 +0100)]
Upload: Fix uploading with a : in the filename

5 years agoUpload: Fix uploading with a ? in the filename
Haelwenn (lanodan) Monnier [Tue, 15 Jan 2019 06:40:00 +0000 (07:40 +0100)]
Upload: Fix uploading with a ? in the filename

5 years agoFix Elixir 1.8 type annotation issue
Maxim Filippov [Tue, 15 Jan 2019 00:58:48 +0000 (02:58 +0200)]
Fix Elixir 1.8 type annotation issue

5 years agoMerge branch 'media-url-escape' into 'develop'
rinpatch [Mon, 14 Jan 2019 18:52:23 +0000 (18:52 +0000)]
Merge branch 'media-url-escape' into 'develop'

URI escape file upload URLs

See merge request pleroma/pleroma!665

5 years agoMerge branch 'load-all-dms' into 'develop'
lambda [Mon, 14 Jan 2019 18:49:53 +0000 (18:49 +0000)]
Merge branch 'load-all-dms' into 'develop'

Remove recent activity restriction.

See merge request pleroma/pleroma!644

5 years agoAdd attachment escaping test
Shadowfacts [Mon, 14 Jan 2019 18:29:38 +0000 (13:29 -0500)]
Add attachment escaping test

5 years agoURI escape file upload URLs
Shadowfacts [Mon, 14 Jan 2019 16:31:44 +0000 (11:31 -0500)]
URI escape file upload URLs

5 years agoMerge branch 'feature/add-oembed-parser' into 'develop'
kaniini [Mon, 14 Jan 2019 07:28:04 +0000 (07:28 +0000)]
Merge branch 'feature/add-oembed-parser' into 'develop'

Add OEmbed parser

See merge request pleroma/pleroma!661

5 years agoMerge branch 'activitypub-likes' into 'develop'
kaniini [Mon, 14 Jan 2019 07:27:05 +0000 (07:27 +0000)]
Merge branch 'activitypub-likes' into 'develop'

Activitypub c2s likes

See merge request pleroma/pleroma!658

5 years agoMerge branch 'fix-nginx-caching' into 'develop'
kaniini [Mon, 14 Jan 2019 07:25:08 +0000 (07:25 +0000)]
Merge branch 'fix-nginx-caching' into 'develop'

Fix nginx caching issues

See merge request pleroma/pleroma!654

5 years agoMerge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'
kaniini [Mon, 14 Jan 2019 07:23:33 +0000 (07:23 +0000)]
Merge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'

mrf: add no placeholder-text policy, strips pointless "." content from posts with images

See merge request pleroma/pleroma!662

5 years agomrf: add no placeholder-text policy, strips pointless "." content from posts with...
William Pitcock [Mon, 14 Jan 2019 05:31:57 +0000 (05:31 +0000)]
mrf: add no placeholder-text policy, strips pointless "." content from posts with images

5 years agoMerge branch 'bugfix/favourites-link-header' into 'develop'
lambda [Sun, 13 Jan 2019 16:01:15 +0000 (16:01 +0000)]
Merge branch 'bugfix/favourites-link-header' into 'develop'

Add link headers and honour parameters on Mastodon API /favourites

See merge request pleroma/pleroma!659

5 years agoAdd test for mastodon API /favourites endpoint
Sadposter [Sun, 13 Jan 2019 15:17:47 +0000 (15:17 +0000)]
Add test for mastodon API /favourites endpoint

5 years agoAdd OEmbed parser
Maxim Filippov [Sun, 13 Jan 2019 00:06:50 +0000 (02:06 +0200)]
Add OEmbed parser

5 years agoAdd likes to activitypub object representation
sxsdv1 [Wed, 9 Jan 2019 08:22:00 +0000 (09:22 +0100)]
Add likes to activitypub object representation

Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.

5 years agoAdd route to get object like activities
sxsdv1 [Fri, 11 Jan 2019 22:34:32 +0000 (23:34 +0100)]
Add route to get object like activities

5 years agoHandle client submitted activitypub like activity
sxsdv1 [Tue, 8 Jan 2019 18:22:26 +0000 (19:22 +0100)]
Handle client submitted activitypub like activity

5 years agoPrepare all types objects before serialising
sxsdv1 [Sat, 12 Jan 2019 16:52:30 +0000 (17:52 +0100)]
Prepare all types objects before serialising

Activities returned from inbox can include other types of objects like
Article

5 years agoHonour parameters on MastoAPI /favourites
Sadposter [Sat, 12 Jan 2019 14:42:52 +0000 (14:42 +0000)]
Honour parameters on MastoAPI /favourites

5 years agoAdd link headers to MastoAPI /favourites
Sadposter [Sat, 12 Jan 2019 14:03:35 +0000 (14:03 +0000)]
Add link headers to MastoAPI /favourites

As documented at https://docs.joinmastodon.org/api/rest/favourites/

5 years agoMerge branch 'bugfix/pinned-statuses' into 'develop'
kaniini [Fri, 11 Jan 2019 23:09:41 +0000 (23:09 +0000)]
Merge branch 'bugfix/pinned-statuses' into 'develop'

Unpin when deleting a status

See merge request pleroma/pleroma!655

5 years agoMerge branch 'fix-spellign' into 'develop'
scarlett [Fri, 11 Jan 2019 10:02:25 +0000 (10:02 +0000)]
Merge branch 'fix-spellign' into 'develop'

Fix spellign.

See merge request pleroma/pleroma!656

5 years agoFix spellign.
scarlett [Fri, 11 Jan 2019 09:55:33 +0000 (09:55 +0000)]
Fix spellign.

5 years agotypo
Egor Kislitsyn [Fri, 11 Jan 2019 05:47:44 +0000 (12:47 +0700)]
typo

5 years agounpin when deleting a status
Egor Kislitsyn [Fri, 11 Jan 2019 05:31:31 +0000 (12:31 +0700)]
unpin when deleting a status

5 years agoFix nginx caching issues
Mark Felder [Thu, 10 Jan 2019 21:29:05 +0000 (21:29 +0000)]
Fix nginx caching issues

Nginx is currently not caching data because proxy_buffering needs to be
enabled for caching to work at all, and we are receiving a Cache-Control
header from Pleroma that states "max-age=0, private, must-revalidate"

Even disregarding the Cache-Control header that should actually be set
to "public, max-age=1209600" as defined in the reverse_proxy code, we
don't want to obey this header at all as it overrides our Nginx caching
rules.

5 years agoMerge branch 'fix-varnish-chunked' into 'develop'
kaniini [Thu, 10 Jan 2019 18:49:00 +0000 (18:49 +0000)]
Merge branch 'fix-varnish-chunked' into 'develop'

Fix varnish chunked and general improvements

See merge request pleroma/pleroma!653

5 years agoMerge branch 'activitypub-dereference-activity-id' into 'develop'
kaniini [Thu, 10 Jan 2019 18:42:36 +0000 (18:42 +0000)]
Merge branch 'activitypub-dereference-activity-id' into 'develop'

Support activity+json request for activity

See merge request pleroma/pleroma!641

5 years agoConsistent intentation
Mark Felder [Thu, 10 Jan 2019 18:29:36 +0000 (18:29 +0000)]
Consistent intentation

5 years agoCache partial objects for 10 minutes
Mark Felder [Thu, 10 Jan 2019 18:28:14 +0000 (18:28 +0000)]
Cache partial objects for 10 minutes
This enables caching/streaming of chunked responses

5 years agoStreaming is enabled by default
Mark Felder [Thu, 10 Jan 2019 18:23:22 +0000 (18:23 +0000)]
Streaming is enabled by default
Support more filetypes for caching static media

5 years agoMerge branch 'feature/add-twitter-card-parser' into 'develop'
kaniini [Thu, 10 Jan 2019 18:09:56 +0000 (18:09 +0000)]
Merge branch 'feature/add-twitter-card-parser' into 'develop'

Add Twitter Card parser

See merge request pleroma/pleroma!643

5 years agoAdd Twitter Card parser
Maxim Filippov [Thu, 10 Jan 2019 18:09:56 +0000 (18:09 +0000)]
Add Twitter Card parser

5 years agoMerge branch 'twapi-follower-pagination' into 'develop'
kaniini [Thu, 10 Jan 2019 18:03:32 +0000 (18:03 +0000)]
Merge branch 'twapi-follower-pagination' into 'develop'

Twapi follower pagination

See merge request pleroma/pleroma!648

5 years agoMerge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
Haelwenn [Thu, 10 Jan 2019 03:54:29 +0000 (03:54 +0000)]
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'

common api: fix newlines in markdown code blocks

See merge request pleroma/pleroma!651

5 years agotest: common api: add tests for format_input/4
William Pitcock [Thu, 10 Jan 2019 03:46:34 +0000 (03:46 +0000)]
test: common api: add tests for format_input/4

5 years agocommon api: utils: remove newline to <br> conversion from bare HTML to be consistent...
William Pitcock [Thu, 10 Jan 2019 03:45:58 +0000 (03:45 +0000)]
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown

ok @lanodan

5 years agocommon api: fix newlines in markdown code blocks
William Pitcock [Thu, 10 Jan 2019 02:22:11 +0000 (02:22 +0000)]
common api: fix newlines in markdown code blocks

5 years agoMerge branch 'feature/pinned-posts' into 'develop'
kaniini [Thu, 10 Jan 2019 02:39:53 +0000 (02:39 +0000)]
Merge branch 'feature/pinned-posts' into 'develop'

Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636

5 years agoMerge branch 'mass-follow' into 'develop'
kaniini [Thu, 10 Jan 2019 02:33:11 +0000 (02:33 +0000)]
Merge branch 'mass-follow' into 'develop'

Mass follow

See merge request pleroma/pleroma!642

5 years agoMerge branch 'dm-optimizations' into 'develop'
kaniini [Thu, 10 Jan 2019 02:31:29 +0000 (02:31 +0000)]
Merge branch 'dm-optimizations' into 'develop'

Add activity visibility index.

See merge request pleroma/pleroma!646

5 years agoMerge branch 'fix-alphasort' into 'develop'
kaniini [Thu, 10 Jan 2019 01:08:33 +0000 (01:08 +0000)]
Merge branch 'fix-alphasort' into 'develop'

Alpha sort the restricted nicknames

See merge request pleroma/pleroma!650

5 years agoAlpha sort the restricted nicknames
Mark Felder [Thu, 10 Jan 2019 00:06:03 +0000 (00:06 +0000)]
Alpha sort the restricted nicknames

5 years agoMerge branch 'hotfix/ogp-cachex-fix' into 'develop'
rinpatch [Wed, 9 Jan 2019 18:42:00 +0000 (18:42 +0000)]
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'

Rich media: Remove :commit since a tuple is already returned

See merge request pleroma/pleroma!649

5 years agoRemove :commit since a tuple is already returned
rinpatch [Wed, 9 Jan 2019 18:35:01 +0000 (21:35 +0300)]
Remove :commit since a tuple is already returned

5 years agoAdd integer casts.
lain [Wed, 9 Jan 2019 17:17:23 +0000 (18:17 +0100)]
Add integer casts.

5 years agoTwitterAPI: Add follower/following pagination.
lain [Wed, 9 Jan 2019 17:14:32 +0000 (18:14 +0100)]
TwitterAPI: Add follower/following pagination.

5 years agoMerge branch 'scarlett/pleroma-summary-html-api' into 'develop'
lambda [Wed, 9 Jan 2019 16:26:38 +0000 (16:26 +0000)]
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'

Scarlett/pleroma summary html api

See merge request pleroma/pleroma!647

5 years agoAdd test for summary_html
lain [Wed, 9 Jan 2019 16:18:37 +0000 (17:18 +0100)]
Add test for summary_html

5 years agoBuild the index concurrently.
lain [Wed, 9 Jan 2019 15:55:05 +0000 (16:55 +0100)]
Build the index concurrently.

5 years agoAdd activity visibility index.
lain [Wed, 9 Jan 2019 15:45:09 +0000 (16:45 +0100)]
Add activity visibility index.

5 years agoimprove tests
Egor Kislitsyn [Wed, 9 Jan 2019 12:54:37 +0000 (19:54 +0700)]
improve tests

5 years agoAdd Twitter API for the pinned statuses
Egor Kislitsyn [Wed, 9 Jan 2019 12:54:19 +0000 (19:54 +0700)]
Add Twitter API for the pinned statuses

```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true

# Pin
POST /api/statuses/pin/:id

# Unpin
POST /api/statuses/unpin/:id
```

5 years agoRemove recent activity restriction.
lain [Wed, 9 Jan 2019 11:38:23 +0000 (12:38 +0100)]
Remove recent activity restriction.

This should be fine now, everything should be covered by indices.

5 years agoonly non-reblogs, self-authored, public statuses can be pinned
Egor Kislitsyn [Wed, 9 Jan 2019 10:40:15 +0000 (17:40 +0700)]
only non-reblogs, self-authored, public statuses can be pinned

5 years agoUse follow_all in autofollow.
lain [Wed, 9 Jan 2019 10:38:45 +0000 (11:38 +0100)]
Use follow_all in autofollow.

5 years agoAdd User mass following function.
lain [Wed, 9 Jan 2019 10:35:23 +0000 (11:35 +0100)]
Add User mass following function.

5 years agomove defaults from sample_config.exs to config.exs
Egor Kislitsyn [Wed, 9 Jan 2019 10:02:30 +0000 (17:02 +0700)]
move defaults from sample_config.exs to config.exs

5 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...
Egor Kislitsyn [Wed, 9 Jan 2019 09:56:31 +0000 (16:56 +0700)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts

# Conflicts:
# docs/config.md

5 years agoSupport activity+json request for activity
sxsdv1 [Tue, 8 Jan 2019 22:22:15 +0000 (23:22 +0100)]
Support activity+json request for activity

5 years agoMerge branch 'hotfix/media-proxy-uri' into 'develop'
kaniini [Wed, 9 Jan 2019 07:09:39 +0000 (07:09 +0000)]
Merge branch 'hotfix/media-proxy-uri' into 'develop'

user: fix local vs remote determination in remote_or_auth_active?/1

See merge request pleroma/pleroma!640

5 years agotest: user: add tests for visible_for?/2
William Pitcock [Wed, 9 Jan 2019 07:03:32 +0000 (07:03 +0000)]
test: user: add tests for visible_for?/2

5 years agotests: user: add tests for superuser?/1
William Pitcock [Wed, 9 Jan 2019 06:50:31 +0000 (06:50 +0000)]
tests: user: add tests for superuser?/1

5 years agouser: fix auth_active?/1 for remote users
William Pitcock [Wed, 9 Jan 2019 06:45:17 +0000 (06:45 +0000)]
user: fix auth_active?/1 for remote users