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

2269 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile 2019-03-02 05:36:48 +01:00
Haelwenn (lanodan) Monnier
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response 2019-03-02 04:04:16 +01:00
Maxim Filippov
f635b675b2 Refactor a little bit 2019-03-01 21:17:23 +03:00
Maxim Filippov
f1a4c3163b Show current user in users list as well 2019-03-01 20:23:03 +03:00
Maxim Filippov
5b08b470f6 Add "local" params to users search 2019-03-01 20:13:02 +03:00
William Pitcock
689b0730f8 activitypub: fix date header format 
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
 2019-03-01 12:22:45 +00:00
lambda
2f00814475 Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop' 
Bugfix #236 Prefer user look-up by nickname

See merge request pleroma/pleroma!860
 2019-03-01 09:48:24 +00:00
rinpatch
1341ee650e [#675] Do not show DMs in mentions timeline 2019-03-01 09:37:29 +03:00
William Pitcock
28b4093233 mastodon websocket: return errors using ok, not stop 2019-02-28 16:23:55 +00:00
William Pitcock
388a3f4ca2 mastodon websocket: bring back infinity timeout 2019-02-28 16:23:24 +00:00
Maxim Filippov
46f29b9da1 Add search users endpoint 2019-02-28 19:04:47 +03:00
William Pitcock
f1d37a5e23 mastodon websocket: use pattern match to get query data, robustly handle errors 2019-02-28 16:02:48 +00:00
William Pitcock
bc53dff5b6 mastodon api: websocket: update code for cowboy 2.x 2019-02-28 15:44:12 +00:00
Maxim Filippov
72b7a0797e Use Mastodon API views in Admin API 2019-02-28 17:43:09 +03:00
href
a47cc5a2cf Merge branch 'customizable_auth' into 'develop' 
Authenticator tweaks

See merge request pleroma/pleroma!875
 2019-02-28 11:18:01 +00:00
Ivan Tashkinov
3281a3f074 Renamed *DatabaseAuthenticator to *Authenticator. 2019-02-28 14:12:41 +03:00
Ivan Tashkinov
4e77f68414 Added auth_template/0 to DatabaseAuthenticator. 2019-02-28 13:58:58 +03:00
kaniini
cf426a719d Merge branch 'with-mutes' into 'develop' 
Add `with_muted` param.

Closes #683

See merge request pleroma/pleroma!872
 2019-02-28 10:22:19 +00:00
href
90a24fbf95 Merge branch 'customizable_auth' into 'develop' 
Auth customization support

See merge request pleroma/pleroma!852
 2019-02-28 10:12:26 +00:00
kaniini
3c849d0438 Merge branch 'deactivated-in-user-view' into 'develop' 
Add activation status to the regular user view

See merge request pleroma/pleroma!874
 2019-02-28 10:08:31 +00:00
Ivan Tashkinov
b6f915313f Made auth customization be runtime-configurable. 2019-02-28 13:00:54 +03:00
eugenijm
6b11011039 Added deactivated to the user view 2019-02-28 09:08:34 +03:00
Maxim Filippov
2883f75a3a Add pagination to users admin API 2019-02-28 01:11:56 +03:00
lain
bbbdbec4fd Remove parts of the old activity view. 
Not used anymore.
 2019-02-27 17:24:51 +01:00
lain
9ade1242c2 Add user muted status info to twitterapi. 2019-02-27 16:52:03 +01:00
lain
c1ae495878 Add user muted status info to MastodonAPI. 2019-02-27 16:46:47 +01:00
lain
c4235f96bd Add with_muted param. 2019-02-27 16:37:42 +01:00
William Pitcock
1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience 2019-02-27 13:01:10 +00:00
Egor Kislitsyn
5d961d536c fix formatter 2019-02-27 15:40:30 +07:00
Egor
c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
Maxim Filippov
90d0d055fc Add more admin actions 2019-02-27 00:13:38 +03:00
Ivan Tashkinov
e98d34e5fb Added missing copyright headers. 2019-02-26 16:26:54 +03:00
Ivan Tashkinov
fd46edb473 Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth 2019-02-26 15:29:43 +03:00
Ivan Tashkinov
e82b70eb53 Database authenticator behaviour / Pleroma implementation refactoring. 2019-02-26 15:27:01 +03:00
William Pitcock
fc9d895ebc twitter card: remove IO.inspect() spam 2019-02-24 18:56:44 +00:00
11backslashes
efa506b874 delegate user retrieval to the User module 2019-02-24 13:23:47 -05:00
lain
9e0686efa6 Move visibility into own module. 2019-02-22 13:29:52 +01:00
lain
62296f5a25 Fix private post card handling. 2019-02-22 12:02:51 +01:00
Ivan Tashkinov
afddce45b3 Minor setting name adjustment (:app_template -> :app_layout). 2019-02-22 11:10:17 +03:00
kaniini
5a4e2905fe Merge branch 'fix/twittercards' into 'develop' 
Fix Twitter Cards

See merge request pleroma/pleroma!815
 2019-02-22 04:38:14 +00:00
KZ
7c722c08f5 Fix: Fixing an outbox related bug when local user activity is empty 2019-02-22 04:37:48 +00:00
Ivan Tashkinov
1097ce6d9f Auth customization support. 
OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.
 2019-02-21 18:55:19 +03:00
lambda
2813f28b6f Merge branch 'bugfix/httpsig-sign-date' into 'develop' 
activitypub: sign date header

Closes #649 and #364

See merge request pleroma/pleroma!847
 2019-02-21 08:20:06 +00:00
William Pitcock
f8a72f2997 activitypub: sign http date header 2019-02-21 00:23:17 +00:00
William Pitcock
1803d9a022 fix fetching AP objects with application/json 2019-02-20 20:45:40 +00:00
William Pitcock
22e2ed235d logging: only return ISE reasons in API responses when in dev or test mode 2019-02-20 17:36:47 +00:00
William Pitcock
8b08096436 logging: improve visibility into ISE errors 2019-02-20 17:14:18 +00:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
lain
59c27f29c8 Add some nicer urls in status view. 2019-02-20 17:36:16 +01:00
Ivan Tashkinov
b574d97c2e [#468] Added support for push OAuth scope (Mastodon 2.4+). 2019-02-20 17:27:41 +03:00
Ivan Tashkinov
6fe7acd58e [#468] Merged upstream/develop. 2019-02-20 16:48:59 +03:00
lambda
11b3c10c54 Merge branch 'muting' into 'develop' 
Implement muting, add it to the whole mastodon API

See merge request pleroma/pleroma!319
 2019-02-20 13:19:37 +00:00
Ivan Tashkinov
3ad91ec3c1 [#468] Adjusted scope restriction for MastodonAPIController#index. 2019-02-20 14:05:02 +03:00
Ekaterina Vaartis
5a46d37af9 Update the mute implementation to the current codebase 
Make it part of the info thing (and do a migration to ensure it's there)
 2019-02-19 23:09:16 +03:00
Ekaterina Vaartis
da64ea4a55 Implement mastodon mutes endpoint 
Aparently i forgot to add it, it gets a list of muted users
 2019-02-19 21:49:55 +03:00
Ekaterina Vaartis
f41f017bbc Implement muting, add it to the mastodon API 2019-02-19 21:49:55 +03:00
href
f4bfc628ca
Player: allow styles on CSP, loop videos 2019-02-19 18:56:57 +01:00
href
aa9af1d639
CSP: Allow iframes on embed player 2019-02-19 18:19:13 +01:00
Mark Felder
2d21ea1a0e Merge branch 'develop' into fix/twittercards 2019-02-19 16:58:28 +00:00
href
10a11f083c
Embed player suitable for Twitter Cards 2019-02-19 17:47:48 +01:00
eugenijm
25b9e7a8c3 Added admin API for changing user activation status 2019-02-19 19:37:02 +03:00
Ivan Tashkinov
c0ecbf6669 [#468] Merged upstream/develop. 2019-02-19 19:10:55 +03:00
lambda
f25a3f4f78 Merge branch 'fix/check-follower-collection-in-is_private' into 'develop' 
properly check for follower address in is_private?

See merge request pleroma/pleroma!841
 2019-02-19 14:08:19 +00:00
rinpatch
96dcacade1 properly check for follower address in is_private? 2019-02-19 13:23:13 +03:00
kaniini
833161b5d2 Merge branch 'feature/jobs' into 'develop' 
Job Queue

See merge request pleroma/pleroma!732
 2019-02-18 19:43:06 +00:00
kaniini
a39a094cda Merge branch 'patch-image-description' into 'develop' 
Patch to support image descriptions for pleroma-fe

See merge request pleroma/pleroma!626
 2019-02-18 04:11:46 +00:00
kaniini
7456338ed3 Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop' 
Add OAuth tokens endpoint

See merge request pleroma/pleroma!805
 2019-02-18 04:02:41 +00:00
kaniini
c23bd05737 Merge branch 'features/flavour-switching' into 'develop' 
[MastoAPI] Add switching of frontend flavours

See merge request pleroma/pleroma!807
 2019-02-18 04:01:51 +00:00
kaniini
cd019a5927 Merge branch 'follow-request-count' into 'develop' 
Follow request count

See merge request pleroma/pleroma!817
 2019-02-18 04:01:26 +00:00
kaniini
3f38a05571 Merge branch 'csv-export' into 'develop' 
Add option to return all friends in twitter api.

Closes #602

See merge request pleroma/pleroma!833
 2019-02-18 03:59:46 +00:00
Maxim Filippov
94708d6370 Render only "id", "valid_until" and "app_name" in TokenView 2019-02-17 23:57:35 +03:00
lambda
f26582aae9 Merge branch 'mastoapi-stop-capping-attachments' into 'develop' 
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon

See merge request pleroma/pleroma!834
 2019-02-17 17:37:48 +00:00
Ivan Tashkinov
d3fe2c8ec6 [#468] Formatting fix. 2019-02-17 14:07:35 +03:00
Ivan Tashkinov
bc4f77b10b [#468] Merged upstream/develop, resolved conflicts. 2019-02-17 14:07:04 +03:00
Ivan Tashkinov
dcf24a3233 [#468] Refactored OAuth scopes' defaults & missing selection handling. 2019-02-17 13:49:14 +03:00
rinpatch
8f98d970c1 Fix recipient count in hellthread policy 2019-02-17 13:46:40 +03:00
Haelwenn (lanodan) Monnier
4df455f69b
[MastoAPI] Add switching of frontend flavours 2019-02-16 19:50:13 +01:00
rinpatch
96c725328b Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon 2019-02-16 20:38:25 +03:00
lain
38e15930cb Add option to return all friends in twitter api. 
Mainly useful for user export.
 2019-02-16 17:01:15 +01:00
Ivan Tashkinov
2a4a4f3342 [#468] Defined OAuth restrictions for all applicable routes. 
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
 2019-02-15 19:54:37 +03:00
lambda
1ce1b7b58d Merge branch 'bugfix/oauth-token-padding' into 'develop' 
oauth: never use base64 padding when returning tokens to applications

See merge request pleroma/pleroma!825
 2019-02-15 14:58:13 +00:00
rinpatch
921571c19b Merge branch 'hellthread-filter-fix' into 'develop' 
Hellthread filter fix

Closes #634

See merge request pleroma/pleroma!831
 2019-02-15 13:18:35 +00:00
Karen Konou
c2e0a0c8d4 Readd threshold is not 0 check, optmization? 2019-02-15 14:05:20 +01:00
Karen Konou
dca6bee2f7 Rename test, add check for follower collection when delisting 2019-02-15 13:43:14 +01:00
rinpatch
b63a5e309d Merge branch 'bugfix/actor-containment' into 'develop' 
activitypub: correctly handle bare URIs in user lookup

Closes #645

See merge request pleroma/pleroma!829
 2019-02-15 12:27:03 +00:00
Karen Konou
d943c90249 Add tests, change default config values, fix a bug 2019-02-15 12:47:50 +01:00
eugenijm
ecdf0657ba Add logic for keeping follow_request_count up-to-date on the follow, 
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
 2019-02-15 12:20:20 +03:00
lambda
ea2698beb7 Merge branch 'bugfix/activitypub-reserialization' into 'develop' 
activitypub transmogrifier: fix reserialization edge cases

See merge request pleroma/pleroma!826
 2019-02-14 19:54:16 +00:00
William Pitcock
56862f4ce1 activitypub: clean up logging statements a little 2019-02-14 19:42:33 +00:00
Wim Vanderbauwhede
04b1c13554 Merge remote-tracking branch 'upstream/develop' into patch-image-description 2019-02-14 16:41:40 +00:00
Ivan Tashkinov
027adbc9e5 [#468] Refactored OAuth scopes parsing / defaults handling. 2019-02-14 17:03:19 +03:00
Egor Kislitsyn
3f32d7b937 Fix queue name 2019-02-14 17:02:47 +07:00
Egor Kislitsyn
907306174b fix S3 links encoding in Mediaproxy 2019-02-14 15:55:21 +07:00
William Pitcock
72ba5b4ab7 activitypub: user view: formatting 2019-02-14 03:13:07 +00:00
William Pitcock
5307c211b8 activitypub: user view: report totalItems=0 for follows/followers when hidden 2019-02-14 03:10:00 +00:00
William Pitcock
6542b86292 activitypub: user view: remove totalItems from user outbox 
(this is based on a counter in User.Info, but the counter is not reliable.)
 2019-02-14 03:02:45 +00:00
William Pitcock
ee2fa1a314 activitypub: user view: remove totalInbox from user inbox view 
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
 2019-02-14 03:01:39 +00:00
kaniini
bc9e5e6b65 Merge branch 'feature/activitypub-oauth-endpoints' into 'develop' 
ActivityPub C2S oauth endpoints

See merge request pleroma/pleroma!821
 2019-02-14 02:50:06 +00:00
William Pitcock
64620d8980 activitypub: user view: do not expose oAuth endpoints for instance users 2019-02-14 02:41:21 +00:00
William Pitcock
e9ef4b8da6 oauth: never use base64 padding when returning tokens to applications 
The normal Base64 alphabet uses the equals sign (=) as a padding character.  Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.
 2019-02-14 01:10:04 +00:00