Beefox/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
8143 commits 19 branches 57 tags 305 MiB
Commit graph

5178 commits

Author SHA1 Message Date
Ivan Tashkinov
40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests. 2019-12-06 20:33:47 +03:00
rinpatch
6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop' 
Feature/1455 chat character limit

Closes #1455

See merge request pleroma/pleroma!2034
 2019-12-06 15:36:30 +00:00
Ivan Tashkinov
93a80ee915 [#1427] Bugfix for enforce_oauth_admin_scope_usage. Admin API documentation entry. 2019-12-06 16:56:23 +03:00
lain
e8cee4d9a0 ActivityPub: For user timelines, respects blocks. 
Unless the timeline belongs to a blocked user.
 2019-12-06 14:25:13 +01:00
Egor Kislitsyn
a75d4a41e0 Add a test for custom runtime modules 2019-12-06 17:05:09 +07:00
Maxim Filippov
08c89fd2b8 Fix incorrect report count 2019-12-06 17:17:24 +09:00
Egor Kislitsyn
e4292cbfad Use Kernel.inspect/2 to print loaded custom modules 2019-12-06 15:16:39 +07:00
Egor Kislitsyn
157bceeda9 Move runtime configuration from :instance to :modules 2019-12-06 15:04:46 +07:00
Maksim Pechnikov
22fc271e23 init tag feed 2019-12-06 09:33:40 +03:00
Ivan Tashkinov
13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes 2019-12-06 00:26:31 +03:00
Ivan Tashkinov
af42c00cff [#1427] Reworked admin scopes support. 
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
 2019-12-06 00:25:44 +03:00
rinpatch
cdff5b8267 Merge branch 'develop' into fix/mrf-delete 2019-12-06 00:12:21 +03:00
rinpatch
9f99640cfc ActivityPub: Fix deletes being exempt from MRF 
Closes #1461
 2019-12-05 21:45:57 +03:00
lain
67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop' 
[#1335] User: refactoring of AP ID fields into relations

Closes #1335

See merge request pleroma/pleroma!1963
 2019-12-05 17:16:23 +00:00
feld
d0bd4348b3 Merge branch 'feature/admin-api-render-whole-status' into 'develop' 
Miscellaneous grouped reports fixes

Closes admin-fe#48 and admin-fe#51

See merge request pleroma/pleroma!2007
 2019-12-05 13:34:34 +00:00
Egor Kislitsyn
1216b546c6 Fix credo warning 2019-12-05 20:29:17 +07:00
Egor Kislitsyn
48ae3c4347 Add support for custom modules 2019-12-05 20:18:25 +07:00
Maksim Pechnikov
3fe7a1fd35 Merge branch 'develop' into issue/1342 2019-12-05 15:46:27 +03:00
Maksim Pechnikov
e21afdb7c7 Merge branch 'develop' into issue/1411 2019-12-05 12:18:59 +03:00
Ivan Tashkinov
d3bce89edd [#1335] Merge issue fix. 2019-12-04 19:41:14 +03:00
Ivan Tashkinov
30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user.ex
 2019-12-04 18:56:31 +03:00
lain
aa97fe8f17 ChatChannel: Ignore messages that are too long. 2019-12-04 12:48:34 +01:00
Egor Kislitsyn
05fb8d0084 Fix Pleroma.FollowingRelationship.move_following/2 2019-12-03 22:31:12 +07:00
Maxim Filippov
4b60d41db9 Add report notes 2019-12-04 00:26:37 +09:00
Egor Kislitsyn
624e720aa4 Add with_move query param to the notifications API 2019-12-03 22:13:38 +07:00
lain
7722e5a67a Merge branch 'feature/move-activity' into 'develop' 
Support "Move" activity

Closes #1316

See merge request pleroma/pleroma!1883
 2019-12-02 16:26:19 +00:00
Egor Kislitsyn
356a936ecb Fix mix pleroma.user list task 2019-12-02 18:11:45 +07:00
Egor Kislitsyn
cf52106e05
Update Floki dependency 2019-12-02 13:38:35 +07:00
Maksim Pechnikov
88f7cf51d4 Merge branch 'develop' into issue/1411 2019-12-01 16:18:16 +03:00
rinpatch
0d24ab04c5 Merge branch 'remove-info-from-users' into 'develop' 
Removed users.info field

See merge request pleroma/pleroma!2006
 2019-11-30 10:42:51 +00:00
kPherox
0326683932
hide follower/following for friendica 2019-11-30 15:43:05 +09:00
Ivan Tashkinov
51111e286b [#1427] Initial support for OAuth admin scopes. 2019-11-29 18:57:19 +03:00
Egor Kislitsyn
a98cda7758
Fix Pleroma.HTML.extract_first_external_url/2 2019-11-29 15:49:35 +07:00
Ivan Tashkinov
52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	mix.lock
 2019-11-29 10:17:59 +03:00
Maksim Pechnikov
a36607c27e add mix task to set\unset privacy option of notification 2019-11-28 22:13:28 +03:00
Maksim Pechnikov
04a8ffbe84 added privacy option to push notifications 2019-11-28 22:13:11 +03:00
Maksim Pechnikov
a52da55eb9 added User.NotificationSetting struct 2019-11-28 22:08:30 +03:00
Sadposter
c7cc80a9ee obligatory format commit 2019-11-28 10:40:50 +00:00
Sadposter
fa97eddf8a make follows take precedence over domain blocks 2019-11-28 10:38:38 +00:00
Maxim Filippov
fcabcab443 Fetch account from report, not from status (it might be deleted) 2019-11-28 00:09:00 +09:00
Maxim Filippov
5135656f57 Handle reopened reports with deleted statuses 2019-11-27 22:54:12 +09:00
lain
50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count 2019-11-27 14:48:28 +01:00
lain
f36724efb1 User: Never return nil for user follower counts. 2019-11-27 14:13:36 +01:00
Egor Kislitsyn
f595cfe623
Remove User.user_info/2 2019-11-27 19:43:47 +07:00
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification 2019-11-27 17:52:02 +07:00
Egor Kislitsyn
4af69f047d
Remove account field from web push payload 2019-11-27 02:32:55 +07:00
Egor Kislitsyn
80ededc04f
Add direct_conversation_id to web push payload 2019-11-26 19:53:43 +07:00
Ivan Tashkinov
c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
 2019-11-26 10:42:36 +03:00
Maxim Filippov
b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status 2019-11-26 00:25:43 +09:00
lain
dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop' 
Disable rendering AP representation for remote users and objects

See merge request pleroma/pleroma!2010
 2019-11-25 15:23:45 +00:00
Maxim Filippov
b3b4e5ca80 AdminAPI: Grouped reports old/new fix 
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
 2019-11-26 00:20:46 +09:00
Maxim Filippov
1364d303f8 AdminAPI: Fix grouped reports for closed/resolved reports 2019-11-26 00:13:11 +09:00
rinpatch
4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead 2019-11-25 17:55:17 +03:00
rinpatch
02f7383891 ActivityPub controller: do not render remote users 2019-11-25 17:19:33 +03:00
feld
5f981178d0 Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' 
Admin API: list all statuses from a given instance

See merge request pleroma/pleroma!1981
 2019-11-25 13:29:53 +00:00
feld
9374b52756 Merge branch 'fix/update-reports-old-format' into 'develop' 
Admin API: Fix error when trying to update reports in the "old" format

See merge request pleroma/pleroma!1986
 2019-11-25 13:29:22 +00:00
Sadposter
d3656c2725 add ability to set a custom user-agent string 2019-11-25 09:53:11 +00:00
Maxim Filippov
82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-25 01:46:18 +09:00
Maxim Filippov
fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-25 01:43:11 +09:00
Maxim Filippov
40059c9b1e Typo 2019-11-25 00:05:52 +09:00
Maxim Filippov
2b341627da Admin API: Render whole status in grouped reports 2019-11-25 00:04:29 +09:00
rinpatch
9f29930440 fetcher: move local object checking into a reusable function 2019-11-23 22:55:41 +03:00
Ivan Tashkinov
1636cc5b7e Removed users.info and remaining usages. 2019-11-23 14:06:19 +03:00
lain
bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' 
AdminAPI: Confirm user account, resend confirmation email

See merge request pleroma/pleroma!1994
 2019-11-22 15:39:19 +00:00
Maxim Filippov
b64c7b35d4 Swap map with each 2019-11-22 09:11:36 +09:00
rinpatch
c2ad9fd5f9 Merge branch 'list-users' into 'develop' 
Add CLI list users command

See merge request pleroma/pleroma!1990
 2019-11-21 20:33:11 +00:00
Alex Schroeder
fbc379d689 Add CLI list users command 2019-11-21 21:07:06 +01:00
lain
19b727bf8f Merge branch 'fix/mix-task-logging' into 'develop' 
Allow mix tasks to always run with debug logging

See merge request pleroma/pleroma!1997
 2019-11-21 15:04:19 +00:00
Ivan Tashkinov
cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs
 2019-11-21 16:47:52 +03:00
lain
8feb5dcb42 Merge branch 'issue/1348' into 'develop' 
[#1348] excluded invisible actors from gets  /api/v1/accounts/:id

See merge request pleroma/pleroma!1937
 2019-11-21 13:13:14 +00:00
lain
320690f7a5 Object: Use inspect to log missing preload. 2019-11-21 14:03:01 +01:00
Egor Kislitsyn
d38ab4bb89
Fix user.following_count 2019-11-21 16:31:13 +07:00
Mark Felder
edaae845af Some tasks try to set log level in test environment, but we were stripping logs belog :warn. 
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
 2019-11-20 11:55:30 -06:00
Ivan Tashkinov
de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality. 2019-11-20 15:46:11 +03:00
Ivan Tashkinov
555edd01ab [#1335] User AP ID relations fetching performance optimizations. 2019-11-20 12:19:07 +03:00
Mark Felder
ff9133b978 Allow mix tasks to always run with debug logging 2019-11-19 16:01:17 -06:00
Ivan Tashkinov
565f261338 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-19 23:22:47 +03:00
Ivan Tashkinov
ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring. 2019-11-19 23:22:10 +03:00
Maksim Pechnikov
708fd234bd fix order favorites activites 2019-11-19 20:19:41 +03:00
Maxim Filippov
46eb160135 AdminAPI: Confirm user account, resend confirmation email 2019-11-19 20:14:02 +09:00
Egor Kislitsyn
36686f5245
Support authentication via x-admin-token HTTP header 2019-11-19 15:58:20 +07:00
Maksim Pechnikov
5cee51fac5 fix order by for fetch_favorites 2019-11-18 21:34:54 +03:00
Ivan Tashkinov
3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-18 20:43:19 +03:00
Ivan Tashkinov
aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum. 2019-11-18 20:38:56 +03:00
Maksim Pechnikov
0937895182 updated fetch_favorites 2019-11-18 16:56:47 +03:00
Maksim Pechnikov
9da4c88b49 fix test 2019-11-18 10:00:48 +03:00
Maksim Pechnikov
4beb3ce5c5 /api/v1/favourites: added sorting for activites by adds to favorites 2019-11-18 09:44:08 +03:00
Maxim Filippov
c506cc48ef Admin API: Error when trying to update reports in the "old" format 2019-11-16 18:44:48 +09:00
kaniini
81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop' 
Add fieldsLimit to metadata of nodeinfo

See merge request pleroma/pleroma!1983
 2019-11-15 20:29:38 +00:00
Ivan Tashkinov
01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-15 21:40:14 +03:00
Ivan Tashkinov
c31ddce51e [#1335] Reorganized users.mutes as relation to UserMute entity. 2019-11-15 21:38:54 +03:00
rinpatch
22554ac5ca Merge branch 'bugfix/1395-email-activation' into 'develop' 
Bugfix/1395 email activation

Closes #1395

See merge request pleroma/pleroma!1965
 2019-11-15 14:11:48 +00:00
lain
f17e0f8e4f OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug 2019-11-15 14:13:21 +01:00
kPherox
72d2557e11 Add fieldsLimit to metadata of nodeinfo 2019-11-15 18:52:31 +09:00
Ariadne Conill
eecd64cc07 object age policy: remove debug logging 2019-11-14 19:56:14 -06:00
Ariadne Conill
5705cf0e3e MRF: add ObjectAgePolicy which deals with old posts being imported 2019-11-14 19:48:10 -06:00
Maxim Filippov
114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-14 23:45:29 +09:00
Maxim Filippov
30af5da330 Admin API: list all statuses from a given instance 2019-11-14 23:44:07 +09:00
rinpatch
09b4f7269e Merge branch 'fix/conversations-rendering' into 'develop' 
Fix rendering conversations when there's a malformed status

Closes #1401

See merge request pleroma/pleroma!1973
 2019-11-14 14:40:37 +00:00
rinpatch
94f1cfced8 format the code 2019-11-14 17:26:59 +03:00
feld
1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' 
Admin API: Grouped reports, update multiple reports in one query

Closes admin-fe#43

See merge request pleroma/pleroma!1815
 2019-11-14 13:35:41 +00:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity 2019-11-14 16:39:45 +07:00
rinpatch
6085c71bd1 Merge branch 'reactions' into 'develop' 
Emoji Reactions

See merge request pleroma/pleroma!1662
 2019-11-14 08:47:10 +00:00
Phil Hagelberg
3c60adbc1f Support redirecting by activity UUID in static FE as well. 2019-11-13 08:22:11 -08:00
Phil Hagelberg
0867cb083e Support redirecting by object ID in static FE. 
This matches the behavior of pleroma-fe better.

Fixes #1412.
 2019-11-13 08:02:02 -08:00
lain
facc37aaa6 Merge branch 'static-remote-redirect' into 'develop' 
For remote notices, redirect to the original instead of 404 in static-fe

See merge request pleroma/pleroma!1974
 2019-11-13 10:16:00 +00:00
Phil Hagelberg
62f3a93049 For remote notices, redirect to the original instead of 404. 
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.

This new redirecting behavior should improve that situation.
 2019-11-12 09:40:29 -08:00
Egor Kislitsyn
768c1a5de1
Fix tests 2019-11-12 19:13:19 +07:00
Egor Kislitsyn
27cd1374e3
Add a notification for Move activities 2019-11-12 18:48:14 +07:00
Egor Kislitsyn
e6d7e27bd6
Add allow_following_move setting to User 2019-11-12 18:45:28 +07:00
lain
e835cd97f6 Containment: Add a catch-all clause to contain_origin. 2019-11-12 12:07:17 +01:00
Mark Felder
7d101bc9c5 Fix rendering conversations when there's a malformed status 2019-11-11 18:29:55 -06:00
eugenijm
f86a7d5d8b Fix exclude_visibilities filter for followers-only Like notifications 2019-11-11 23:57:30 +03: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
Ivan Tashkinov
5cf2c7422b [#1335] Applied code review suggestions. 2019-11-11 14:16:57 +03:00
Maxim Filippov
46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-11 19:18:12 +09:00
Maxim Filippov
31343e4321 Code style fixes 2019-11-11 19:06:09 +09:00
Alexander
6a4201e0b4
fix for migrate task 2019-11-10 22:54:37 +03:00
Ivan Tashkinov
3db988250b [#1335] User: refactored :blocks field into :blocked_users relation. 
Introduced UserBlock.
 2019-11-10 16:30:21 +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
3cc49cdb78 Formatter moved to new module. 2019-11-09 18:30:23 -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
4729027f91 Prevent non-local notices from rendering. 2019-11-09 18:08:45 -08:00
Phil Hagelberg
886a07ba57 Move static_fe config to its own section instead of in :instance. 2019-11-09 18:08:45 -08:00
Phil Hagelberg
b0080fa730 Render errors in HTML, not with JS. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
e27c61218d Expand subject content automatically when config is set. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
bfd5d79826 Include metadata in static FE conversations and profiles. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
828259fb65 Catch 404s. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
df2f59be91 Pagination for user profiles. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
8969c5522d Make many of the improvements suggested in review. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
e8bee35578 Static FE plug should only respond to text/html requests. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
dc3b87d153 Move static FE routing into its own plug. 
Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place.
 2019-11-09 18:08:08 -08:00
Phil Hagelberg
c6c706161e Make sure notice link is remote if the post is remote. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
274cc18e8a Visually separate header. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
2ac1ece652 Fix a bug where reblogs were displayed under the wrong user. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
5d7c44266b Change date formatting. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
1dc785b74b Move static-fe CSS to a separate file. 2019-11-09 18:07:50 -08:00
Phil Hagelberg
e4b9784c39 Show counts for replies, likes, and announces for selected notice. 
Using text instead of an icon, for now.
 2019-11-09 18:07:50 -08:00
Phil Hagelberg
93e9c0cedf Format dates using CommonAPI utils. 2019-11-09 18:07:50 -08:00
Phil Hagelberg
918e1353f6 Add header to profile/notice pages linking to pleroma-fe. 2019-11-09 18:07:50 -08:00
Phil Hagelberg
33a26b61c3 Remove activity/user representer; move logic to controller. 2019-11-09 18:07:50 -08:00
Phil Hagelberg
41fde63def Get rid of @data in views and use separate fields. 2019-11-09 18:07:50 -08:00
Phil Hagelberg
e944a2213d Use gettext for sensitive media warning. 2019-11-09 18:07:50 -08:00
Phil Hagelberg
2d1897e8a7 Apply all suggested changes from reviewers. 2019-11-09 18:07:50 -08:00
Phil Hagelberg
cc1b07132f Notices should show entire thread from context. 2019-11-09 18:07:08 -08:00
Phil Hagelberg
748d800acb Show images, video, and audio attachments to notices. 2019-11-09 18:07:08 -08:00
Phil Hagelberg
1d8950798c Fix activity_representer to work with User.get_or_fetch returning tuple. 2019-11-09 18:06:51 -08:00
Phil Hagelberg
0cf04e1088 Fix OStatus controller to know about StaticFEController. 
But only when it's configured to be on.
 2019-11-09 18:06:51 -08:00
Phil Hagelberg
e79d8985ab Don't show 404 in static-fe controller unless it's actually not found. 2019-11-09 18:06:51 -08:00
Phil Hagelberg
c1fc139986 Add permalinks to the static-fe notice rendering. 2019-11-09 18:06:51 -08:00
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
rinpatch
fd6d05dc45 Merge branch 'mix-emoji-task-pack-json' into 'develop' 
For pleroma.emoji downloaded packs, generate pack.json instead

See merge request pleroma/pleroma!1748
 2019-10-19 08:51:03 +00: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