akkoma
5 years agoSpecify default scope in verify_credentials
Will Pearson [Sat, 1 Sep 2018 03:59:43 +0000 (20:59 -0700)]
Specify default scope in verify_credentials

Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.

Currently, Pleroma hardcodes this value to "public".

This patch changes it to the user's default_scope value.

5 years ago[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
Haelwenn (lanodan) Monnier [Sat, 1 Sep 2018 01:08:54 +0000 (03:08 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication

5 years agoadd nil clause for Formatter.get_emoji/1 to return an empty result
Thurloat [Fri, 31 Aug 2018 17:28:39 +0000 (14:28 -0300)]
add nil clause for Formatter.get_emoji/1 to return an empty result

5 years agoMerge branch 'revert-a26d5e6b' into 'develop'
lambda [Fri, 31 Aug 2018 09:53:00 +0000 (09:53 +0000)]
Merge branch 'revert-a26d5e6b' into 'develop'

Revert "Merge branch 'feature/rich-text' into 'develop'"

See merge request pleroma/pleroma!313

5 years agoRevert "Merge branch 'feature/rich-text' into 'develop'"
lambda [Fri, 31 Aug 2018 09:51:20 +0000 (09:51 +0000)]
Revert "Merge branch 'feature/rich-text' into 'develop'"

This reverts merge request !309

5 years agoMerge branch 'bugfix/s3-configuration' into 'develop'
kaniini [Fri, 31 Aug 2018 04:50:44 +0000 (04:50 +0000)]
Merge branch 'bugfix/s3-configuration' into 'develop'

config: fix up defaults for s3 endpoint configuration

See merge request pleroma/pleroma!312

5 years agoconfig: fix up defaults for s3 endpoint configuration
William Pitcock [Fri, 31 Aug 2018 04:43:15 +0000 (04:43 +0000)]
config: fix up defaults for s3 endpoint configuration

5 years agoMerge branch 'update/pleroma-fe-20180831' into 'develop'
kaniini [Fri, 31 Aug 2018 04:36:04 +0000 (04:36 +0000)]
Merge branch 'update/pleroma-fe-20180831' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!311

5 years agoupdate pleroma frontend
William Pitcock [Fri, 31 Aug 2018 04:35:18 +0000 (04:35 +0000)]
update pleroma frontend

5 years agoMerge branch 'update/pleroma-fe-config-20180831' into 'develop'
kaniini [Fri, 31 Aug 2018 04:06:18 +0000 (04:06 +0000)]
Merge branch 'update/pleroma-fe-config-20180831' into 'develop'

config: chase pleroma-fe updates from MR pleroma-fe!324.

See merge request pleroma/pleroma!310

5 years agoconfig: chase pleroma-fe updates from MR pleroma-fe!324.
William Pitcock [Fri, 31 Aug 2018 04:01:21 +0000 (04:01 +0000)]
config: chase pleroma-fe updates from MR pleroma-fe!324.

5 years agoMerge branch 'feature/rich-text' into 'develop'
kaniini [Fri, 31 Aug 2018 03:41:00 +0000 (03:41 +0000)]
Merge branch 'feature/rich-text' into 'develop'

rich text support

See merge request pleroma/pleroma!309

5 years agotests: add tests for evil HTML filtering
William Pitcock [Fri, 31 Aug 2018 03:34:56 +0000 (03:34 +0000)]
tests: add tests for evil HTML filtering

5 years agocommon api: add support for formatting messages outside of twitter-style plain text
William Pitcock [Fri, 31 Aug 2018 03:13:59 +0000 (03:13 +0000)]
common api: add support for formatting messages outside of twitter-style plain text

5 years agoMerge branch 'use-media-proxy-in-suggestions-api' into 'develop'
kaniini [Thu, 30 Aug 2018 23:06:30 +0000 (23:06 +0000)]
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'

use media proxy for the suggestions api

See merge request pleroma/pleroma!305

5 years agoMerge branch 'backendhack' into 'develop'
kaniini [Thu, 30 Aug 2018 23:05:01 +0000 (23:05 +0000)]
Merge branch 'backendhack' into 'develop'

Flexible Storage Backends

See merge request pleroma/pleroma!304

5 years agoincrease uploader behaviour documentation accuracy.
Thurloat [Thu, 30 Aug 2018 12:20:29 +0000 (09:20 -0300)]
increase uploader behaviour documentation accuracy.

5 years agoAdd frame-ancestors 'none' to all configs
shibayashi [Thu, 30 Aug 2018 09:10:16 +0000 (11:10 +0200)]
Add frame-ancestors 'none' to all configs

5 years agoAdd backend failure handling with :ok | :error so the uploader can handle it.
Thurloat [Thu, 30 Aug 2018 01:07:28 +0000 (22:07 -0300)]
Add backend failure handling with :ok | :error so the uploader can handle it.

defaulting to :ok, since that's the currently level of error handling.

5 years agomigrations: add index creation migration and recipients_to/cc removal migration
William Pitcock [Wed, 29 Aug 2018 18:38:51 +0000 (18:38 +0000)]
migrations: add index creation migration and recipients_to/cc removal migration

5 years agoactivity: drop recipients_to/recipients_cc fields
William Pitcock [Wed, 29 Aug 2018 18:38:30 +0000 (18:38 +0000)]
activity: drop recipients_to/recipients_cc fields

5 years agomigrations: drop filler migration
William Pitcock [Wed, 29 Aug 2018 18:33:09 +0000 (18:33 +0000)]
migrations: drop filler migration

5 years agoactivitypub: use jsonb query for containment instead of recipients_to/recipients_cc.
William Pitcock [Wed, 29 Aug 2018 18:32:04 +0000 (18:32 +0000)]
activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.

5 years agoinstallation/pleroma.nginx: Add 'always' to the security headers, so that they are...
shibayashi [Wed, 29 Aug 2018 17:00:40 +0000 (19:00 +0200)]
installation/pleroma.nginx: Add 'always' to the security headers, so that they are included regardless of the status code

5 years agoMerge branch 'fix-mastodon-notifications-without-nickname' into 'develop'
Haelwenn [Wed, 29 Aug 2018 14:43:45 +0000 (14:43 +0000)]
Merge branch 'fix-mastodon-notifications-without-nickname' into 'develop'

Fix Mastodon API when actor's nickname is null

See merge request pleroma/pleroma!308

5 years agoFix Mastodon API when actor's nickname is null
href [Wed, 29 Aug 2018 14:26:36 +0000 (16:26 +0200)]
Fix Mastodon API when actor's nickname is null

5 years agostreamer: contain list updates in the same way as we do with the database query
William Pitcock [Wed, 29 Aug 2018 09:23:05 +0000 (09:23 +0000)]
streamer: contain list updates in the same way as we do with the database query

5 years agomastodon api: use bounded AP object graph query to enforce containment of private...
William Pitcock [Wed, 29 Aug 2018 08:51:51 +0000 (08:51 +0000)]
mastodon api: use bounded AP object graph query to enforce containment of private statuses

5 years agoactivitypub: allow querying the activity/object graph bounded to a specific to/cc set
William Pitcock [Wed, 29 Aug 2018 08:51:23 +0000 (08:51 +0000)]
activitypub: allow querying the activity/object graph bounded to a specific to/cc set

5 years agotest: add testcase proving lists system does not leak non-public posts
William Pitcock [Wed, 29 Aug 2018 08:50:23 +0000 (08:50 +0000)]
test: add testcase proving lists system does not leak non-public posts

5 years agomigrations: add migration to fill in recipients_to/recipients_cc fields
William Pitcock [Wed, 29 Aug 2018 08:43:24 +0000 (08:43 +0000)]
migrations: add migration to fill in recipients_to/recipients_cc fields

5 years agoactivity: add recipients_to and recipients_cc fields
William Pitcock [Wed, 29 Aug 2018 08:37:36 +0000 (08:37 +0000)]
activity: add recipients_to and recipients_cc fields

5 years agofix S3 ref in sample config to generate proper path.
Thurloat [Wed, 29 Aug 2018 02:49:23 +0000 (23:49 -0300)]
fix S3 ref in sample config to generate proper path.

5 years agoadd a sample swift config
Thurloat [Wed, 29 Aug 2018 01:39:33 +0000 (22:39 -0300)]
add a sample swift config

5 years agoA hobbldey-working swift client.
Thurloat [Wed, 29 Aug 2018 01:32:24 +0000 (22:32 -0300)]
A hobbldey-working swift client.

apparently, all elixir openstack libraries are trash
luckily, the APIs are stupid easy.

5 years agoinstallation/pleroma-apache.conf: Add TLS configuration and security headers
shibayashi [Tue, 28 Aug 2018 23:29:04 +0000 (01:29 +0200)]
installation/pleroma-apache.conf: Add TLS configuration and security headers

5 years agoinstallation/pleroma.vcl: Add HTTP security headers
shibayashi [Tue, 28 Aug 2018 23:28:10 +0000 (01:28 +0200)]
installation/pleroma.vcl: Add HTTP security headers

5 years agoinstallation/caddyfile-pleroma.example: Add Content-Security-Policy
shibayashi [Tue, 28 Aug 2018 23:16:13 +0000 (01:16 +0200)]
installation/caddyfile-pleroma.example: Add Content-Security-Policy

5 years agoworks now, tested with profile photo upload on local backend.
Thurloat [Tue, 28 Aug 2018 23:04:26 +0000 (20:04 -0300)]
works now, tested with profile photo upload on local backend.

5 years agoadd the behaviour, work on actually making it work.
Thurloat [Tue, 28 Aug 2018 22:48:03 +0000 (19:48 -0300)]
add the behaviour, work on actually making it work.

5 years agoExplicitly set 'http_only' to true
shibayashi [Tue, 28 Aug 2018 20:34:31 +0000 (22:34 +0200)]
Explicitly set 'http_only' to true

5 years agoinstallation/pleroma.nginx: Add Content-Security-Policy
Haelwenn (lanodan) Monnier [Tue, 28 Aug 2018 18:54:50 +0000 (20:54 +0200)]
installation/pleroma.nginx: Add Content-Security-Policy

Closes: https://git.pleroma.social/pleroma/pleroma/issues/266
5 years agoImplement uploader behaviour
Thurloat [Tue, 28 Aug 2018 12:57:41 +0000 (09:57 -0300)]
Implement uploader behaviour

run formatter <#

5 years agoSet SameSite flag to 'Strict'
shibayashi [Tue, 28 Aug 2018 12:03:29 +0000 (14:03 +0200)]
Set SameSite flag to 'Strict'

5 years agouse media proxy for suggestions api
Hakaba Hitoyo [Tue, 28 Aug 2018 08:01:17 +0000 (17:01 +0900)]
use media proxy for suggestions api

5 years agocleaning up a bit.
Thurloat [Tue, 28 Aug 2018 01:45:53 +0000 (22:45 -0300)]
cleaning up a bit.

5 years agoexample of flexible storage backends
Thurloat [Tue, 28 Aug 2018 01:20:54 +0000 (22:20 -0300)]
example of flexible storage backends

5 years agoMerge branch 'feature/s3' into 'develop'
kaniini [Tue, 28 Aug 2018 00:29:49 +0000 (00:29 +0000)]
Merge branch 'feature/s3' into 'develop'

S3 support

Closes #65

See merge request pleroma/pleroma!303

5 years agoupload: formatting
William Pitcock [Tue, 28 Aug 2018 00:25:30 +0000 (00:25 +0000)]
upload: formatting

5 years agoupload: add the S3 support itself
William Pitcock [Tue, 28 Aug 2018 00:18:44 +0000 (00:18 +0000)]
upload: add the S3 support itself

5 years agosample config: add S3 public endpoint option
William Pitcock [Tue, 28 Aug 2018 00:18:24 +0000 (00:18 +0000)]
sample config: add S3 public endpoint option

5 years agoupload: strip exif data before finalizing the file path
William Pitcock [Mon, 27 Aug 2018 23:36:30 +0000 (23:36 +0000)]
upload: strip exif data before finalizing the file path

5 years agosample config: show how amazon s3 support is activated, including third-party clones...
William Pitcock [Mon, 27 Aug 2018 23:30:53 +0000 (23:30 +0000)]
sample config: show how amazon s3 support is activated, including third-party clones like wasabi

5 years agomix: add ex_aws and ex_aws_s3 dependencies
William Pitcock [Mon, 27 Aug 2018 23:24:35 +0000 (23:24 +0000)]
mix: add ex_aws and ex_aws_s3 dependencies

5 years agoFix formatting
shibayashi [Mon, 27 Aug 2018 22:47:34 +0000 (00:47 +0200)]
Fix formatting

5 years agoAdd Secure and SameSite cookie flags
shibayashi [Mon, 27 Aug 2018 22:40:58 +0000 (00:40 +0200)]
Add Secure and SameSite cookie flags

5 years agobetter solution, added test.
Henry Jameson [Mon, 27 Aug 2018 14:07:26 +0000 (17:07 +0300)]
better solution, added test.

5 years ago[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable
Haelwenn (lanodan) Monnier [Tue, 21 Aug 2018 18:35:14 +0000 (20:35 +0200)]
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable

5 years ago[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A
Haelwenn (lanodan) Monnier [Tue, 21 Aug 2018 17:45:58 +0000 (19:45 +0200)]
[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A

5 years ago[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3
Haelwenn (lanodan) Monnier [Fri, 10 Aug 2018 02:28:29 +0000 (04:28 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3

5 years ago[MastodonAPI] Add filters
Haelwenn (lanodan) Monnier [Tue, 14 Aug 2018 02:27:28 +0000 (04:27 +0200)]
[MastodonAPI] Add filters

5 years ago[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
Haelwenn (lanodan) Monnier [Fri, 10 Aug 2018 00:41:01 +0000 (02:41 +0200)]
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support

5 years ago[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
Haelwenn (lanodan) Monnier [Thu, 9 Aug 2018 23:44:38 +0000 (01:44 +0200)]
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field

5 years ago[MastodonAPI] the tag field isn’t fixed to a static type in pleroma
Haelwenn (lanodan) Monnier [Tue, 7 Aug 2018 21:49:35 +0000 (23:49 +0200)]
[MastodonAPI] the tag field isn’t fixed to a static type in pleroma

5 years ago[MastodonAPI] Add streaming of hashtags
Haelwenn (lanodan) Monnier [Tue, 7 Aug 2018 20:45:40 +0000 (22:45 +0200)]
[MastodonAPI] Add streaming of hashtags

5 years agoRevert "enable scope options and such"
William Pitcock [Mon, 27 Aug 2018 10:49:12 +0000 (10:49 +0000)]
Revert "enable scope options and such"

This reverts commit e5642d75668298eff25309a8ee775ec38ed927f3.

5 years agoenable scope options and such
William Pitcock [Mon, 20 Aug 2018 18:29:53 +0000 (18:29 +0000)]
enable scope options and such

5 years agoformatting
William Pitcock [Tue, 14 Aug 2018 17:07:10 +0000 (17:07 +0000)]
formatting

5 years agouser: fix up notification last calculation [NOT related to upstream]
William Pitcock [Mon, 6 Aug 2018 11:20:41 +0000 (11:20 +0000)]
user: fix up notification last calculation [NOT related to upstream]

5 years agoMerge branch 'feature/relay' into 'develop'
lambda [Mon, 27 Aug 2018 08:29:25 +0000 (08:29 +0000)]
Merge branch 'feature/relay' into 'develop'

message relay

Closes #144

See merge request pleroma/pleroma!264

5 years agoMerge branch 'bugfix/announce-timeline-flooding' into 'develop'
lambda [Mon, 27 Aug 2018 08:25:27 +0000 (08:25 +0000)]
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

5 years agoMerge branch 'feature/emoji-in-local-users' into 'develop'
kaniini [Sun, 26 Aug 2018 23:24:41 +0000 (23:24 +0000)]
Merge branch 'feature/emoji-in-local-users' into 'develop'

Add emoji to local user profiles.

Closes #202

See merge request pleroma/pleroma!271

5 years agotests: fix formatting
William Pitcock [Sun, 26 Aug 2018 23:19:45 +0000 (23:19 +0000)]
tests: fix formatting

5 years agoMerge branch 'bugfix/formatting' into 'develop'
kaniini [Sun, 26 Aug 2018 22:56:18 +0000 (22:56 +0000)]
Merge branch 'bugfix/formatting' into 'develop'

fix formatting

See merge request pleroma/pleroma!301

5 years agofix formatting
William Pitcock [Sun, 26 Aug 2018 22:46:25 +0000 (22:46 +0000)]
fix formatting

5 years agoMerge branch 'tests/notification-smoketests' into 'develop'
kaniini [Sun, 26 Aug 2018 22:44:22 +0000 (22:44 +0000)]
Merge branch 'tests/notification-smoketests' into 'develop'

tests: add notification smoketests (ref #265)

See merge request pleroma/pleroma!300

5 years agotests: add notification smoketests (ref #265)
William Pitcock [Sun, 26 Aug 2018 22:42:02 +0000 (22:42 +0000)]
tests: add notification smoketests (ref #265)

5 years agoMerge branch 'bugfix/common-api-visibility-orphan' into 'develop'
kaniini [Sun, 26 Aug 2018 22:39:15 +0000 (22:39 +0000)]
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'

common api: properly handle replying to orphaned threads

See merge request pleroma/pleroma!299

5 years agocommon api: handle replying to orphaned threads
William Pitcock [Sun, 26 Aug 2018 22:37:36 +0000 (22:37 +0000)]
common api: handle replying to orphaned threads

5 years agoMerge branch 'login-with-email' into 'develop'
kaniini [Sun, 26 Aug 2018 21:35:12 +0000 (21:35 +0000)]
Merge branch 'login-with-email' into 'develop'

When logging in, try treating the login as an email

Closes #245

See merge request pleroma/pleroma!295

5 years agoMerge branch 'develop' into 'feature/relay'
kaniini [Sun, 26 Aug 2018 21:06:15 +0000 (21:06 +0000)]
Merge branch 'develop' into 'feature/relay'

# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex

5 years agoMerge branch 'update-pleroma-frontend' into 'develop'
kaniini [Sun, 26 Aug 2018 20:18:16 +0000 (20:18 +0000)]
Merge branch 'update-pleroma-frontend' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!298

5 years agoMerge branch 'improve-example-caddyfile' into 'develop'
kaniini [Sun, 26 Aug 2018 20:16:46 +0000 (20:16 +0000)]
Merge branch 'improve-example-caddyfile' into 'develop'

Improve example Caddyfile

See merge request pleroma/pleroma!296

5 years agoMerge branch 'remove-unused-settings' into 'develop'
kaniini [Sun, 26 Aug 2018 20:16:12 +0000 (20:16 +0000)]
Merge branch 'remove-unused-settings' into 'develop'

Remove unused settings

See merge request pleroma/pleroma!297

5 years agoupdate pleroma frontend
hakabahitoyo [Sun, 26 Aug 2018 12:08:03 +0000 (21:08 +0900)]
update pleroma frontend

5 years agoremove unused settings from /api/statusnet/config
hakabahitoyo [Sun, 26 Aug 2018 08:40:15 +0000 (17:40 +0900)]
remove unused settings from /api/statusnet/config

5 years agoremove unused settings
hakabahitoyo [Sun, 26 Aug 2018 08:21:57 +0000 (17:21 +0900)]
remove unused settings

5 years agoImprove example Caddyfile
shibayashi [Sun, 26 Aug 2018 01:36:52 +0000 (03:36 +0200)]
Improve example Caddyfile

5 years agoWhen logging in, try treating the login as an email
Ekaterina Vaartis [Sat, 25 Aug 2018 18:22:34 +0000 (21:22 +0300)]
When logging in, try treating the login as an email

Closes #245

5 years agoMerge branch 'feature/twitterapi-object-description' into 'develop'
kaniini [Sat, 25 Aug 2018 00:20:25 +0000 (00:20 +0000)]
Merge branch 'feature/twitterapi-object-description' into 'develop'

twitter api: provide object descriptions as attachment description field

See merge request pleroma/pleroma!293

5 years agotwitter api: provide object descriptions as attachment description field
William Pitcock [Sat, 25 Aug 2018 00:03:25 +0000 (00:03 +0000)]
twitter api: provide object descriptions as attachment description field

5 years agoMerge branch 'update/pleroma-fe-20180824' into 'develop'
kaniini [Fri, 24 Aug 2018 22:00:13 +0000 (22:00 +0000)]
Merge branch 'update/pleroma-fe-20180824' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!292

5 years agoupdate pleroma frontend
William Pitcock [Fri, 24 Aug 2018 21:58:19 +0000 (21:58 +0000)]
update pleroma frontend

5 years agoMerge branch 'feature/tls-sni-support' into 'develop'
kaniini [Fri, 24 Aug 2018 20:15:59 +0000 (20:15 +0000)]
Merge branch 'feature/tls-sni-support' into 'develop'

http: fix TLS server name indication

Closes #261

See merge request pleroma/pleroma!291

5 years agohttp: fix TLS server name indication
William Pitcock [Fri, 24 Aug 2018 20:01:13 +0000 (20:01 +0000)]
http: fix TLS server name indication

by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.

since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.

closes #261

5 years agoMerge branch 'bugfix/formatter-single-char-nicks' into 'develop'
kaniini [Fri, 24 Aug 2018 18:42:14 +0000 (18:42 +0000)]
Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'

formatter: fix single char local nicknames

Closes #163

See merge request pleroma/pleroma!290

5 years agotests: formatting
William Pitcock [Fri, 24 Aug 2018 18:33:36 +0000 (18:33 +0000)]
tests: formatting

5 years agoMerge branch 'config/fe-collapse-subject' into 'develop'
kaniini [Fri, 24 Aug 2018 18:27:43 +0000 (18:27 +0000)]
Merge branch 'config/fe-collapse-subject' into 'develop'

fe config: add collapse_message_with_subject fe option

See merge request pleroma/pleroma!289

5 years agoformatter: adjust regexp captures to match local users with single character nickname...
William Pitcock [Fri, 24 Aug 2018 18:18:48 +0000 (18:18 +0000)]
formatter: adjust regexp captures to match local users with single character nicknames (closes #163)

5 years agotest: add testcase for formatter issue #163
William Pitcock [Fri, 24 Aug 2018 18:14:19 +0000 (18:14 +0000)]
test: add testcase for formatter issue #163