tim/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
7970 commits 3 branches 74 tags 292 MiB
Commit graph

4855 commits

Author SHA1 Message Date
Phil Hagelberg
d1320160f4 Looks like source_data is on user directly now. 2019-11-09 18:06:51 -08:00
William Pitcock
ca5ef201ef static fe: add remote follow button 2019-11-09 18:06:51 -08:00
William Pitcock
b33fbd58e3 static fe: add support for message subjects 2019-11-09 18:06:51 -08:00
William Pitcock
e2904b5777 static fe: reformat activity representer 2019-11-09 18:06:51 -08:00
William Pitcock
2b5bd5236d static fe: add user profile rendering 2019-11-09 18:06:51 -08:00
William Pitcock
8f08da750a static fe: use a generic activity representer to render activities 2019-11-09 18:06:51 -08:00
William Pitcock
ff8d0902f3 static fe: formatting 2019-11-09 18:06:51 -08:00
William Pitcock
a4d3a8ec03 static fe: proof of concept 2019-11-09 18:06:51 -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
Ariadne Conill
532fd38b12 nodeinfo: add multifetch feature (ref pleroma-fe!977). 2019-11-08 12:48: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
32afa07995 Fetcher: fix local check returning unwrapped object 
This resulted in error messages about failed refetches being logged.
 2019-11-07 01:40:55 +03:00
rinpatch
802d249827 Merge branch 'fix/trailing-format-plug-oauth' into 'develop' 
Fix TrailingFormatPlug not being active for /api/oauth_tokens

Closes #1385

See merge request pleroma/pleroma!1944
 2019-11-06 14:47:34 +00:00
rinpatch
365657320c Fix TrailingFormatPlug not being active for /api/oauth_tokens 2019-11-06 17:22:23 +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
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
Steven Fuchs
5271bbcf11 add missing tesla mocks 2019-11-04 15:18:32 +00:00
kaniini
06cc77e6fb Merge branch 'faster-user-deactivation' into 'develop' 
User: Don't pull remote users follower count immediately after deactivating.

Closes #1369

See merge request pleroma/pleroma!1933
 2019-11-04 14:24:21 +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
lain
0c31258616 User: Don't pull remote users follower count immediately after deactivating. 
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.

Closes #1369
 2019-11-04 14:36:54 +01: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
1b83a0694a Fix moderation log crash 2019-11-01 19:13:29 +03:00
Maxim Filippov
743b622b7b Force password reset for multiple users 2019-11-01 18:45:47 +03:00
Maxim Filippov
d75934b0d0 Undo dialyzer fix 2019-11-01 15:14:43 +03:00
Maxim Filippov
ced9f92327 Fix count 2019-10-31 15:34:49 +03:00
Maxim Filippov
6f9d3d30fa AdminAPI: Omit relay user from users list 2019-10-31 02:26:02 +03:00
Maxim Filippov
59a149c69a Fix "the call ... will never return" warning 2019-10-31 02:25:15 +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
363e76d4da Fix duplicate recipients 2019-10-30 15:40:25 +09:00
rinpatch
ae59b38203 Rip out the rest of htmlsanitizeex 2019-10-30 09:20:13 +03:00
rinpatch
77cfb08b8c Remove commented-out code 2019-10-29 20:58:54 +03:00
kPherox
0c361eeb25
Add pending to handle incoming for Follow activity 2019-10-29 17:12:49 +09:00
rinpatch
08f6837065 Switch from HtmlSanitizeEx to FastSanitize 2019-10-29 01:18:08 +03: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
d56bc62275 Fix report parsing 2019-10-27 16:33:58 +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
rinpatch
653054d301 Merge branch 'remove-unsed-info-fields-fn' into 'develop' 
Remove unused Pleroma.User.info_fields/0

See merge request pleroma/pleroma!1882
 2019-10-25 14:51:02 +00:00
Egor Kislitsyn
b777083f3f
Add also_known_as field to Pleroma.User 2019-10-25 19:14:18 +07:00
Egor Kislitsyn
dbee53c2df
Remove unused Pleroma.User.info_fields/0 2019-10-25 16:48:01 +07:00
stwf
2ab072f949 object fetcher error handling 2019-10-24 12:08:34 -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
c0246309a5 [#1304] Extra bullet-proofing. 2019-10-23 19:30:02 +03:00
Ivan Tashkinov
065e9fac12 [#1304] Adjusted User.Info references from Notification. 2019-10-23 17:31:02 +03: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
Ivan Tashkinov
11cd994425 [#1304] Fixed null::jsonb handling in User.Info migration. 2019-10-23 17:15:48 +03:00
Ariadne Conill
3f6a596922 activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors 2019-10-22 20:50:46 -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
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
b4cbf0568b [#1304] Analysis issue fix. 2019-10-20 13:58:27 +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
c9280b9730 rework to use properties instead of compound typing, per SocialCG 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
1469a084d4 relay: set invisible to true 2019-10-19 23:21:37 +00:00
Ariadne Conill
e7333db72a user info: add invisible field 2019-10-19 23:21:37 +00:00
Haelwenn
f01dbc450c Merge branch 'feature/mastofe-pwa' into 'develop' 
MastoFE: Add PWA manifest.

See merge request pleroma/pleroma!1834
 2019-10-19 20:11:58 +00: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
KokaKiwi
638457ba94 MastoFE: Add PWA manifest. 2019-10-19 12:15:14 +02:00
Mark Felder
dcb23a85b6 Merge branch 'develop' into feature/push-subject-for-dm 2019-10-18 17:56:15 -05:00
Mark Felder
152caef51d Direct messages should provide a distinct push notification subject 2019-10-18 17:51:34 -05:00
Maxim Filippov
019147f115 Merge branch 'develop' into feature/relay-list 2019-10-18 18:35:58 +02:00
Ariadne Conill
44e64af5e7 object: containment: simplify the pattern match for OStatus testsuite hack 2019-10-18 15:39:15 +00:00
Ariadne Conill
e99fdfc32d object: containment: only allow OStatus references in test suite environment 2019-10-18 15:37:14 +00:00
Ariadne Conill
3c785b85a6 object: fetcher: fix up formatting 2019-10-18 14:50:10 +00:00
Ariadne Conill
bae96de273 activitypub: tag containment checks for better error tracing 2019-10-18 14:50:10 +00:00
Ariadne Conill
7295a05cee object: containment: also allow OStatus object IDs through when comparing origins 2019-10-18 14:50:10 +00:00
Ariadne Conill
a177f22e02 object: fetcher: improve error reporting 2019-10-18 14:50:10 +00:00
Ariadne Conill
bf2107743f object: containment: don't try to contain ostatus objects 2019-10-18 14:50:10 +00:00
Ariadne Conill
6f110fc04c object fetcher: fix up error handling 2019-10-18 14:50:09 +00:00
Ariadne Conill
48059c03c9 fix up some tests 2019-10-18 14:50:09 +00:00
Ariadne Conill
d379b48769 kill almost all of the OStatus module 2019-10-18 14:50:09 +00:00
Ariadne Conill
6a1f4c5145 federator: remove OStatus incoming document support 2019-10-18 14:50:09 +00:00
Ariadne Conill
835ad52378 remove Salmon module 2019-10-18 14:50:09 +00:00
Ariadne Conill
beb9861f9d router: disconnect Salmon 2019-10-18 14:50:09 +00:00
Ariadne Conill
a7b92bba68 webfinger: stop pulling Salmon data out of WebFinger 2019-10-18 14:50:09 +00:00
Ariadne Conill
c00ae10af8 feed: don't advertise salmon endpoint 2019-10-18 14:50:09 +00:00
Ariadne Conill
adb639db56 publisher: move remote_users() from Salmon module 2019-10-18 14:50:09 +00:00
Ariadne Conill
4f82e42e4e websub: remove entirely 2019-10-18 14:50:09 +00:00
Ariadne Conill
b16a460916 federator: remove websub stuff 2019-10-18 14:50:09 +00:00
Ariadne Conill
25b7ff56c3 application: don't start Federator.init/1 anymore 2019-10-18 14:50:09 +00:00
rinpatch
39e996528c Fix a migration wiping user info of users that don't have any mutes 
And introduce safe_jsonb_set
 2019-10-18 15:22:07 +03:00
Haelwenn (lanodan) Monnier
3c6fd0bb99
upload.ex: Remove deprecated configuration 2019-10-18 12:34:09 +02:00
Maxim Filippov
2473702be2 Merge branch 'develop' into feature/relay-list 2019-10-18 10:24:29 +02:00
kaniini
7511f3d192 Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop' 
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`

See merge request pleroma/pleroma!1847
 2019-10-18 04:42:02 +00:00
kaniini
733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex 2019-10-18 04:36:37 +00:00
eugenijm
359dd1890e Mastodon API: Mark the conversation as read for the author when they send a new direct message 2019-10-17 16:49:39 +03:00
Maksim Pechnikov
66b5d0ff55 add Markers /api/v1/markers 2019-10-17 15:26:59 +03:00
Ivan Tashkinov
10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
lain
1bfdf57fc7 Merge branch 'user-search-experiments' into 'develop' 
User search: Remove trigram and refactor the module

See merge request pleroma/pleroma!1850
 2019-10-16 12:29:08 +00:00
feld
21f0757b0d Merge branch 'feature/multiple-users-activation-permissions' into 'develop' 
Ability to toggle activation status, permission group & delete multiple users

Closes admin-fe#39

See merge request pleroma/pleroma!1825
 2019-10-16 12:14:47 +00:00
lain
6977cddff9 Merge branch 'benchmark-finishing' into 'develop' 
Benchmark finishing

Closes #755

See merge request pleroma/pleroma!1848
 2019-10-16 11:54:49 +00:00
rinpatch
0a5175ecbb Order fts results by trigram 2019-10-16 13:49:33 +03:00
rinpatch
c10ce113d4 User search: Remove trigram and refactor the module 
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
 2019-10-16 12:52:47 +03:00
Maxim Filippov
da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array 2019-10-15 17:33:29 +02:00
Maxim Filippov
90d516d42b Store status data inside flag activity 2019-10-15 16:52:41 +02:00
Alexander
e7bb762ec2
don't stream in benchmark env 2019-10-15 15:16:17 +03:00
kPherox
5bd0717de2
Add Sec-WebSocket-Protocol to response header 2019-10-15 21:09:44 +09:00
Egor Kislitsyn
1d46944fbd
Do not add follower_address to following for non local users 2019-10-14 13:50:43 +07:00
eugenijm
a97b642289 Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints 2019-10-14 02:57:21 +03:00
lain
e3b4a3e96b Merge branch 'incoming-id-fixes' into 'develop' 
Assorted transmogrifier fixes

See merge request pleroma/pleroma!1831
 2019-10-13 15:37:49 +00:00
rinpatch
9bdbf0811b Make MediaProxy failure tracking less brutal 
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
 2019-10-11 22:52:38 +03:00
Maxim Filippov
cc6875b582 Add GET /api/pleroma/admin/relay endpoint - lists all followed relays 2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions 2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it 2019-10-11 15:58:45 +03:00
lain
422aa6befe Ostatus DeleteHandler: Fix for new option format. 2019-10-11 12:53:09 +02:00
lain
37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject. 2019-10-11 11:48:58 +02:00
lain
9b963064eb Transmogrifier: Actually store who deleted a note. 2019-10-11 11:25:45 +02:00
Maxim Filippov
f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it 2019-10-11 00:24:31 +03:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship 2019-10-11 02:35:32 +07:00
lain
29647dfd09 Transmogrifier: Save correct ids for incoming deletes. 2019-10-10 17:17:33 +02:00
lain
c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing 2019-10-10 14:40:59 +02:00
lain
d7f9679ff2 Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-10-10 12:38:51 +00:00
Maxim Filippov
24eecc3cb4 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-10-10 03:33:55 +03:00
Maxim Filippov
ad42837244 Ability to toggle activation status and permission group for a group of users 2019-10-09 17:03:54 +03:00
eugenijm
580a67f5ca Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id) 2019-10-09 07:27:09 +03:00
Maxim Filippov
aa7fd616c7 Line is too long! 2019-10-07 16:03:23 +03:00
Maxim Filippov
35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-10-07 15:41:41 +03:00
Maxim Filippov
7aceaa517b Admin API: Reports, grouped by status 2019-10-07 15:39:07 +03:00
lain
6c278cfe09 Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-10-07 12:31:51 +00:00
Ariadne Conill
9a2f71f4d5 mastodon api: fix exclude_replies (closes #1287) 2019-10-07 12:29:33 +00:00
Sergey Suprunenko
4b3f77a99f Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
lain
d580eedfe9 Linting. 2019-10-07 12:40:33 +02:00
lain
73b6512907 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-07 12:30:59 +02:00
kaniini
93bdc55306 Merge branch 'mrf/simple_policy/check_actor' into 'develop' 
mrf/simple_policy: check actor against accept/reject

See merge request pleroma/pleroma!1806
 2019-10-07 10:19:24 +00:00
Ivan Tashkinov
28fb98d69e Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 
# Conflicts:
#	CHANGELOG.md
 2019-10-07 11:06:30 +03:00
lain
91e90aa807 Merge branch 'misskey-compat' into 'reactions' 
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.

See merge request pleroma/pleroma!1783
 2019-10-07 07:25:27 +00:00
Haelwenn
b4f3c16885 Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' 
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes

Closes #1234

See merge request pleroma/pleroma!1643
 2019-10-07 02:14:45 +00:00
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject 2019-10-07 03:49:57 +02:00
kaniini
2411d09215 Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop' 
Move local keys out of `user.info`

See merge request pleroma/pleroma!1799
 2019-10-06 14:32:56 +00:00
feld
1d8e956c32 Use the user.id instead of nickname in report URLs 
Ensures links to profiles of remote users work.
 2019-10-06 14:13:04 +00:00
Ivan Tashkinov
b93856874d [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
 2019-10-06 17:12:17 +03:00
rinpatch
fefbd31c6e Move local keys out of user.info 2019-10-06 16:56:36 +03:00
Ivan Tashkinov
06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
 2019-10-06 11:43:49 +03:00
lain
61097ba6ab Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-10-06 08:11:47 +00:00
Ivan Tashkinov
f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 
# Conflicts:
#	CHANGELOG.md
 2019-10-06 09:30:49 +03:00
Haelwenn
9e34919dcd Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop' 
Fix custom fields of accounts update credentials

See merge request pleroma/pleroma!1597
 2019-10-06 04:41:06 +00:00
kaniini
7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop' 
[#1278] Move a few more actions from MastodonAPIController

See merge request pleroma/pleroma!1761
 2019-10-05 19:28:53 +00:00
kaniini
45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop' 
Import object from self-Announce whenever possible

See merge request pleroma/pleroma!1770
 2019-10-05 19:28:29 +00:00
kaniini
17ff4b43cb Merge branch 'unread-conversation-count' into 'develop' 
Add `pleroma.unread_conversation_count` to the Account entity

See merge request pleroma/pleroma!1796
 2019-10-05 19:28:07 +00:00
eugenijm
8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
lain
1ed8fbc4d9 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-05 15:10:57 +02:00
lain
276a520163 CommonAPI: Create profile updates as public. 
This saves us lots of sending out because we can use sharedInbox.
 2019-10-05 14:53:50 +02:00
lain
4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id. 2019-10-05 14:49:45 +02:00
Thibaut Girka
791d93ff0e Make credo happy 2019-10-05 13:56:40 +02:00
Thibaut Girka
977e711e22 Import object from self-Announce whenever possible 2019-10-05 13:56:40 +02:00
kaniini
e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" 
This reverts merge request !1737
 2019-10-05 10:00:05 +00:00
lain
6a85f7d1ea Transmogrifier: Extend misskey like compatibility. 2019-10-05 10:45:42 +02:00
lain
d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions 2019-10-05 10:42:29 +02:00
Maksim Pechnikov
83631752af removed legacy api: "/objects/:uuid/likes" 2019-10-04 22:35:26 +03:00
kaniini
e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop' 
widen streaming API block effects

See merge request pleroma/pleroma!1784
 2019-10-04 17:39:06 +00:00
kaniini
5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop' 
Add the `unread_conversation_count` field to the user info

See merge request pleroma/pleroma!1737
 2019-10-04 17:33:18 +00:00
Maxim Filippov
8dcc2f9f5e Admin API: Allow changing the state of multiple reports at once 2019-10-04 19:00:58 +03:00
Ariadne Conill
d1d058bf85 streamer: worker: actually use should_send? consistently 2019-10-04 15:42:25 +00:00
Ariadne Conill
5a0c018d2a streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist 2019-10-04 15:41:55 +00:00
Ariadne Conill
2417b633ed streamer: add missing copyright headers 2019-10-04 15:21:45 +00:00
lain
43a211bcb1 Transmogrifier: Handle misskey likes with reactions like EmojiReactions. 2019-10-04 17:01:04 +02:00
lain
568a995d64 ActivityPub: Change addressing of Undo. 2019-10-04 16:32:42 +02:00
lain
27110793a7 Merge branch 'featrue/job-monitor' into 'develop' 
Add Pleroma.JobQueueMonitor

Closes #1274

See merge request pleroma/pleroma!1721
 2019-10-04 12:52:11 +00:00
lain
27e914955e Merge branch 'fix/nickname-fail' into 'develop' 
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname

Closes #1293

See merge request pleroma/pleroma!1777
 2019-10-04 11:54:05 +00:00
rinpatch
8217292085 Fix get_cached_by_nickname_or_id not allowing to get local users by 
nickname

Closes #1293
 2019-10-04 14:44:09 +03:00
lain
01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop' 
notification_view.ex: Make sure `account` isn’t empty

See merge request pleroma/pleroma!1779
 2019-10-04 11:28:20 +00:00
Egor Kislitsyn
d3ac4e8083
Fix OAuthController 2019-10-04 13:30:46 +07:00
Haelwenn (lanodan) Monnier
5dc14c89ce
notification_view.ex: Make sure account isn’t empty 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
 2019-10-04 07:11:53 +02:00
eugenijm
06d9df79c5 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-04 00:53:23 +03:00
lain
c9043c6c80 Transmogrifier: Handle incoming Undos for EmojiReactions. 2019-10-03 18:37:23 +02:00
Ivan Tashkinov
64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
 2019-10-02 20:42:40 +03:00
lain
4cb603e1df PleromaAPI: Add unreacting. 2019-10-02 18:19:16 +02:00
lain
391c736292 PleromaAPI: Fix emoji_reactions_by 2019-10-02 18:13:10 +02:00
Egor Kislitsyn
e0c68eeb02
Move :favourites and :bookmarks actions to StatusController 2019-10-02 21:31:19 +07:00
Egor Kislitsyn
7f2bc57725
Move follows, mutes and blocks actions to AccountController 2019-10-02 21:22:21 +07:00
lain
9cfe9a57c5 CommonAPI: Add unreactions. 2019-10-02 15:38:57 +02:00
Egor Kislitsyn
d3c404af12
Add MastoFEController 2019-10-02 20:36:08 +07:00
lain
dfe5c958eb ActivityPub: Add undo for emoji reactions. 2019-10-02 15:08:20 +02:00
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController 2019-10-02 19:16:34 +07:00
lain
557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-02 13:27:55 +02:00
kaniini
433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop' 
Extract instance actions from `MastodonAPIController` to `InstanceController`

See merge request pleroma/pleroma!1760
 2019-10-02 10:46:14 +00:00
kaniini
debd0a3066 Merge branch 'accept-embedded-announce-object' into 'develop' 
Inline object when Announcing a self-owned private object

See merge request pleroma/pleroma!1769
 2019-10-02 10:45:55 +00:00
Thibaut Girka
86880b9821 Inline object when Announcing a self-owned private object 2019-10-02 12:15:06 +02:00
Thibaut Girka
3d61efa7c9 Rename misleading get_announce_visibility to public_announce? 2019-10-02 10:48:34 +02:00
Egor Kislitsyn
26693292f4
Remove :enqueued counter 2019-10-02 14:50:25 +07:00
Egor Kislitsyn
c8b01f6667
Extract instance actions from MastodonAPIController to InstanceController 2019-10-02 14:13:52 +07:00
kaniini
89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop' 
Send an identifier alongside with error message in OAuthController

See merge request pleroma/pleroma!1765
 2019-10-02 07:04:33 +00:00
kaniini
8557176808 Merge branch 'split-masto-api/auth' into 'develop' 
Extract auth actions from `MastodonAPIController` to `AuthController`

See merge request pleroma/pleroma!1759
 2019-10-02 07:02:56 +00:00
kaniini
9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop' 
Allow receiving private self-announces over ActivityPub

See merge request pleroma/pleroma!1766
 2019-10-02 07:02:24 +00:00
feld
1255ec888d Revert "Add upload limits to /api/v1/instance" 
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
 2019-10-01 22:16:29 +00:00
Thibaut Girka
427d0c2a00 Store private announcements in object.data["announcements"], filter them on display 2019-10-01 22:39:25 +02:00
Sergey Suprunenko
c541b83bef Track failed proxy urls and don't request them again 2019-10-01 20:00:27 +00:00
Thibaut Girka
43e3db0951 Fix returned visibility of announces in MastodonAPI 2019-10-01 20:38:29 +02:00
Thibaut Girka
4c1f158f5d Allow users to announce privately, including own private notes 2019-10-01 20:00:59 +02:00
Maxim Filippov
b2273c695e Discard identifier, if empty 2019-10-01 19:43:22 +03:00
Thibaut Girka
fe538973dd Ensure self-announces do not widen the audience of the original post 2019-10-01 18:38:57 +02:00
KokaKiwi
1f0be71ea4 Make activity announceable by its author. 2019-10-01 17:47:43 +02:00
Maxim Filippov
0f9c2c8b87 Send an identifier alongside with error message in OAuthController 2019-10-01 18:10:04 +03:00
Egor Kislitsyn
af690d1033
Extract auth actions from MastodonAPIController to AuthController 2019-10-01 15:54:45 +07:00
Egor Kislitsyn
2dad6dd020
Extract apps actions from MastodonAPIController to AppController 2019-10-01 15:21:46 +07:00
Egor Kislitsyn
39695c4436 Extract suggestions actions from MastodonAPIController to SuggestionController 2019-10-01 15:07:49 +07:00
Egor Kislitsyn
585bc57edb
Extract media actions from MastodonAPIController to MediaController 2019-10-01 14:36:35 +07:00
Egor Kislitsyn
36a34c36fe
Extract poll actions from MastodonAPIController to PollController 2019-10-01 11:44:34 +07:00
kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials 2019-10-01 01:40:33 +09:00
lain
dae744478e Transmogrifier: Handle compact objects in undos. 2019-09-30 18:13:05 +02:00
Ivan Tashkinov
6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 
# Conflicts:
#	CHANGELOG.md
 2019-09-30 17:41:20 +03:00
lain
19bc0b8c79 . 2019-09-30 16:38:19 +02:00
lain
08256e9299 ActivityPub: Federate reactions. 2019-09-30 15:51:09 +02:00
lain
6068d2254e PleromaAPIController: Fixes and refactoring. 2019-09-30 15:13:25 +02:00
lain
04a2910f33 Pleroma.Constants: Fix typo. 2019-09-30 15:13:05 +02:00
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from MastodonAPIController to MascotController 2019-09-30 19:32:43 +07:00
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController 2019-09-30 19:10:56 +07:00
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
e7aef27c00
Fix merge 2019-09-30 19:10:54 +07:00
lain
a7f22c6e93 Merge remote-tracking branch 'origin/develop' into reactions 2019-09-30 13:58:14 +02:00
lain
b923842e96 Merge remote-tracking branch 'origin/develop' into reactions 2019-09-30 13:57:54 +02:00
kaniini
26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop' 
AP C2S mediaUpload

Closes #1171

See merge request pleroma/pleroma!1706
 2019-09-30 11:21:49 +00:00
kaniini
0e356cc800 Merge branch 'split-masto-api/reports' into 'develop' 
Extract report actions from `MastodonAPIController` to `ReportController`

See merge request pleroma/pleroma!1744
 2019-09-30 11:17:30 +00:00
kaniini
74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop' 
Extract conversation actions from `MastodonAPIController` to ConversationController

See merge request pleroma/pleroma!1743
 2019-09-30 10:49:40 +00:00
Egor Kislitsyn
b7f27a4f58
Extract report actions from MastodonAPIController to ReportController 
Update MastodonAPI.ReportView
 2019-09-30 17:44:10 +07:00
Ariadne Conill
1d7cbdaf7b change new scrobble endpoint 2019-09-30 10:39:48 +00:00
Ariadne Conill
e653edd182 split scrobble functions into their own controller 2019-09-30 10:39:48 +00:00
Ariadne Conill
a6e1469767 router: change scrobble timeline route from now-playing to scrobbles 2019-09-30 10:39:48 +00:00
Ariadne Conill
8b34b221cb common api: add some missing IR bits for listen activities' children 2019-09-30 10:39:48 +00:00
Ariadne Conill
84712c35f9 activitypub: object view: include child object for Listen activities 2019-09-30 10:39:48 +00:00
Ariadne Conill
71eff09e56 common api: make sure the generated IR is actually federatable 2019-09-30 10:39:48 +00:00
Ariadne Conill
7cad6ea67a pleroma api: hook up scrobbler controller 2019-09-30 10:39:17 +00:00
Ariadne Conill
2c82d8603b common api: implement scrobbling 2019-09-30 10:39:17 +00:00
Ariadne Conill
172c74a77b activitypub: transmogrifier: implement support for Listen activities 2019-09-30 10:39:17 +00:00
Ariadne Conill
1f9de2a8cd activitypub: implement IR-level considerations for Listen activities 2019-09-30 10:39:17 +00:00
Ariadne Conill
b7877e9b1c mastodon api: implement rendering of listen activities 2019-09-30 10:39:17 +00:00
Egor Kislitsyn
d4d88b3361
Extract conversation actions from MastodonAPIController to ConversationController 2019-09-30 16:52:07 +07:00
rinpatch
e9d1aa75d5 Revert subscription refactoring. 
As discussed in pleroma-meta#2

This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
 2019-09-29 18:43:27 +03:00
kaniini
6d74a7528c Merge branch 'feature/follow-requests-count' into 'develop' 
Mastodon API: add follow_requests_count

See merge request pleroma/pleroma!1726
 2019-09-29 11:44:31 +00:00
Maksim Pechnikov
1053319cd6 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-28 10:36:04 +03:00
Haelwenn (lanodan) Monnier
9202904da9
status_controller.ex: Posting media status without content defined 2019-09-28 01:53:41 +02:00
rinpatch
374f83d29b Fix not being able to post empty statuses with attachments 
Attachment field was filled in after the empty status check
 2019-09-28 01:58:06 +03:00
minibikini
f9380289eb Add remote_ip plug 2019-09-27 21:59:23 +00:00
kaniini
92d08d4113 Merge branch 'split-masto-api/follow-requests' into 'develop' 
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`

See merge request pleroma/pleroma!1730
 2019-09-27 07:54:54 +00:00
kaniini
68bf99baf2 Merge branch 'split-masto-api/domain-blocks' into 'develop' 
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`

See merge request pleroma/pleroma!1729
 2019-09-27 07:54:08 +00:00
kaniini
27a3221d57 Merge branch 'split-masto-api/scheduled-statuses' into 'develop' 
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`

See merge request pleroma/pleroma!1728
 2019-09-27 07:53:22 +00:00
Egor Kislitsyn
408750b94e Extract domain blocks actions from MastodonAPIController to DomainBlockController 2019-09-27 14:28:05 +07:00
Egor Kislitsyn
99c5a35890 Extract follow requests actions from MastodonAPIController to FollowRequestController 2019-09-27 14:25:17 +07:00
Egor Kislitsyn
8d31530119 Cleanup ScheduledActivityView 2019-09-27 13:36:28 +07:00
Egor Kislitsyn
0a5b106ddd Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController 2019-09-27 13:36:28 +07:00
Egor Kislitsyn
621377f378 Extract filter actions from MastodonAPIController to FilterController 2019-09-27 13:06:25 +07:00
Egor Kislitsyn
6c7c35dbe1 Fix SubscriptionNotificationView 2019-09-27 11:55:47 +07:00
kaniini
91e2bcf218 Merge branch 'refactor/status-controller' into 'develop' 
Extract status actions from `MastodonAPIController` to `StatusController`

See merge request pleroma/pleroma!1719
 2019-09-27 04:37:48 +00:00
Ariadne Conill
14294243a2 mastodon api: implement follow_requests_count 2019-09-27 04:22:40 +00:00
Egor Kislitsyn
5ea5c58a85 Move view logic from StatusController.context to StatusView and add a test 2019-09-27 10:52:47 +07:00
kaniini
eb9aa7aa10 Merge branch 'refactor/subscription' into 'develop' 
Refactor subscription functionality

Closes #1130

See merge request pleroma/pleroma!1664
 2019-09-27 03:51:24 +00:00
Egor Kislitsyn
98d1347a4e Extract status actions from MastodonAPIController into StatusController 2019-09-27 10:51:15 +07:00
kaniini
219771288c Merge branch 'refactor/common_api' into 'develop' 
Refactor `CommonAPI.post/2`

See merge request pleroma/pleroma!1713
 2019-09-27 03:46:02 +00:00
kaniini
dc0fdb5e84 Merge branch 'refactor/timeline-controller' into 'develop' 
Extract timeline actions from `MastodonAPIController` into `TimelineController`

See merge request pleroma/pleroma!1648
 2019-09-27 03:42:30 +00:00
Maksim Pechnikov
73ae38ca04 add deprecated tag 2019-09-26 21:08:04 +03:00
Maksim Pechnikov
b4fc96f640 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-26 20:56:59 +03:00
Maxim Filippov
e7836adf21 Merge branch 'develop' into feature/moderation-log-filters 2019-09-26 19:01:54 +03:00
Maksim Pechnikov
3d722dc200 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-26 16:16:30 +03:00
Egor Kislitsyn
75290cbfbd Add Pleroma.JobQueueMonitor 2019-09-26 18:49:57 +07:00
Roman Chvanikov
b4b147000c Merge develop 2019-09-26 10:38:54 +03:00
Egor Kislitsyn
3572cf29b7 Extract timeline actions from MastodonAPIController into TimelineController 2019-09-26 10:53:42 +07:00
Egor Kislitsyn
c57ad0a402 Cleanup CommonAPI 2019-09-26 10:33:13 +07:00
Egor Kislitsyn
de3e90e536 Add ActivityDraft.with_valid/2 2019-09-26 10:29:34 +07:00
Egor Kislitsyn
eed774d058 Add CommonAPI.ActivityDraft 2019-09-26 10:29:34 +07:00
kaniini
6abe12dced Merge branch 'refactor/notification-controller' into 'develop' 
Extract notification actions from `MastodonAPIController` into `NotificationController`

See merge request pleroma/pleroma!1646
 2019-09-26 03:13:22 +00:00
kaniini
a39e065916 Merge branch 'feature/return-link-for-password-reset' into 'develop' 
Admin API: Return link alongside with token on password reset

See merge request pleroma/pleroma!1691
 2019-09-26 03:12:03 +00:00
kaniini
48a82c4609 Merge branch 'refactor/user' into 'develop' 
Simplify updating user's `info`

See merge request pleroma/pleroma!1712
 2019-09-26 03:00:38 +00:00
Hakaba Hitoyo
5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context" 
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
 2019-09-26 02:57:41 +00:00
kaniini
3ff57f1fd3 Merge branch 'hex-flake-id' into 'develop' 
Replace `Pleroma.FlakeId` with `flake_id` hex package

See merge request pleroma/pleroma!1692
 2019-09-26 02:51:54 +00:00
kaniini
beabc49e35 Merge branch 'feature/activities-pagination-by-offset' into 'develop' 
Allow activities pagination via limit/offset

See merge request pleroma/pleroma!1714
 2019-09-26 02:49:45 +00:00
kaniini
1b9cd4c866 Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop' 
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern

See merge request pleroma/pleroma!1716
 2019-09-26 00:03:47 +00:00
rinpatch
f92d7d52c2 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex 2019-09-25 13:38:45 +00:00
rinpatch
f2880d7d29 Credo considered harmful 2019-09-25 16:36:46 +03:00
rinpatch
c7d8ccd0c4 Remove useless with clause 2019-09-25 16:26:47 +03:00