akkoma
5 years agoactivitypub: refactor relay concerns into new relay module
William Pitcock [Mon, 6 Aug 2018 06:15:22 +0000 (06:15 +0000)]
activitypub: refactor relay concerns into new relay module

5 years agoactivitypub: represent relay actor at instance root
William Pitcock [Mon, 6 Aug 2018 06:11:51 +0000 (06:11 +0000)]
activitypub: represent relay actor at instance root

5 years agouser: support creating an actor which represents the instance itself
William Pitcock [Mon, 6 Aug 2018 05:46:37 +0000 (05:46 +0000)]
user: support creating an actor which represents the instance itself

5 years agoMerge branch 'bugfix/digest-legacy-compat' into 'develop'
lambda [Wed, 1 Aug 2018 10:37:28 +0000 (10:37 +0000)]
Merge branch 'bugfix/digest-legacy-compat' into 'develop'

activitypub: actually send digest header when federating

See merge request pleroma/pleroma!261

5 years agoactivitypub: actually send digest header when federating
William Pitcock [Wed, 1 Aug 2018 10:22:03 +0000 (10:22 +0000)]
activitypub: actually send digest header when federating

this is needed for backwards compatibility with non-digest pleroma instances

5 years agoMerge branch 'security/digest-signature-validation' into 'develop'
lambda [Wed, 1 Aug 2018 08:11:28 +0000 (08:11 +0000)]
Merge branch 'security/digest-signature-validation' into 'develop'

digest signature validation

See merge request pleroma/pleroma!260

5 years agoactivitypub: verify remote http signature digests by recomputing the digest and repla...
William Pitcock [Tue, 31 Jul 2018 23:17:47 +0000 (23:17 +0000)]
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header

5 years agoactivitypub: add digest header to outbound messages and sign it
William Pitcock [Tue, 31 Jul 2018 21:41:18 +0000 (21:41 +0000)]
activitypub: add digest header to outbound messages and sign it

5 years agoMerge branch 'feature/filter_exif' into 'develop'
lambda [Wed, 25 Jul 2018 07:16:50 +0000 (07:16 +0000)]
Merge branch 'feature/filter_exif' into 'develop'

Feature/filter exif (  solve #187 )

See merge request pleroma/pleroma!237

5 years agoMerge remote-tracking branch 'upstream/develop' into feature/filter_exif
Tristan Mahé [Fri, 20 Jul 2018 00:44:18 +0000 (17:44 -0700)]
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif

5 years agoMerge branch 'tests/plume' into 'develop'
lambda [Thu, 19 Jul 2018 07:35:34 +0000 (07:35 +0000)]
Merge branch 'tests/plume' into 'develop'

Articles/Notes with a actor list outside object

See merge request pleroma/pleroma!252

5 years agoMerge branch 'bugfix/activitystreams-notice-urls' into 'develop'
lambda [Thu, 19 Jul 2018 07:31:33 +0000 (07:31 +0000)]
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'

ostatus: return AS2 objects on /notice and /activities URLs like with /objects.

Closes #206

See merge request pleroma/pleroma!251

5 years agoMerge branch 'feature/fe-configuration' into 'develop'
lambda [Thu, 19 Jul 2018 07:31:10 +0000 (07:31 +0000)]
Merge branch 'feature/fe-configuration' into 'develop'

serverside frontend configuration

See merge request pleroma/pleroma!256

5 years agoMerge branch 'feature/media-description' into 'develop'
lambda [Wed, 18 Jul 2018 08:52:11 +0000 (08:52 +0000)]
Merge branch 'feature/media-description' into 'develop'

Feature/media description

Closes #174

See merge request pleroma/pleroma!255

5 years agoconfig: formatting
William Pitcock [Wed, 18 Jul 2018 00:05:36 +0000 (00:05 +0000)]
config: formatting

5 years agoTwitterAPI: present pleroma frontend config in API
William Pitcock [Tue, 17 Jul 2018 15:20:39 +0000 (15:20 +0000)]
TwitterAPI: present pleroma frontend config in API

5 years agoconfig: make instance description configurable
William Pitcock [Tue, 17 Jul 2018 15:10:14 +0000 (15:10 +0000)]
config: make instance description configurable

5 years agotest: mastodon attachments: update for added description field
William Pitcock [Tue, 17 Jul 2018 03:37:40 +0000 (03:37 +0000)]
test: mastodon attachments: update for added description field

5 years agotests: verify media description api support is working
William Pitcock [Tue, 17 Jul 2018 03:37:26 +0000 (03:37 +0000)]
tests: verify media description api support is working

5 years agomastodon api: support descriptions in media api, add PUT endpoint for updating metada...
William Pitcock [Tue, 17 Jul 2018 03:36:50 +0000 (03:36 +0000)]
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload

5 years agomastodon api: use object name as alt text
William Pitcock [Tue, 17 Jul 2018 03:36:11 +0000 (03:36 +0000)]
mastodon api: use object name as alt text

5 years agoupload: use generic Document object type instead of Image (mastodon compatibility)
William Pitcock [Tue, 17 Jul 2018 03:35:08 +0000 (03:35 +0000)]
upload: use generic Document object type instead of Image (mastodon compatibility)

Mastodon does not use the object name as alt text when the object is an Image.

5 years agoMerge remote-tracking branch 'upstream/develop' into feature/filter_exif
Tristan Mahé [Fri, 13 Jul 2018 18:14:37 +0000 (11:14 -0700)]
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif

5 years ago[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 21:25:44 +0000 (23:25 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding

5 years ago[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 21:09:42 +0000 (23:09 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object

The code here is copied from feature/peertube by lain.

Co-authored-by: lain <lain@soykaf.club>
5 years agoAdd test for Plume Articles
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 17:52:17 +0000 (19:52 +0200)]
Add test for Plume Articles

5 years agotest: ostatus controller: add AS2 fetching tests
William Pitcock [Thu, 12 Jul 2018 20:32:05 +0000 (20:32 +0000)]
test: ostatus controller: add AS2 fetching tests

5 years agoostatus: return AS2 objects on /notice and /activities URLs like with /objects.
William Pitcock [Thu, 12 Jul 2018 17:13:20 +0000 (17:13 +0000)]
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.

5 years agoMerge branch 'feature/object-normalization' into 'develop'
lambda [Thu, 12 Jul 2018 16:48:15 +0000 (16:48 +0000)]
Merge branch 'feature/object-normalization' into 'develop'

object normalization

See merge request pleroma/pleroma!238

5 years agoMerge branch 'feature/mediaproxy-nodeinfo' into 'develop'
lambda [Thu, 12 Jul 2018 16:47:19 +0000 (16:47 +0000)]
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'

[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata

Closes #229

See merge request pleroma/pleroma!235

5 years agoMerge branch 'bugfix/activitypub-object-actor' into 'develop'
lambda [Thu, 12 Jul 2018 16:46:50 +0000 (16:46 +0000)]
Merge branch 'bugfix/activitypub-object-actor' into 'develop'

activitypub: more robustly handle object-to-actor associations

See merge request pleroma/pleroma!250

5 years agoMerge branch 'feature/message-summary' into 'develop'
lambda [Thu, 12 Jul 2018 16:45:57 +0000 (16:45 +0000)]
Merge branch 'feature/message-summary' into 'develop'

message summary

See merge request pleroma/pleroma!249

5 years agoactivitypub: more robustly handle object-to-actor associations
William Pitcock [Thu, 12 Jul 2018 16:37:42 +0000 (16:37 +0000)]
activitypub: more robustly handle object-to-actor associations

5 years agoformatting
William Pitcock [Thu, 12 Jul 2018 16:12:54 +0000 (16:12 +0000)]
formatting

5 years agotestsuite: twitter api: add summary where necessary
William Pitcock [Sun, 24 Jun 2018 06:23:19 +0000 (06:23 +0000)]
testsuite: twitter api: add summary where necessary

5 years agotwitter api: activity representer: add summary field for testsuite
William Pitcock [Sun, 24 Jun 2018 06:22:53 +0000 (06:22 +0000)]
twitter api: activity representer: add summary field for testsuite

5 years agotwitter api: refactor activity html generation, add support for Articles
William Pitcock [Sun, 24 Jun 2018 05:33:34 +0000 (05:33 +0000)]
twitter api: refactor activity html generation, add support for Articles

5 years agotwitterapi: activity view: expose message summary text
William Pitcock [Sat, 23 Jun 2018 06:08:09 +0000 (06:08 +0000)]
twitterapi: activity view: expose message summary text

5 years agoUpdate nodeinfo_controller.ex
lambda [Thu, 12 Jul 2018 06:00:55 +0000 (06:00 +0000)]
Update nodeinfo_controller.ex

5 years agoMerge branch 'feature/default-scope' into 'develop'
lambda [Thu, 12 Jul 2018 05:59:12 +0000 (05:59 +0000)]
Merge branch 'feature/default-scope' into 'develop'

default scope setting

See merge request pleroma/pleroma!239

5 years agoMerge branch 'feature/article-support' into 'develop'
lambda [Thu, 12 Jul 2018 05:58:39 +0000 (05:58 +0000)]
Merge branch 'feature/article-support' into 'develop'

article support (plume, etc)

See merge request pleroma/pleroma!240

5 years agoMerge branch 'feature/auto-shortcodes' into 'develop'
lambda [Thu, 12 Jul 2018 05:56:29 +0000 (05:56 +0000)]
Merge branch 'feature/auto-shortcodes' into 'develop'

Feature: automatic shortcodes for emoji

See merge request pleroma/pleroma!245

5 years agoMerge branch 'bugfix/status-url-field' into 'develop'
lambda [Thu, 12 Jul 2018 05:55:20 +0000 (05:55 +0000)]
Merge branch 'bugfix/status-url-field' into 'develop'

[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses

Closes #231

See merge request pleroma/pleroma!246

5 years agoMerge branch 'bugfix/x509-public-key' into 'develop'
lambda [Thu, 12 Jul 2018 05:54:14 +0000 (05:54 +0000)]
Merge branch 'bugfix/x509-public-key' into 'develop'

activitypub: switch to using x509 representation for public keys instead of pkcs#1

See merge request pleroma/pleroma!248

5 years agoactivitypub: switch to using x509 representation for public keys instead of pkcs#1
William Pitcock [Thu, 12 Jul 2018 02:45:48 +0000 (02:45 +0000)]
activitypub: switch to using x509 representation for public keys instead of pkcs#1

5 years ago[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Haelwenn (lanodan) Monnier [Tue, 26 Jun 2018 11:51:35 +0000 (13:51 +0200)]
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata

Closes: https://git.pleroma.social/pleroma/pleroma/issues/229
5 years ago[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
Haelwenn (lanodan) Monnier [Mon, 2 Jul 2018 04:28:21 +0000 (06:28 +0200)]
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses

Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
6 years agoFix auto-shortcode emoji
Jorty [Sun, 1 Jul 2018 00:35:34 +0000 (20:35 -0400)]
Fix auto-shortcode emoji

Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.

Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway.

6 years agoMove emoji glob setting to config.exs
Jorty [Sat, 30 Jun 2018 21:20:08 +0000 (17:20 -0400)]
Move emoji glob setting to config.exs

Also, a bit of formatting, and the glob includes an "/emoji/" prefix to
make it more intuitive to users

6 years agoAllow emojis to be added automatically
Jorty [Sat, 30 Jun 2018 19:08:31 +0000 (15:08 -0400)]
Allow emojis to be added automatically

6 years agoCONFIGURATION.md: add doc about upload and strip_exif
Tristan Mahé [Thu, 28 Jun 2018 17:49:44 +0000 (10:49 -0700)]
CONFIGURATION.md: add doc about upload and strip_exif

6 years agoactivity interpretation: formatting
William Pitcock [Sun, 24 Jun 2018 06:34:44 +0000 (06:34 +0000)]
activity interpretation: formatting

6 years agotwitter api: use ActivityView.render_content() where appropriate instead of duplicati...
William Pitcock [Sun, 24 Jun 2018 06:30:23 +0000 (06:30 +0000)]
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic

6 years agomastodon api: add interpreter for Article activity types
William Pitcock [Sun, 24 Jun 2018 06:14:17 +0000 (06:14 +0000)]
mastodon api: add interpreter for Article activity types

6 years agotwitter api: refactor activity html generation, add support for Articles
William Pitcock [Sun, 24 Jun 2018 05:33:34 +0000 (05:33 +0000)]
twitter api: refactor activity html generation, add support for Articles

6 years agoutils: make_create_data: add support for Article objects
William Pitcock [Sun, 24 Jun 2018 06:52:17 +0000 (06:52 +0000)]
utils: make_create_data: add support for Article objects

6 years agotransmogrifier: accept Article activities
William Pitcock [Sun, 24 Jun 2018 05:33:22 +0000 (05:33 +0000)]
transmogrifier: accept Article activities

6 years agotests: add default_scope where appropriate
William Pitcock [Sun, 24 Jun 2018 06:31:09 +0000 (06:31 +0000)]
tests: add default_scope where appropriate

6 years agotwitter api: allow setting default_scope
William Pitcock [Sat, 23 Jun 2018 07:02:49 +0000 (07:02 +0000)]
twitter api: allow setting default_scope

6 years agotwitter api: user view: show default message scope if known
William Pitcock [Sat, 23 Jun 2018 06:55:32 +0000 (06:55 +0000)]
twitter api: user view: show default message scope if known

6 years agomastodon api: use info["default_scope"] if available for post scope
William Pitcock [Sat, 23 Jun 2018 06:53:29 +0000 (06:53 +0000)]
mastodon api: use info["default_scope"] if available for post scope

6 years agoactivitypub: use Activity.normalize() in several places instead of using Activity...
William Pitcock [Mon, 18 Jun 2018 21:21:03 +0000 (21:21 +0000)]
activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.

6 years agoostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
William Pitcock [Mon, 18 Jun 2018 21:20:44 +0000 (21:20 +0000)]
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().

6 years agofederator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
William Pitcock [Mon, 18 Jun 2018 21:20:18 +0000 (21:20 +0000)]
federator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().

6 years agoostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 21:08:37 +0000 (21:08 +0000)]
ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.

6 years agocommon api: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 21:08:12 +0000 (21:08 +0000)]
common api: use Object.normalize() instead of Object.get_by_ap_id() directly.

6 years agoactivitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 21:01:33 +0000 (21:01 +0000)]
activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.

6 years agostreamer: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 20:58:09 +0000 (20:58 +0000)]
streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.

6 years agouser: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 20:57:38 +0000 (20:57 +0000)]
user: use Object.normalize() instead of Object.get_by_ap_id() directly.

6 years agoactivity: add normalize() to find a complete activity given either URI or partial...
William Pitcock [Mon, 18 Jun 2018 20:54:59 +0000 (20:54 +0000)]
activity: add normalize() to find a complete activity given either URI or partial structure

6 years agoobject: add helper functions to handle various forms of a given object and return...
William Pitcock [Mon, 18 Jun 2018 05:23:54 +0000 (05:23 +0000)]
object: add helper functions to handle various forms of a given object and return a normalized one

6 years agoMerge branch 'features/initial-state_rights' into 'develop'
lambda [Wed, 27 Jun 2018 12:48:01 +0000 (12:48 +0000)]
Merge branch 'features/initial-state_rights' into 'develop'

[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state

See merge request pleroma/pleroma!236

6 years agouse the correct end file
Tristan Mahé [Tue, 26 Jun 2018 22:09:45 +0000 (15:09 -0700)]
use the correct end file

6 years agomaybe I should learn proper elixir ;D
Tristan Mahé [Tue, 26 Jun 2018 21:35:35 +0000 (14:35 -0700)]
maybe I should learn proper elixir ;D

6 years agomogrify mix.lock
Tristan Mahé [Tue, 26 Jun 2018 21:16:28 +0000 (14:16 -0700)]
mogrify mix.lock

6 years agodo the filtering
Tristan Mahé [Tue, 26 Jun 2018 21:03:23 +0000 (14:03 -0700)]
do the filtering

6 years agoformat...
Tristan Mahé [Tue, 26 Jun 2018 20:49:57 +0000 (13:49 -0700)]
format...

6 years agofilter exif data #187
Tristan Mahé [Tue, 26 Jun 2018 20:45:47 +0000 (13:45 -0700)]
filter exif data #187

6 years ago[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
Haelwenn (lanodan) Monnier [Tue, 26 Jun 2018 18:48:35 +0000 (20:48 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state

Related to https://git.pleroma.social/pleroma/mastofe/issues/20

6 years agoMerge branch 'fix/mutes.json-emptyarray' into 'develop'
lambda [Mon, 25 Jun 2018 08:45:42 +0000 (08:45 +0000)]
Merge branch 'fix/mutes.json-emptyarray' into 'develop'

Return empty array from /api/qvitter/mutes.json

See merge request pleroma/pleroma!234

6 years agoMerge branch 'feature/configurable-blocks' into 'develop'
lambda [Mon, 25 Jun 2018 06:12:29 +0000 (06:12 +0000)]
Merge branch 'feature/configurable-blocks' into 'develop'

Add more configurability to how blocks work

See merge request pleroma/pleroma!203

6 years agocombined outgoing_blocks with statement
squidboi [Mon, 25 Jun 2018 06:05:44 +0000 (23:05 -0700)]
combined outgoing_blocks with statement

6 years agomix format
Vivian Lim [Sun, 24 Jun 2018 22:24:41 +0000 (15:24 -0700)]
mix format

6 years agoMerge branch 'feature/application-xml-mime' into 'develop'
lambda [Sun, 24 Jun 2018 13:28:42 +0000 (13:28 +0000)]
Merge branch 'feature/application-xml-mime' into 'develop'

config: add application/xml mimetype support.

See merge request pleroma/pleroma!228

6 years agoMerge branch 'features/glitch-soc-frontend' into 'develop'
lambda [Sun, 24 Jun 2018 13:17:14 +0000 (13:17 +0000)]
Merge branch 'features/glitch-soc-frontend' into 'develop'

Empty 2.4.x endpoints and ``api/v2/search``

See merge request pleroma/pleroma!214

6 years agoreturn unquoted empty array from /api/qvitter/mutes.json
Vivian Lim [Sun, 24 Jun 2018 06:20:30 +0000 (23:20 -0700)]
return unquoted empty array from /api/qvitter/mutes.json

6 years agofixes- found that TwitterAPI.Controller adds .json suffix already
Vivian Lim [Sun, 24 Jun 2018 06:05:54 +0000 (23:05 -0700)]
fixes- found that TwitterAPI.Controller adds .json suffix already

6 years agoreturn empty array for api/qvitter/mutes.json queries instead of html
Vivian Lim [Sun, 24 Jun 2018 05:21:39 +0000 (22:21 -0700)]
return empty array for api/qvitter/mutes.json queries instead of html

6 years agofix mind-crushingly dumb syntax error
squidboi [Sat, 23 Jun 2018 21:32:00 +0000 (14:32 -0700)]
fix mind-crushingly dumb syntax error

6 years agochange moved attributes into normal variables
squidboi [Sat, 23 Jun 2018 21:27:07 +0000 (14:27 -0700)]
change moved attributes into normal variables

6 years agomove configurable module attributes into relevant functions
squidboi [Sat, 23 Jun 2018 21:16:08 +0000 (14:16 -0700)]
move configurable module attributes into relevant functions

6 years ago[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
Haelwenn (lanodan) Monnier [Sat, 23 Jun 2018 09:54:04 +0000 (11:54 +0200)]
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars

6 years ago[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
Haelwenn (lanodan) Monnier [Wed, 13 Jun 2018 16:21:59 +0000 (18:21 +0200)]
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search

6 years agoFake 2.4.0 API
Haelwenn (lanodan) Monnier [Mon, 4 Jun 2018 15:44:08 +0000 (17:44 +0200)]
Fake 2.4.0 API

6 years agolib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format
Haelwenn (lanodan) Monnier [Thu, 21 Jun 2018 17:28:39 +0000 (19:28 +0200)]
lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format

Hnng!

6 years agoMerge branch 'feature/mrf-simple-accept-lists' into 'develop'
lambda [Thu, 21 Jun 2018 07:09:57 +0000 (07:09 +0000)]
Merge branch 'feature/mrf-simple-accept-lists' into 'develop'

mrf simple: add accept lists

See merge request pleroma/pleroma!231

6 years agomrf simple: add accept lists
William Pitcock [Tue, 19 Jun 2018 21:23:37 +0000 (21:23 +0000)]
mrf simple: add accept lists

accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.

in other words, this functionality can be used to implement instances similar to
awoo.space.

6 years agoMerge branch 'features/column_media_streaming' into 'develop'
lambda [Tue, 19 Jun 2018 09:50:05 +0000 (09:50 +0000)]
Merge branch 'features/column_media_streaming' into 'develop'

Add streaming to media tabs of federated and local TLs

See merge request pleroma/pleroma!225

6 years agoMerge branch 'bugfix/block-follow-relationships' into 'develop'
lambda [Tue, 19 Jun 2018 09:42:45 +0000 (09:42 +0000)]
Merge branch 'bugfix/block-follow-relationships' into 'develop'

fix follow relationship leaks when blocked

See merge request pleroma/pleroma!230

6 years agotests: fix a completely bogus mastodon api test
William Pitcock [Tue, 19 Jun 2018 08:53:54 +0000 (08:53 +0000)]
tests: fix a completely bogus mastodon api test