akkoma
4 years agoAccountView: Add 'accepts_chat_messages' to view.
lain [Fri, 3 Jul 2020 11:07:33 +0000 (13:07 +0200)]
AccountView: Add 'accepts_chat_messages' to view.

4 years agoUser: On registration, set `accepts_chat_messages` to true.
lain [Fri, 3 Jul 2020 10:47:05 +0000 (12:47 +0200)]
User: On registration, set `accepts_chat_messages` to true.

4 years agoMigrations: Add `accepts_chat_messages` to users.
lain [Fri, 3 Jul 2020 10:46:28 +0000 (12:46 +0200)]
Migrations: Add `accepts_chat_messages` to users.

4 years agoMerge branch 'feature/1885-MRF-metadata' into 'develop'
feld [Thu, 2 Jul 2020 19:44:05 +0000 (19:44 +0000)]
Merge branch 'feature/1885-MRF-metadata' into 'develop'

Feature/1885 mrf metadata

Closes #1885

See merge request pleroma/pleroma!2693

4 years agoMerge branch 'activation-meta' into 'develop'
feld [Thu, 2 Jul 2020 18:12:03 +0000 (18:12 +0000)]
Merge branch 'activation-meta' into 'develop'

Add more FE-required fields to /api/v1/instance

See merge request pleroma/pleroma!2613

4 years agoMerge branch 'develop' into activation-meta
Mark Felder [Thu, 2 Jul 2020 18:01:22 +0000 (13:01 -0500)]
Merge branch 'develop' into activation-meta

4 years agoDocument the new API extension of /api/v1/instance
Mark Felder [Thu, 2 Jul 2020 17:59:45 +0000 (12:59 -0500)]
Document the new API extension of /api/v1/instance

4 years agoRemove camelCase from the keys
Mark Felder [Thu, 2 Jul 2020 17:55:08 +0000 (12:55 -0500)]
Remove camelCase from the keys

4 years agoLint, long lines
Mark Felder [Thu, 2 Jul 2020 15:33:27 +0000 (10:33 -0500)]
Lint, long lines

4 years agoImprove descriptions, move primary MRF settings to top for AdminFE ordering
Mark Felder [Thu, 2 Jul 2020 15:27:15 +0000 (10:27 -0500)]
Improve descriptions, move primary MRF settings to top for AdminFE ordering

4 years agoUpdate AdminFE build to utilize new MRF metadata
Mark Felder [Thu, 2 Jul 2020 15:16:19 +0000 (10:16 -0500)]
Update AdminFE build to utilize new MRF metadata

4 years agoMerge branch 'develop' into feature/1885-MRF-metadata
Mark Felder [Thu, 2 Jul 2020 14:57:57 +0000 (09:57 -0500)]
Merge branch 'develop' into feature/1885-MRF-metadata

4 years agoMerge branch 'fetcher-fixes' into 'develop'
rinpatch [Thu, 2 Jul 2020 10:17:51 +0000 (10:17 +0000)]
Merge branch 'fetcher-fixes' into 'develop'

Don't fail fetching when the user in a replied-to message can't be fetched.

See merge request pleroma/pleroma!2711

4 years agoMerge branch '1907-fix-announce-streaming' into 'develop'
rinpatch [Thu, 2 Jul 2020 10:08:42 +0000 (10:08 +0000)]
Merge branch '1907-fix-announce-streaming' into 'develop'

Resolve "Streaming API: Repeats of your posts from random people are pushed to the timeline"

Closes #1907

See merge request pleroma/pleroma!2714

4 years agoMerge branch 'feature/update-description' into 'develop'
lain [Thu, 2 Jul 2020 08:43:32 +0000 (08:43 +0000)]
Merge branch 'feature/update-description' into 'develop'

Update settings descriptions and labels

See merge request pleroma/pleroma!2709

4 years agoCredo fixes.
lain [Thu, 2 Jul 2020 07:57:31 +0000 (09:57 +0200)]
Credo fixes.

4 years agoChangelog: Update with stream changes.
lain [Thu, 2 Jul 2020 07:54:48 +0000 (09:54 +0200)]
Changelog: Update with stream changes.

4 years agoStreamer: Align announce streaming with polling.
lain [Thu, 2 Jul 2020 07:50:26 +0000 (09:50 +0200)]
Streamer: Align announce streaming with polling.

4 years agoSideEffects: Refactor.
lain [Thu, 2 Jul 2020 07:33:50 +0000 (09:33 +0200)]
SideEffects: Refactor.

4 years agoMerge branch '1716-handle-nickname-clashes' into 'develop'
rinpatch [Wed, 1 Jul 2020 13:51:23 +0000 (13:51 +0000)]
Merge branch '1716-handle-nickname-clashes' into 'develop'

ActivityPub: Handle clashing nicknames for the same ap id

Closes #1716

See merge request pleroma/pleroma!2712

4 years agoActivityPub: Handle clashing nicknames for the same ap id
lain [Wed, 1 Jul 2020 10:26:07 +0000 (12:26 +0200)]
ActivityPub: Handle clashing nicknames for the same ap id

If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.

This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.

4 years agoFetcher: Work when we can't get the OP.
lain [Wed, 1 Jul 2020 09:48:51 +0000 (11:48 +0200)]
Fetcher: Work when we can't get the OP.

4 years agoFixtures: Pretty print.
lain [Wed, 1 Jul 2020 09:47:45 +0000 (11:47 +0200)]
Fixtures: Pretty print.

4 years agoMerge branch 'revert-651f2695' into 'develop'
lain [Wed, 1 Jul 2020 09:18:02 +0000 (09:18 +0000)]
Merge branch 'revert-651f2695' into 'develop'

Revert "Merge branch 'avatar-removing' into 'develop'"

See merge request pleroma/pleroma!2710

4 years agoRevert "Merge branch 'avatar-removing' into 'develop'"
lain [Wed, 1 Jul 2020 08:51:56 +0000 (08:51 +0000)]
Revert "Merge branch 'avatar-removing' into 'develop'"

This reverts merge request !2701

4 years agoAdd labels, update descriptions and labels
Angelina Filippova [Wed, 1 Jul 2020 00:01:15 +0000 (03:01 +0300)]
Add labels, update descriptions and labels

4 years agoMerge branch 'chore/rename-user-settings-column' into 'develop'
Haelwenn [Tue, 30 Jun 2020 20:51:10 +0000 (20:51 +0000)]
Merge branch 'chore/rename-user-settings-column' into 'develop'

Rename user.settings column

See merge request pleroma/pleroma!2707

4 years agoAdd fields limits to instance metadata, add tests
Mark Felder [Tue, 30 Jun 2020 20:25:10 +0000 (15:25 -0500)]
Add fields limits to instance metadata, add tests

4 years agoMerge branch 'develop' into activation-meta
Mark Felder [Tue, 30 Jun 2020 20:09:03 +0000 (15:09 -0500)]
Merge branch 'develop' into activation-meta

4 years agoRename user.settings column
Mark Felder [Tue, 30 Jun 2020 16:50:53 +0000 (11:50 -0500)]
Rename user.settings column

This is used exclusively by MastoFE/GlitchFE now

4 years agoMerge branch 'preloadfixups' into 'develop'
lain [Tue, 30 Jun 2020 10:52:55 +0000 (10:52 +0000)]
Merge branch 'preloadfixups' into 'develop'

Some fixups for the preload.

See merge request pleroma/pleroma!2692

4 years agoCredo fixes
lain [Tue, 30 Jun 2020 09:55:58 +0000 (11:55 +0200)]
Credo fixes

4 years agoMerge branch 'preload-fixups-2' into preloadfixups
lain [Tue, 30 Jun 2020 09:40:34 +0000 (11:40 +0200)]
Merge branch 'preload-fixups-2' into preloadfixups

4 years agoPreload: Load the correct instance panel
lain [Tue, 30 Jun 2020 09:35:54 +0000 (11:35 +0200)]
Preload: Load the correct instance panel

4 years agoMerge branch 'patch-1' into 'develop'
lain [Tue, 30 Jun 2020 08:42:45 +0000 (08:42 +0000)]
Merge branch 'patch-1' into 'develop'

Use correct PostgreSQL version command in bug template

See merge request pleroma/pleroma!2706

4 years agoUse correct PostgreSQL version command in bug template
normandy [Tue, 30 Jun 2020 03:12:30 +0000 (03:12 +0000)]
Use correct PostgreSQL version command in bug template

4 years agoMerge branch 'fix-notification-filtering' into 'develop'
rinpatch [Mon, 29 Jun 2020 18:06:25 +0000 (18:06 +0000)]
Merge branch 'fix-notification-filtering' into 'develop'

Notifications: Never return `nil` in the notification list.

See merge request pleroma/pleroma!2705

4 years agoApply suggestion to lib/pleroma/notification.ex
lain [Mon, 29 Jun 2020 16:04:14 +0000 (16:04 +0000)]
Apply suggestion to lib/pleroma/notification.ex

4 years agoMerge branch 'fix/cast-and-validate' into 'develop'
lain [Mon, 29 Jun 2020 15:59:40 +0000 (15:59 +0000)]
Merge branch 'fix/cast-and-validate' into 'develop'

Fix CastAndValidate plug

Closes #1889

See merge request pleroma/pleroma!2704

4 years agoNotification: Remove TODO.
lain [Mon, 29 Jun 2020 15:52:56 +0000 (17:52 +0200)]
Notification: Remove TODO.

4 years agoNotifications: Never return `nil` in the notification list.
lain [Mon, 29 Jun 2020 15:48:18 +0000 (17:48 +0200)]
Notifications: Never return `nil` in the notification list.

4 years agoTest default "content-type" for CastAndValidate
Egor Kislitsyn [Mon, 29 Jun 2020 15:47:04 +0000 (19:47 +0400)]
Test default "content-type" for CastAndValidate

4 years agoMerge branch 'fix/swoosh-sendmail' into 'develop'
feld [Mon, 29 Jun 2020 15:24:39 +0000 (15:24 +0000)]
Merge branch 'fix/swoosh-sendmail' into 'develop'

updated swoosh

See merge request pleroma/pleroma!2703

4 years agoFix CastAndValidate plug
Egor Kislitsyn [Mon, 29 Jun 2020 13:33:00 +0000 (17:33 +0400)]
Fix CastAndValidate plug

4 years agoupdated swoosh
Maksim Pechnikov [Mon, 29 Jun 2020 13:22:54 +0000 (16:22 +0300)]
updated swoosh

4 years agoMerge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
lain [Mon, 29 Jun 2020 12:44:58 +0000 (12:44 +0000)]
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'

excluding attachment links from RichMedia

See merge request pleroma/pleroma!2702

4 years agoexcluding attachment links from RichMedia
Alexander Strizhakov [Mon, 29 Jun 2020 12:25:57 +0000 (15:25 +0300)]
excluding attachment links from RichMedia

4 years agoMerge branch 'avatar-removing' into 'develop'
lain [Mon, 29 Jun 2020 11:16:30 +0000 (11:16 +0000)]
Merge branch 'avatar-removing' into 'develop'

UpdateCredentialsTest: Add test for removing profile images.

See merge request pleroma/pleroma!2701

4 years agoUpdateCredentialsTest: Add test for removing profile images.
lain [Mon, 29 Jun 2020 10:40:23 +0000 (12:40 +0200)]
UpdateCredentialsTest: Add test for removing profile images.

4 years agoPreloaders: Use strings as keys.
lain [Mon, 29 Jun 2020 09:41:00 +0000 (11:41 +0200)]
Preloaders: Use strings as keys.

4 years agoUser preloader: Put user info at correct key
lain [Mon, 29 Jun 2020 09:06:20 +0000 (11:06 +0200)]
User preloader: Put user info at correct key

4 years agoMerge branch '1031-parent-visible' into 'develop'
lain [Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)]
Merge branch '1031-parent-visible' into 'develop'

Resolve "Add `pleroma.parent_visible` to the status view"

Closes #1031

See merge request pleroma/pleroma!2679

4 years agoMerge branch 'openapi/schema-account-pleromafields' into 'develop'
lain [Mon, 29 Jun 2020 08:32:56 +0000 (08:32 +0000)]
Merge branch 'openapi/schema-account-pleromafields' into 'develop'

ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses

See merge request pleroma/pleroma!2700

4 years agoApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
Haelwenn (lanodan) Monnier [Mon, 29 Jun 2020 01:31:33 +0000 (03:31 +0200)]
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses

4 years agoMerge branch 'docs/mastoapi-account-fields' into 'develop'
Haelwenn [Mon, 29 Jun 2020 00:56:02 +0000 (00:56 +0000)]
Merge branch 'docs/mastoapi-account-fields' into 'develop'

differences_in_mastoapi_responses: Update account fields

See merge request pleroma/pleroma!2699

4 years agodifferences_in_mastoapi_responses: Update account fields
Haelwenn (lanodan) Monnier [Mon, 29 Jun 2020 00:39:26 +0000 (02:39 +0200)]
differences_in_mastoapi_responses: Update account fields

4 years agoMerge branch 'reduce-preloading-defaults' into 'develop'
lain [Sat, 27 Jun 2020 10:40:29 +0000 (10:40 +0000)]
Merge branch 'reduce-preloading-defaults' into 'develop'

Config: Reduce default preloaders to configuration endpoints.

See merge request pleroma/pleroma!2697

4 years agoConfig: Reduce default preloaders to configuration endpoints.
lain [Sat, 27 Jun 2020 10:18:37 +0000 (12:18 +0200)]
Config: Reduce default preloaders to configuration endpoints.

Fetching the timeline is a bit heavy to do by default.

4 years agoMerge branch 'fix/fetcher-transmogrifier-error' into 'develop'
lain [Sat, 27 Jun 2020 09:41:35 +0000 (09:41 +0000)]
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'

object/fetcher: Pass full Transmogrifier error

See merge request pleroma/pleroma!2696

4 years agoadded tab & labels for mrf policies
Alexander Strizhakov [Sat, 27 Jun 2020 09:18:34 +0000 (12:18 +0300)]
added tab & labels for mrf policies

4 years agoobject/fetcher: Pass full Transmogrifier error
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 18:10:47 +0000 (20:10 +0200)]
object/fetcher: Pass full Transmogrifier error

4 years agoMerge branch 'block-handling' into 'develop'
Haelwenn [Fri, 26 Jun 2020 17:41:00 +0000 (17:41 +0000)]
Merge branch 'block-handling' into 'develop'

Handle blocks with the pipeline

See merge request pleroma/pleroma!2685

4 years agoMerge branch '1258-anti-link-spam-exemption' into 'develop'
Haelwenn [Fri, 26 Jun 2020 16:59:46 +0000 (16:59 +0000)]
Merge branch '1258-anti-link-spam-exemption' into 'develop'

AntiSpamLinkPolicy: Exempt local users.

Closes #1258

See merge request pleroma/pleroma!2686

4 years agoPreloading: Fix nodeinfo url.
lain [Fri, 26 Jun 2020 12:48:23 +0000 (14:48 +0200)]
Preloading: Fix nodeinfo url.

4 years agoPreloading: Return correct data for statusnet stuff.
lain [Fri, 26 Jun 2020 12:47:38 +0000 (14:47 +0200)]
Preloading: Return correct data for statusnet stuff.

4 years agoadditional data to MRF policies in descriptions
Alexander Strizhakov [Fri, 26 Jun 2020 12:22:08 +0000 (15:22 +0300)]
additional data to MRF policies in descriptions

4 years agoMerge branch 'fix-chats' into 'develop'
lain [Fri, 26 Jun 2020 11:09:37 +0000 (11:09 +0000)]
Merge branch 'fix-chats' into 'develop'

Nodeinfo: Add chat information back in.

See merge request pleroma/pleroma!2691

4 years agoNodeinfo: Add chat information back in.
lain [Fri, 26 Jun 2020 11:04:15 +0000 (13:04 +0200)]
Nodeinfo: Add chat information back in.

4 years agoUser: Don't unfollow on block when the relevant setting is set.
lain [Fri, 26 Jun 2020 10:06:00 +0000 (12:06 +0200)]
User: Don't unfollow on block when the relevant setting is set.

4 years agoBlockValidator: Restore old behavior for incoming blocks.
lain [Fri, 26 Jun 2020 09:58:40 +0000 (11:58 +0200)]
BlockValidator: Restore old behavior for incoming blocks.

4 years agoPleroma.Upload.Filter.Mogrify args description
Alexander Strizhakov [Fri, 26 Jun 2020 06:03:07 +0000 (09:03 +0300)]
Pleroma.Upload.Filter.Mogrify args description

4 years agoMerge branch 'hotfix/preload-tests-nodeinfo' into 'develop'
Haelwenn [Fri, 26 Jun 2020 03:48:25 +0000 (03:48 +0000)]
Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'

nodeinfo: Fix MRF transparency

See merge request pleroma/pleroma!2689

4 years agonodeinfo: Fix MRF transparency
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 03:33:59 +0000 (05:33 +0200)]
nodeinfo: Fix MRF transparency

4 years agoMerge branch 'preload-data' into 'develop'
feld [Thu, 25 Jun 2020 21:35:39 +0000 (21:35 +0000)]
Merge branch 'preload-data' into 'develop'

Preload data into index.html

Closes #1660

See merge request pleroma/pleroma!2381

4 years agoMerge branch 'mastoapi-omitted' into 'develop'
feld [Thu, 25 Jun 2020 21:25:02 +0000 (21:25 +0000)]
Merge branch 'mastoapi-omitted' into 'develop'

MastoAPI differences: Document not implemented features

See merge request pleroma/pleroma!2687

4 years agoMerge branch 'update/admin-fe-20200625' into 'develop'
feld [Thu, 25 Jun 2020 20:09:19 +0000 (20:09 +0000)]
Merge branch 'update/admin-fe-20200625' into 'develop'

Update AdminFE build

See merge request pleroma/pleroma!2688

4 years agoUpdate AdminFE build
Mark Felder [Thu, 25 Jun 2020 19:55:00 +0000 (14:55 -0500)]
Update AdminFE build

4 years agoMastoAPI differences: Document not implemented features
Alex Gleason [Thu, 25 Jun 2020 17:32:06 +0000 (12:32 -0500)]
MastoAPI differences: Document not implemented features

4 years agoMerge branch 'chore/remove-reference-to-distsn' into 'develop'
lain [Thu, 25 Jun 2020 10:42:57 +0000 (10:42 +0000)]
Merge branch 'chore/remove-reference-to-distsn' into 'develop'

Remove reference to defunct distsn.org

See merge request pleroma/pleroma!2675

4 years agoAntiSpamLinkPolicy: Exempt local users.
lain [Thu, 25 Jun 2020 10:40:39 +0000 (12:40 +0200)]
AntiSpamLinkPolicy: Exempt local users.

4 years agoApply suggestion to config/description.exs
lain [Thu, 25 Jun 2020 10:17:16 +0000 (10:17 +0000)]
Apply suggestion to config/description.exs

4 years agoMerge branch 'issue/1872-ex_aws' into 'develop'
lain [Thu, 25 Jun 2020 10:14:19 +0000 (10:14 +0000)]
Merge branch 'issue/1872-ex_aws' into 'develop'

[#1872] use Pleroma.HTTP for ExAws.S3

See merge request pleroma/pleroma!2683

4 years agoBlocking: Don't federate if the options is set.
lain [Thu, 25 Jun 2020 10:03:14 +0000 (12:03 +0200)]
Blocking: Don't federate if the options is set.

4 years agoActivityPub: Remove `block`.
lain [Thu, 25 Jun 2020 09:51:33 +0000 (11:51 +0200)]
ActivityPub: Remove `block`.

4 years agoAccountController: Extract blocking to CommonAPI.
lain [Thu, 25 Jun 2020 09:44:04 +0000 (11:44 +0200)]
AccountController: Extract blocking to CommonAPI.

4 years agoTransmogrifier: Switch to pipeline for Blocks.
lain [Thu, 25 Jun 2020 09:33:54 +0000 (11:33 +0200)]
Transmogrifier: Switch to pipeline for Blocks.

4 years agoObjectValidator: Basic `Block` support.
lain [Thu, 25 Jun 2020 09:13:35 +0000 (11:13 +0200)]
ObjectValidator: Basic `Block` support.

4 years agoTransmogrifier Test: Extract block handling.
lain [Thu, 25 Jun 2020 08:54:00 +0000 (10:54 +0200)]
Transmogrifier Test: Extract block handling.

4 years agoMerge branch 'fix/following-request-from-deactivated' into 'develop'
lain [Thu, 25 Jun 2020 06:50:44 +0000 (06:50 +0000)]
Merge branch 'fix/following-request-from-deactivated' into 'develop'

Filter outstanding follower requests from deactivated accounts

Closes #1771

See merge request pleroma/pleroma!2682

4 years agoadded wrapper Pleroma.HTTP for ExAws.S3
Maksim Pechnikov [Thu, 25 Jun 2020 04:12:29 +0000 (07:12 +0300)]
added wrapper Pleroma.HTTP for ExAws.S3

4 years agoFilter outstanding follower requests from deactivated accounts
Mark Felder [Wed, 24 Jun 2020 22:18:53 +0000 (17:18 -0500)]
Filter outstanding follower requests from deactivated accounts

4 years agoMerge branch 'fix-emoji-pagination' into 'develop'
lain [Wed, 24 Jun 2020 15:23:20 +0000 (15:23 +0000)]
Merge branch 'fix-emoji-pagination' into 'develop'

Fix for emoji pagination in pack show

See merge request pleroma/pleroma!2681

4 years agofix for emoji pagination in pack show
Alexander Strizhakov [Wed, 24 Jun 2020 15:06:30 +0000 (18:06 +0300)]
fix for emoji pagination in pack show

4 years agoStatus schema: Add parent_visible.
lain [Wed, 24 Jun 2020 12:33:00 +0000 (14:33 +0200)]
Status schema: Add parent_visible.

4 years agoChangelog: Put info under API header.
lain [Wed, 24 Jun 2020 12:30:12 +0000 (14:30 +0200)]
Changelog: Put info under API header.

4 years agoChangelog: Add info about parent_visible field
lain [Wed, 24 Jun 2020 11:32:14 +0000 (13:32 +0200)]
Changelog: Add info about parent_visible field

4 years agoDocs: Document added parent_visible field.
lain [Wed, 24 Jun 2020 11:31:42 +0000 (13:31 +0200)]
Docs: Document added parent_visible field.

4 years agoStatusView: Add pleroma.parent_visible
lain [Wed, 24 Jun 2020 11:29:08 +0000 (13:29 +0200)]
StatusView: Add pleroma.parent_visible

4 years agoMerge branch 'feature/admin-api-status-count-per-instance' into 'develop'
lain [Wed, 24 Jun 2020 10:42:07 +0000 (10:42 +0000)]
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'

admin api status count per instance

See merge request pleroma/pleroma!2500

4 years agoMerge branch 'issue/1872-updated-tzdata' into 'develop'
lain [Wed, 24 Jun 2020 09:00:17 +0000 (09:00 +0000)]
Merge branch 'issue/1872-updated-tzdata' into 'develop'

[#1872] use Pleroma.HTTP for Tzdata

See merge request pleroma/pleroma!2678