fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-30 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
7715 commits 26 branches 108 tags 316 MiB
Commit graph

2719 commits

Author SHA1 Message Date
lain e835cd97f6 Containment: Add a catch-all clause to contain_origin. 2019-11-12 12:07:17 +01:00
feld e27d78e768 Merge branch 'nodeinfo-federation-enabled' into 'develop' 
report federating status in nodeinfo

See merge request pleroma/pleroma!1971
 2019-11-11 19:14:06 +00:00
kaniini 2cc043591c Merge branch 'feature/static-fe' into 'develop' 
Static frontend

See merge request pleroma/pleroma!1917
 2019-11-11 19:10:44 +00:00
href b39b49cc14 report federating status in nodeinfo 2019-11-11 19:03:43 +01:00
lain 1ca7b877a1 Merge branch 'iss-1376' into 'develop' 
Check client and token in GET /oauth/authorize

See merge request pleroma/pleroma!1940
 2019-11-11 12:27:33 +00:00
lain 417f9a782f Merge branch 'fix/1399' into 'develop' 
fix for migrate config to db task

Closes #1399

See merge request pleroma/pleroma!1964
 2019-11-11 12:13:45 +00:00
Steven Fuchs 94627baa5c New rate limiter 2019-11-11 12:13:06 +00:00
lain f6056e9c9c UserEnabledPlug: Don't authenticate unconfirmed users. 2019-11-11 12:43:46 +01:00
lain 8521553ad9 User: Don't let deactivated users authenticate. 2019-11-11 12:37:38 +01:00
Maxim Filippov 46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-11 19:18:12 +09:00
Alexander 6a4201e0b4
fix for migrate task 2019-11-10 22:54:37 +03:00
lain a88e834dba Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-11-10 11:32:50 +00:00
lain 3a1aaadc18 Merge branch 'issue/1339' into 'develop' 
[#1339] add subject to atom feed

See merge request pleroma/pleroma!1961
 2019-11-10 11:20:20 +00:00
Maksim Pechnikov 9d0b989521 add subject to atom feed 2019-11-10 11:10:20 +03:00
Phil Hagelberg 6ef8049664 Add changelog entry, cheatsheet docs, and alphabetize. 2019-11-09 18:09:29 -08:00
Phil Hagelberg ef7c3bdc7a Add some further test cases. 
Including like ... private visibility, cos that's super important.
 2019-11-09 18:08:45 -08:00
Phil Hagelberg 2bf592f5dc Add tests for static_fe controller. 2019-11-09 18:08:45 -08:00
Ariadne Conill 5b60d82592 object containment: handle all cases where ID is invalid (missing, nil, non-string) 2019-11-08 14:51:28 -06:00
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions 2019-11-08 13:27:11 +01:00
Maxim Filippov b14bf9044f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-08 18:30:49 +09:00
Maxim Filippov 7258db023e Support old flag format 2019-11-08 18:21:29 +09:00
eugenijm 7888803ffe Mastodon API: Add the recipients parameter to GET /api/v1/conversations 2019-11-07 08:26:24 +03:00
rinpatch 84175fe30e Set better Cache-Control header for static content 
Closes #1382
 2019-11-06 16:41:19 +03:00
feld 8b19464176 Merge branch 'feature/multiple-users-force-password-reset' into 'develop' 
Force password reset for multiple users

Closes admin-fe#46

See merge request pleroma/pleroma!1928
 2019-11-06 12:24:41 +00:00
Maxim Filippov f171095960 Grouped reports with status data baked in 2019-11-06 21:25:46 +10:00
rinpatch 54746c6c26 Object Fetcher: set cache after reinjecting 
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
 2019-11-06 14:00:03 +03:00
AkiraFukushima e1fc6cb78f Check client and token in GET /oauth/authorize 2019-11-05 23:52:47 +09:00
lain 1bd1f62af5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel 2019-11-05 15:21:00 +01:00
lain faced6236b NoteValidator: Add very basic validator for Note objects. 2019-11-05 15:02:31 +01:00
lain 3d1b445cbf Object Validators: Extract common validations. 2019-11-05 15:02:09 +01:00
Maksim Pechnikov e52955c961 update following_relationship.ex 2019-11-05 10:50:03 +03:00
Maksim Pechnikov 62bc0657e7 excluded invisible users from search results 2019-11-05 08:55:41 +03:00
Maxim Filippov 2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset 2019-11-05 11:36:47 +10:00
Maxim Filippov 43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-05 02:12:48 +03:00
Maksim Pechnikov 4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id 2019-11-04 20:44:24 +03:00
rinpatch fee1276963 Merge branch 'failing-search-fixes' into 'develop' 
User Search: Remove superfluous setweight and random test.

See merge request pleroma/pleroma!1935
 2019-11-04 16:28:55 +00:00
lain 4e53520917 User Search: Remove superfluous setweight and random test. 
The test tested for a behavior that isn't actually enforced anymore.
 2019-11-04 16:57:41 +01:00
eugenijm ed29be24cb Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload. 2019-11-04 18:36:16 +03:00
lain a304a2a845 Merge branch 'transmogrifier-test-errors' into 'develop' 
capture test log where errors are expected

See merge request pleroma/pleroma!1915
 2019-11-04 15:19:29 +00:00
Steven Fuchs 5271bbcf11 add missing tesla mocks 2019-11-04 15:18:32 +00:00
lain 556da92902 Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' 
Store status data inside flag activity

See merge request pleroma/pleroma!1849
 2019-11-04 14:11:44 +00:00
rinpatch 8dd7c099a7 Merge branch 'bugfix/streamer-follows' into 'develop' 
streamer: use direct object for filter checks when there is no valid child object in an activity

Closes #1291

See merge request pleroma/pleroma!1931
 2019-11-03 17:09:57 +00:00
kaniini 74135e1318 Merge branch 'feature/omit-relay-user' into 'develop' 
AdminAPI: Omit relay user from users list

Closes #1349

See merge request pleroma/pleroma!1924
 2019-11-03 16:19:27 +00:00
kaniini 61bcd4595f Merge branch 'feature/fast_sanitize' into 'develop' 
Switching to FastSanitize

See merge request pleroma/pleroma!1916
 2019-11-03 16:18:19 +00:00
Ariadne Conill 4bf942583f streamer: use direct object for filter checks when there is no valid child object in an activity 
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.

Closes #1291
 2019-11-03 09:05:12 -06:00
Maxim Filippov 743b622b7b Force password reset for multiple users 2019-11-01 18:45:47 +03:00
Maxim Filippov 6f9d3d30fa AdminAPI: Omit relay user from users list 2019-10-31 02:26:02 +03:00
Mark Felder fcea6a9d2c Merge branch 'develop' into feature/fast_sanitize 2019-10-30 17:51:15 -05:00
Egor Kislitsyn 61fc739ab8
Handle "Move" activity 2019-10-30 18:21:49 +07:00
kPherox d1ae51b02a Update test for get_recipients_from_activity 2019-10-30 20:14:16 +09:00
rinpatch ae59b38203 Rip out the rest of htmlsanitizeex 2019-10-30 09:20:13 +03:00
rinpatch 61400d7eb7 Fix XSS emoji test 2019-10-29 20:49:32 +03:00
kPherox c2f2d7bcf6 Add test follow activity for locked account 2019-10-29 18:46:22 +09:00
rinpatch 08f6837065 Switch from HtmlSanitizeEx to FastSanitize 2019-10-29 01:18:08 +03:00
stwf 56e42602b0 capture where errors are expected 2019-10-28 12:51:58 -04:00
Egor Kislitsyn 4270861085
Merge branch 'develop' into feature/move-activity 2019-10-28 15:10:47 +07:00
lain 2480200759 Merge branch 'refactor/following-relationships' into 'develop' 
Move following relationships to a separate table

Closes #1233

See merge request pleroma/pleroma!1814
 2019-10-28 07:27:45 +00:00
Maxim Filippov 8282b6ac3d Make sure incoming flags are updated with status data 2019-10-27 16:17:37 +03:00
Maxim Filippov 791bcfd90f Merge branch 'develop' into feature/store-statuses-data-inside-flag 2019-10-27 16:11:25 +03:00
Maxim Filippov 8eff05d4c6 Strip status data from Flag (when federating or closing/resolving report) 2019-10-27 16:05:32 +03:00
eugenijm 0580654485 Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count. 
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
 2019-10-26 02:29:18 +03:00
Egor Kislitsyn b777083f3f
Add also_known_as field to Pleroma.User 2019-10-25 19:14:18 +07:00
stwf 5329b361ec fix test 2019-10-24 12:48:17 -04:00
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Maxim Filippov b08b1d5d91 Store status data inside Flag activity 2019-10-23 21:27:22 +02:00
Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	lib/pleroma/notification.ex
 2019-10-23 17:22:42 +03:00
lain 25077812bf SideEffectsTest: Fix test. 2019-10-23 12:25:20 +02:00
lain 1adafa0966 Credo fixes. 2019-10-23 12:18:05 +02:00
lain 97d5c79aa0 Add Pipeline module, test for federation. 2019-10-23 11:52:27 +02:00
Ariadne Conill 3f6a596922 activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors 2019-10-22 20:50:46 -05:00
Ariadne Conill 277aea45b9 tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization 
There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD.  It can, and we will add regression tests to prove that it can handle
this particular sin.  Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever.
 2019-10-22 19:43:31 -05:00
kaniini 6281e4795a Merge branch 'feature/push-subject-for-dm' into 'develop' 
Direct messages should provide a distinct push notification subject

See merge request pleroma/pleroma!1864
 2019-10-21 23:50:01 +00:00
Mark Felder 0c628fafc5 Spelling 2019-10-21 18:35:43 -05:00
Mark Felder 2cbb3f2364 Add tests for the subject of push notifications 2019-10-21 18:34:20 -05:00
rinpatch 6712b6e4de Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' 
Do not include notifications from blocked users when with_muted is set

See merge request pleroma/pleroma!1869
 2019-10-21 16:44:17 +00:00
rinpatch 2dbee29cf5 Do not include notifications from blocked users when with_muted is set 
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
 2019-10-21 19:27:38 +03:00
Ivan Tashkinov 7c7f90bc4f [#1304] Merged develop, handled User.Info.invisible. 2019-10-21 11:58:22 +03:00
Maksim Pechnikov 243719a965 Merge branch 'develop' into feature/masto_api_markers 2019-10-21 11:32:28 +03:00
Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex
 2019-10-21 11:05:09 +03:00
Egor Kislitsyn c6fba62666
Fix Relay 2019-10-21 14:47:07 +07:00
Egor Kislitsyn 4ea1a61b00
Merge branch 'develop' into refactor/following-relationships 2019-10-21 14:19:15 +07:00
Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
 2019-10-20 22:29:56 +03:00
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
 2019-10-20 20:43:18 +03:00
Ivan Tashkinov e8843974cb [#1304] Moved remaining fields from User.Info to User. 
Misc. fixes / improvements.
 2019-10-20 13:42:42 +03:00
Ariadne Conill 05c58eaece change Maksim's test description 2019-10-19 23:23:13 +00:00
Ariadne Conill ba92522c69 tests: add test to ensure invisible actors are rendered with the invisible hint set to true 2019-10-19 23:21:37 +00:00
Ariadne Conill 52d56ed705 tests: add test verifying the relay user is invisible 2019-10-19 23:21:37 +00:00
Ariadne Conill c9280b9730 rework to use properties instead of compound typing, per SocialCG 2019-10-19 23:21:37 +00:00
Maksim Pechnikov 189a288925 fix test 2019-10-19 23:21:37 +00:00
Maksim Pechnikov 9694d51437 added test fo Pleroma.Web.MastodonAPI.StatusController 2019-10-19 23:21:37 +00:00
Ariadne Conill 80d3912a56 test: activitypub: use User.invisible?/1 for testing invisibility 2019-10-19 23:21:37 +00:00
Ariadne Conill ef659331b0 implement invisible support for remote users 2019-10-19 23:21:37 +00:00
Ariadne Conill 95871cb462 user: implement User.invisible?/1 2019-10-19 23:21:37 +00:00
Ariadne Conill cd90735a4b tests: ostatus controller tests: fix sporadic compilation failure 2019-10-19 23:16:15 +00:00
lain f1381d68e7 StatusControllerTest: Capture log. 2019-10-19 14:46:14 +02:00
eugenijm 52ed2f8f2d Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read 2019-10-19 15:24:06 +03:00
Maxim Filippov 019147f115 Merge branch 'develop' into feature/relay-list 2019-10-18 18:35:58 +02:00
Ariadne Conill c2ae6310dc tests: mastodon api: fix broken test that used OStatus 2019-10-18 15:46:46 +00:00
Ariadne Conill a8eb1f0975 tests: mastodon search: search for an account that is visible via activitypub, not ostatus 2019-10-18 14:50:10 +00:00
Ariadne Conill dbfdb1f6e3 add some missing tesla fixtures 2019-10-18 14:50:10 +00:00