limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
3861 commits 27 branches 107 tags 315 MiB
Commit graph

3861 commits

This branch
This branch
All branches
Author SHA1 Message Date
rinpatch
96dcacade1 properly check for follower address in is_private? 2019-02-19 13:23:13 +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
William Pitcock
32b1649434 test: user: add a test for whether user search returns a user or not 2019-02-14 20:05:08 +00:00
William Pitcock
da44cdd381 user: search: use get_or_fetch() instead of get_or_fetch_by_nickname() 
get_or_fetch() handles the nickname verses URI differences transparently.
 2019-02-14 20:00:04 +00: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
href
1d17082ab2 Merge branch 'fix/mediaproxy-s3' into 'develop' 
Fix S3 links encoding in Mediaproxy

Closes #580

See merge request pleroma/pleroma!828
 2019-02-14 10:10:13 +00:00
Egor Kislitsyn
907306174b fix S3 links encoding in Mediaproxy 2019-02-14 15:55:21 +07:00
kaniini
19756d68f2 Merge branch 'fix/credo-issues-test' into 'develop' 
Fix credo issues in ./test

See merge request pleroma/pleroma!808
 2019-02-14 03:55:26 +00:00
Haelwenn
6652389e80 Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop' 
activitypub: user inbox/outbox: `totalItems` removal

See merge request pleroma/pleroma!827
 2019-02-14 03:40:33 +00:00
William Pitcock
e031cc6473 tests: update tests for totalItems leak fix 2019-02-14 03:22:54 +00: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
William Pitcock
889ad95a2a tests: add some reserialization tests based on IR differences 2019-02-14 00:59:18 +00:00
William Pitcock
e05bf2940f activitypub: transmogrifier: correctly handle nil inReplyTo value 2019-02-14 00:35:54 +00:00
William Pitcock
94cbbb0e3a activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects 2019-02-14 00:35:53 +00:00
kaniini
1ef4741861 Merge branch 'feature/better-login-errors' into 'develop' 
Improve login error for OAuth flow

See merge request pleroma/pleroma!824
 2019-02-13 23:42:11 +00:00
Mark Felder
f62c1d6266 Improve login error for OAuth flow 2019-02-13 22:33:22 +00:00
William Pitcock
d54c483964 tests: add tests for endpoints 2019-02-13 19:48:24 +00:00
William Pitcock
9bd6ed975e activitypub: user view: use route helpers instead of hardcoded URIs 2019-02-13 19:34:43 +00:00
William Pitcock
29e946ace4 activitypub: user view: add oauthRegistrationEndpoint to user profiles 2019-02-13 19:34:43 +00:00
William Pitcock
db8abd958d activitypub: user view: fix up endpoints rendering 2019-02-13 19:34:43 +00:00
William Pitcock
dd989962e6 litepub schema: add oauthRegistrationEndpoint [ci skip] 2019-02-13 19:34:43 +00:00
William Pitcock
90facd3598 user view: add AP C2S oauth endpoints to local user profiles 2019-02-13 19:34:43 +00:00
Karen Konou
bef9b9cb66 refactored code 2019-02-13 16:23:09 +01:00
Karen Konou
adcdd21f16 Merge branch 'develop' into hellthread-filter-fix 2019-02-13 16:22:14 +01:00
rinpatch
99f955cd9e Merge branch 'mass-follow-fixes' into 'develop' 
User.follow_all: Respect blocks in both directions.

See merge request pleroma/pleroma!823
 2019-02-13 13:04:23 +00:00
lain
88a4de24f9 User.follow_all: Respect blocks in both directions. 2019-02-13 13:52:27 +01:00
kaniini
33f8f3c33a Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop' 
Mark streaming feature for desktop apps in Clients.md

See merge request pleroma/pleroma!818
 2019-02-13 07:51:14 +00:00
Hakaba Hitoyo
16b7c07115 Mark streaming feature for desktop apps in Clients.md 2019-02-13 07:51:14 +00:00
kaniini
4bdb2d44c2 Merge branch 'bugfix/mdii-uploader' into 'develop' 
Bugfix for MDII Uploader

See merge request pleroma/pleroma!822
 2019-02-13 07:32:56 +00:00
hakabahitoyo
b7bc666200 bugfix mdii uploader 2019-02-13 15:46:42 +09:00
Karen Konou
1d727cd069 added checks for public url and follower collections 2019-02-13 00:01:34 +01:00
kaniini
0534463cef Merge branch 'feature/csp_mastofe-dev' into 'develop' 
Add CSP for mastofe development, remove secure-cookies in MIX_ENV=dev

See merge request pleroma/pleroma!820
 2019-02-12 22:41:46 +00:00
Haelwenn (lanodan) Monnier
da4c662af3
Plugs.HTTPSecurityPlug: Add webpacker to connect-src 2019-02-12 22:12:12 +01:00
Haelwenn (lanodan) Monnier
00e8f0b07d
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode 
This is needed to run dev mode mastofe at the same time
 2019-02-12 22:12:11 +01:00
Haelwenn (lanodan) Monnier
71ce564ecc
config/dev.exs: Don’t put secure cookies on dev 2019-02-12 21:50:47 +01:00
Haelwenn
c71b3a1b12 Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop' 
Fix CSP check for 'upgrade-insecure-requests'

See merge request pleroma/pleroma!814
 2019-02-12 02:44:23 +00:00
Haelwenn
e1983fca8d Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop' 
Mark streaming feature for mobile/web apps in Clients.md

See merge request pleroma/pleroma!816

[ci skip]
 2019-02-12 02:35:15 +00:00
Hakaba Hitoyo
84f22d1cb8 Mark streaming feature for mobile/web apps in Clients.md 2019-02-12 02:35:15 +00:00