akkoma
4 years agoMerge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Egor Kislitsyn [Mon, 15 Jul 2019 07:11:54 +0000 (14:11 +0700)]
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists

4 years agoSupport `list` visibility in StatusView
Egor Kislitsyn [Mon, 15 Jul 2019 07:00:29 +0000 (14:00 +0700)]
Support `list` visibility in StatusView

4 years agoMerge branch 'tests/media_proxy' into 'develop'
kaniini [Sun, 14 Jul 2019 21:01:32 +0000 (21:01 +0000)]
Merge branch 'tests/media_proxy' into 'develop'

added tests for Web.MediaProxy

See merge request pleroma/pleroma!1418

4 years agoadded tests for Web.MediaProxy
Maksim [Sun, 14 Jul 2019 21:01:32 +0000 (21:01 +0000)]
added tests for Web.MediaProxy

4 years agoMerge branch 'feature/unsubscribe-on-unfollow' into 'develop'
kaniini [Sun, 14 Jul 2019 19:25:03 +0000 (19:25 +0000)]
Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'

Unfollow should also unsubscribe

Closes #1086

See merge request pleroma/pleroma!1419

4 years agoUnfollow should also unsubscribe
Sergey Suprunenko [Sun, 14 Jul 2019 19:25:03 +0000 (19:25 +0000)]
Unfollow should also unsubscribe

4 years agoMerge branch 'security/ir-generic-containment' into 'develop'
kaniini [Sun, 14 Jul 2019 19:24:39 +0000 (19:24 +0000)]
Merge branch 'security/ir-generic-containment' into 'develop'

security: IR-based generic object containment

See merge request pleroma/pleroma!1417

4 years agotests: fix object containment violations in the transmogrifier tests
Ariadne Conill [Sun, 14 Jul 2019 17:49:12 +0000 (17:49 +0000)]
tests: fix object containment violations in the transmogrifier tests

Some objects were not completely rewritten in the tests, which caused object
containment violations.  Fix them by rewriting the object IDs to be in an
appropriate namespace.

4 years agosecurity: detect object containment violations at the IR level
Ariadne Conill [Sun, 14 Jul 2019 17:47:08 +0000 (17:47 +0000)]
security: detect object containment violations at the IR level

It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers.  OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.

Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.

4 years agodetect and use sha512-crypt for stored password hash.
Moonman [Sun, 14 Jul 2019 16:48:42 +0000 (09:48 -0700)]
detect and use sha512-crypt for stored password hash.

4 years agoMerge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'
kaniini [Sun, 14 Jul 2019 16:43:55 +0000 (16:43 +0000)]
Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'

remove CC-BY-NC-ND license.

See merge request pleroma/pleroma!1415

4 years agoremove CC-BY-NC-ND license.
Ariadne Conill [Sun, 14 Jul 2019 16:43:00 +0000 (16:43 +0000)]
remove CC-BY-NC-ND license.

we moved branding assets (mascot etc) to CC-BY-SA a while back.

4 years agoMerge branch 'bugfix/llal-object-containment' into 'develop'
kaniini [Sun, 14 Jul 2019 16:39:17 +0000 (16:39 +0000)]
Merge branch 'bugfix/llal-object-containment' into 'develop'

Object.Fetcher: Handle error on Containment.contain_origin/2

See merge request pleroma/pleroma!1414

4 years agoObject.Fetcher: Keep the with-do block as per kaniini proposition
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 15:28:25 +0000 (17:28 +0200)]
Object.Fetcher: Keep the with-do block as per kaniini proposition

4 years agoFetcherTest: Containment refute called(OStatus.fetch_activity_from_url)
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 12:24:56 +0000 (14:24 +0200)]
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)

4 years agoObject.Fetcher: Fallback to OStatus only if AP actually fails
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 10:13:11 +0000 (12:13 +0200)]
Object.Fetcher: Fallback to OStatus only if AP actually fails

4 years agoMerge branch 'feature/1072-muting-notifications' into 'develop'
kaniini [Sun, 14 Jul 2019 13:29:32 +0000 (13:29 +0000)]
Merge branch 'feature/1072-muting-notifications' into 'develop'

Feature/1072 muting notifications

Closes #1072

See merge request pleroma/pleroma!1398

4 years agoFeature/1072 muting notifications
Alexander Strizhakov [Sun, 14 Jul 2019 13:29:31 +0000 (13:29 +0000)]
Feature/1072 muting notifications

4 years agoObject.Fetcher: Handle error on Containment.contain_origin/2
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 10:02:16 +0000 (12:02 +0200)]
Object.Fetcher: Handle error on Containment.contain_origin/2

4 years agoHttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 11:39:05 +0000 (13:39 +0200)]
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site

4 years agoHttpRequestMock: Add missing mocks for object containment tests
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 11:31:43 +0000 (13:31 +0200)]
HttpRequestMock: Add missing mocks for object containment tests

4 years agoMerge branch 'rich_media_parsers_configurable' into 'develop'
kaniini [Sun, 14 Jul 2019 09:53:42 +0000 (09:53 +0000)]
Merge branch 'rich_media_parsers_configurable' into 'develop'

parsers configurable

See merge request pleroma/pleroma!1400

4 years agochangelog & docs
Alex S [Sun, 14 Jul 2019 06:20:54 +0000 (09:20 +0300)]
changelog & docs

4 years agoparsers configurable
Alex S [Thu, 11 Jul 2019 13:04:42 +0000 (16:04 +0300)]
parsers configurable

4 years agoAdd follow information refetching after following/unfollowing
rinpatch [Sat, 13 Jul 2019 22:58:39 +0000 (01:58 +0300)]
Add follow information refetching after following/unfollowing

4 years agoAdd tests for fetch_follow_information_for_user and check object type
rinpatch [Sat, 13 Jul 2019 21:56:02 +0000 (00:56 +0300)]
Add tests for fetch_follow_information_for_user and check object type
when fetching the page

4 years agoUse atoms when updating user info
rinpatch [Sat, 13 Jul 2019 21:21:35 +0000 (00:21 +0300)]
Use atoms when updating user info

4 years agoRefactor fetching follow information to a separate function
rinpatch [Sat, 13 Jul 2019 20:56:10 +0000 (23:56 +0300)]
Refactor fetching follow information to a separate function

4 years agoMerge branch 'feature/mrf-transparency-filter' into 'develop'
kaniini [Sat, 13 Jul 2019 19:06:54 +0000 (19:06 +0000)]
Merge branch 'feature/mrf-transparency-filter' into 'develop'

nodeinfo: implement MRF transparency exclusions

See merge request pleroma/pleroma!1412

4 years agodocs: note that exclusions usage will be included in the transparency metrics if...
Ariadne Conill [Sat, 13 Jul 2019 19:00:03 +0000 (19:00 +0000)]
docs: note that exclusions usage will be included in the transparency metrics if used

4 years agonodeinfo: implement MRF transparency exclusions
Ariadne Conill [Sat, 13 Jul 2019 18:30:45 +0000 (18:30 +0000)]
nodeinfo: implement MRF transparency exclusions

4 years agoRefactor Follows/Followers counter syncronization
rinpatch [Sat, 13 Jul 2019 16:17:57 +0000 (19:17 +0300)]
Refactor Follows/Followers counter syncronization

- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page

4 years agoMerge branch '1041-status-actions-rate-limit' into 'develop'
kaniini [Sat, 13 Jul 2019 14:17:17 +0000 (14:17 +0000)]
Merge branch '1041-status-actions-rate-limit' into 'develop'

Rate-limited status actions (per user and per user+status).

Closes #1041

See merge request pleroma/pleroma!1410

4 years ago[#1041] Minor refactoring.
Ivan Tashkinov [Sat, 13 Jul 2019 12:21:50 +0000 (15:21 +0300)]
[#1041] Minor refactoring.

4 years ago[#1041] Added documentation on existing rate limiters.
Ivan Tashkinov [Sat, 13 Jul 2019 12:13:26 +0000 (15:13 +0300)]
[#1041] Added documentation on existing rate limiters.

4 years agoMerge branch 'fix/hackney-global-options' into 'develop'
Haelwenn [Sat, 13 Jul 2019 11:55:09 +0000 (11:55 +0000)]
Merge branch 'fix/hackney-global-options' into 'develop'

Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues

See merge request pleroma/pleroma!1409

4 years ago[#1041] Rate-limited status actions (per user and per user+status).
Ivan Tashkinov [Sat, 13 Jul 2019 11:49:39 +0000 (14:49 +0300)]
[#1041] Rate-limited status actions (per user and per user+status).

4 years agoAdd a changelog entry for tolerating incorrect chain order
rinpatch [Fri, 12 Jul 2019 23:04:26 +0000 (02:04 +0300)]
Add a changelog entry for tolerating incorrect chain order

4 years agoMerge branch 'fix/ap-hide-follows' into 'develop'
Haelwenn [Sat, 13 Jul 2019 10:22:19 +0000 (10:22 +0000)]
Merge branch 'fix/ap-hide-follows' into 'develop'

ActivityPub Controller: Change how hiding follows/followers is represented

See merge request pleroma/pleroma!1406

4 years agoWorkaround for remote server certificate chain issues
rinpatch [Fri, 12 Jul 2019 20:53:21 +0000 (23:53 +0300)]
Workaround for remote server certificate chain issues

4 years agoMerge the default options with custom ones in ReverseProxy and
rinpatch [Fri, 12 Jul 2019 20:52:26 +0000 (23:52 +0300)]
Merge the default options with custom ones in ReverseProxy and
Pleroma.HTTP

4 years agoAdd changelog entries for follower/following collection behaviour changes
rinpatch [Fri, 12 Jul 2019 18:49:16 +0000 (21:49 +0300)]
Add changelog entries for follower/following collection behaviour changes

4 years agoMerge branch 'develop' into fix/ap-hide-follows
rinpatch [Fri, 12 Jul 2019 18:43:06 +0000 (21:43 +0300)]
Merge branch 'develop' into fix/ap-hide-follows

4 years agoActivityPub Controller: Actually pass for_user to following/followers
rinpatch [Fri, 12 Jul 2019 17:54:20 +0000 (20:54 +0300)]
ActivityPub Controller: Actually pass for_user to following/followers
views and give 403 errors when trying to request hidden follower pages
when unauthenticated

4 years agotry to always match the filename for proxy url
Sachin Joshi [Fri, 12 Jul 2019 16:34:30 +0000 (22:19 +0545)]
try to always match the filename for proxy url

4 years agoMerge branch 'tests/web_metadata' into 'develop'
kaniini [Fri, 12 Jul 2019 16:42:54 +0000 (16:42 +0000)]
Merge branch 'tests/web_metadata' into 'develop'

Pleroma.Web.Metadata - tests

See merge request pleroma/pleroma!1401

4 years agoPleroma.Web.Metadata - tests
Maksim [Fri, 12 Jul 2019 16:42:54 +0000 (16:42 +0000)]
Pleroma.Web.Metadata - tests

4 years agoActivityPub User view: Following/Followers refactoring
rinpatch [Fri, 12 Jul 2019 16:41:05 +0000 (19:41 +0300)]
ActivityPub User view: Following/Followers refactoring

- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it

4 years agoMerge branch 'fix/pleroma-extensions' into 'develop'
kaniini [Fri, 12 Jul 2019 16:33:58 +0000 (16:33 +0000)]
Merge branch 'fix/pleroma-extensions' into 'develop'

Move new endpoints to pleroma namespace in Mastodon API

See merge request pleroma/pleroma!1404

4 years agoMove these to pleroma namespace in Mastodon API
Mark Felder [Fri, 12 Jul 2019 16:25:58 +0000 (11:25 -0500)]
Move these to pleroma namespace in Mastodon API

4 years agoAP user view: Add a test for hiding totalItems in following/followers
rinpatch [Fri, 12 Jul 2019 15:36:07 +0000 (18:36 +0300)]
AP user view: Add a test for hiding totalItems in following/followers

4 years agoMerge branch 'url-parser-proxy' into 'develop'
kaniini [Fri, 12 Jul 2019 15:34:00 +0000 (15:34 +0000)]
Merge branch 'url-parser-proxy' into 'develop'

preserve the original path/filename (no encoding/decoding) for proxy

See merge request pleroma/pleroma!1403

4 years agopreserve the original path/filename (no encoding/decoding) for proxy
Sachin Joshi [Fri, 12 Jul 2019 15:17:55 +0000 (21:02 +0545)]
preserve the original path/filename (no encoding/decoding) for proxy

4 years agoMerge branch 'search-limit-offset-type' into 'develop'
kaniini [Thu, 11 Jul 2019 13:55:31 +0000 (13:55 +0000)]
Merge branch 'search-limit-offset-type' into 'develop'

Add account_id, type, limit, and offset to GET /api/v1/search and /api/v2/search

See merge request pleroma/pleroma!1386

4 years agoExtend Pleroma.Pagination to support offset-based pagination, use async/await to...
Eugenij [Thu, 11 Jul 2019 13:55:31 +0000 (13:55 +0000)]
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel

4 years agoUpdate CHANGELOG
Egor Kislitsyn [Thu, 11 Jul 2019 13:17:03 +0000 (20:17 +0700)]
Update CHANGELOG

4 years agoMerge branch 'admin-configure' into 'develop'
kaniini [Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)]
Merge branch 'admin-configure' into 'develop'

admin api configure changes

See merge request pleroma/pleroma!1345

4 years agoadmin api configure changes
Alexander Strizhakov [Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)]
admin api configure changes

4 years agoMerge branch 'fix/1019-refactor' into 'develop'
kaniini [Thu, 11 Jul 2019 13:01:11 +0000 (13:01 +0000)]
Merge branch 'fix/1019-refactor' into 'develop'

Fix/1019 refactor

See merge request pleroma/pleroma!1397

4 years agoAdd `list` to Visibility
Egor Kislitsyn [Thu, 11 Jul 2019 12:29:24 +0000 (19:29 +0700)]
Add `list` to Visibility

4 years agoAdd "listMessage"
Egor Kislitsyn [Thu, 11 Jul 2019 09:36:08 +0000 (16:36 +0700)]
Add "listMessage"

4 years agoMerge branch 'chore/mailmap' into 'develop'
kaniini [Thu, 11 Jul 2019 09:03:17 +0000 (09:03 +0000)]
Merge branch 'chore/mailmap' into 'develop'

add mailmap [ci skip]

See merge request pleroma/pleroma!1399

4 years agoadd mailmap [ci skip]
Ariadne Conill [Thu, 11 Jul 2019 08:57:30 +0000 (08:57 +0000)]
add mailmap [ci skip]

4 years agoMerge branch 'develop' into feature/addressable-lists
Egor Kislitsyn [Thu, 11 Jul 2019 06:26:59 +0000 (13:26 +0700)]
Merge branch 'develop' into feature/addressable-lists

4 years agoenable synchronization by default
Alex S [Wed, 10 Jul 2019 15:55:11 +0000 (18:55 +0300)]
enable synchronization by default

4 years agoMerge branch 'fix/1005-idna-domains' into 'develop'
kaniini [Wed, 10 Jul 2019 15:23:25 +0000 (15:23 +0000)]
Merge branch 'fix/1005-idna-domains' into 'develop'

support for idna domains

Closes #1005

See merge request pleroma/pleroma!1330

4 years agosupport for idna domains
Alexander Strizhakov [Wed, 10 Jul 2019 15:23:25 +0000 (15:23 +0000)]
support for idna domains

4 years agoMerge branch 'features/mastoapi-emoji-categories' into 'develop'
Haelwenn [Wed, 10 Jul 2019 15:07:37 +0000 (15:07 +0000)]
Merge branch 'features/mastoapi-emoji-categories' into 'develop'

MastoAPI: Add categories to custom emojis

See merge request pleroma/pleroma!1365

4 years agoMastoAPI: Add categories to custom emojis
Haelwenn (lanodan) Monnier [Sat, 29 Jun 2019 23:05:28 +0000 (01:05 +0200)]
MastoAPI: Add categories to custom emojis

Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.

4 years agoremoving synchronization worker
Alex S [Wed, 10 Jul 2019 14:39:07 +0000 (17:39 +0300)]
removing synchronization worker

4 years agorobots txt test fix
Alex S [Wed, 10 Jul 2019 13:37:39 +0000 (16:37 +0300)]
robots txt test fix

4 years agosaving following_address for existing users
Alex S [Wed, 10 Jul 2019 13:02:22 +0000 (16:02 +0300)]
saving following_address for existing users

4 years agoadding following_address field to user
Alex S [Wed, 10 Jul 2019 13:01:32 +0000 (16:01 +0300)]
adding following_address field to user

4 years agoMerge branch 'feature/render-mentions-for-tags' into 'develop'
kaniini [Wed, 10 Jul 2019 13:29:50 +0000 (13:29 +0000)]
Merge branch 'feature/render-mentions-for-tags' into 'develop'

Create mentions only for explicitly mentioned users

Closes #999

See merge request pleroma/pleroma!1375

4 years agoCreate mentions only for explicitly mentioned users
Sergey Suprunenko [Wed, 10 Jul 2019 13:29:50 +0000 (13:29 +0000)]
Create mentions only for explicitly mentioned users

4 years agoMerge branch 'localization' into 'develop'
kaniini [Wed, 10 Jul 2019 13:27:59 +0000 (13:27 +0000)]
Merge branch 'localization' into 'develop'

Error Localization

See merge request pleroma/pleroma!1396

4 years agoFix unused import warning
Egor Kislitsyn [Wed, 10 Jul 2019 11:00:22 +0000 (18:00 +0700)]
Fix unused import warning

4 years agoAdd Russian translation
Egor Kislitsyn [Wed, 10 Jul 2019 10:58:15 +0000 (17:58 +0700)]
Add Russian translation

4 years agoFix response
Egor Kislitsyn [Wed, 10 Jul 2019 10:40:34 +0000 (17:40 +0700)]
Fix response

4 years agoFix credo warning
Egor Kislitsyn [Wed, 10 Jul 2019 09:28:24 +0000 (16:28 +0700)]
Fix credo warning

4 years agoWrap error messages into gettext helpers
Egor Kislitsyn [Wed, 10 Jul 2019 09:25:58 +0000 (16:25 +0700)]
Wrap error messages into gettext helpers

4 years agoAdd translation helpers
Egor Kislitsyn [Wed, 10 Jul 2019 07:52:41 +0000 (14:52 +0700)]
Add translation helpers

4 years agoUpdate `gettext` dependency
Egor Kislitsyn [Wed, 10 Jul 2019 07:01:57 +0000 (14:01 +0700)]
Update `gettext` dependency

4 years agoAdd SetLocalePlug
Egor Kislitsyn [Tue, 9 Jul 2019 11:30:15 +0000 (18:30 +0700)]
Add SetLocalePlug

4 years agoMerge branch 'tests/web/mastodon_api/search_controller' into 'develop'
kaniini [Wed, 10 Jul 2019 08:28:03 +0000 (08:28 +0000)]
Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'

add test for search_controller/ 100% coverage

See merge request pleroma/pleroma!1377

4 years agoadd test for search_controller/ 100% coverage
Maksim [Wed, 10 Jul 2019 08:28:03 +0000 (08:28 +0000)]
add test for search_controller/ 100% coverage

4 years agoMerge branch 'hotfix/disable-email-changelog-fix' into 'develop'
rinpatch [Wed, 10 Jul 2019 08:18:12 +0000 (08:18 +0000)]
Merge branch 'hotfix/disable-email-changelog-fix' into 'develop'

Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance

See merge request pleroma/pleroma!1395

4 years agoAdd a breaking changelog entry for explicitly disabling the mailer and reorder change...
rinpatch [Wed, 10 Jul 2019 08:09:55 +0000 (11:09 +0300)]
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance

4 years agoMerge branch 'feature/disable_send_emails' into 'develop'
kaniini [Wed, 10 Jul 2019 05:34:21 +0000 (05:34 +0000)]
Merge branch 'feature/disable_send_emails' into 'develop'

[#1062] added option to disable send email

See merge request pleroma/pleroma!1389

4 years ago[#1062] added option to disable send email
Maksim [Wed, 10 Jul 2019 05:34:21 +0000 (05:34 +0000)]
[#1062] added option to disable send email

4 years agoMerge branch 'feature/send-delete-user-activity' into 'develop'
kaniini [Wed, 10 Jul 2019 05:16:08 +0000 (05:16 +0000)]
Merge branch 'feature/send-delete-user-activity' into 'develop'

Send and handle "Delete" activity for deleted users

Closes #1071 and #1059

See merge request pleroma/pleroma!1384

4 years agoSend and handle "Delete" activity for deleted users
Sergey Suprunenko [Wed, 10 Jul 2019 05:16:08 +0000 (05:16 +0000)]
Send and handle "Delete" activity for deleted users

4 years agoMerge branch 'release/listener' into 'develop'
kaniini [Wed, 10 Jul 2019 05:14:08 +0000 (05:14 +0000)]
Merge branch 'release/listener' into 'develop'

add listener port and ip option for 'pleroma.instance gen' and enable its test

See merge request pleroma/pleroma!1393

4 years agoMerge branch 'fix/license-attribution' into 'develop'
kaniini [Wed, 10 Jul 2019 05:13:23 +0000 (05:13 +0000)]
Merge branch 'fix/license-attribution' into 'develop'

Add license/copyright to all project files

See merge request pleroma/pleroma!1394

4 years agoAdd license/copyright to all project files
feld [Wed, 10 Jul 2019 05:13:23 +0000 (05:13 +0000)]
Add license/copyright to all project files

4 years agoMerge branch 'tests/mrf_policy' into 'develop'
kaniini [Wed, 10 Jul 2019 05:12:21 +0000 (05:12 +0000)]
Merge branch 'tests/mrf_policy' into 'develop'

tests MRF filters

See merge request pleroma/pleroma!1379

4 years agotests MRF filters
Maksim [Wed, 10 Jul 2019 05:12:21 +0000 (05:12 +0000)]
tests MRF filters

4 years agoadd listener port and ip option for 'pleroma.instance gen' and enable its test
Sachin Joshi [Tue, 9 Jul 2019 19:57:41 +0000 (01:42 +0545)]
add listener port and ip option for 'pleroma.instance gen' and enable its test

4 years agoMerge branch '878-activity-object-decoupling-in-tests' into 'develop'
rinpatch [Tue, 9 Jul 2019 20:00:37 +0000 (20:00 +0000)]
Merge branch '878-activity-object-decoupling-in-tests' into 'develop'

[#878] Refactored assumptions on embedded object presence in tests

Closes #878

See merge request pleroma/pleroma!1390

4 years ago[#878] Tests improvements per code review.
Ivan Tashkinov [Tue, 9 Jul 2019 19:37:59 +0000 (22:37 +0300)]
[#878] Tests improvements per code review.