akkoma
6 years agoReturn "audio" info in mastodon api.
lain [Sun, 25 Mar 2018 15:08:54 +0000 (17:08 +0200)]
Return "audio" info in mastodon api.

6 years agoMerge branch 'feature/oauth-token-password' into 'develop'
lambda [Sun, 25 Mar 2018 13:40:06 +0000 (13:40 +0000)]
Merge branch 'feature/oauth-token-password' into 'develop'

oauth: implement grant_type=password for single-page apps

See merge request pleroma/pleroma!81

6 years agoMerge branch 'bugfix/activitypub-hashtags' into 'develop'
lambda [Sat, 24 Mar 2018 21:49:41 +0000 (21:49 +0000)]
Merge branch 'bugfix/activitypub-hashtags' into 'develop'

activitypub transmogrifier: rewrite incoming hashtags

See merge request pleroma/pleroma!83

6 years agoactivitypub transmogrifier: rewrite incoming hashtags
William Pitcock [Sat, 24 Mar 2018 21:39:37 +0000 (21:39 +0000)]
activitypub transmogrifier: rewrite incoming hashtags

6 years agoFix tests.
lain [Sat, 24 Mar 2018 14:09:09 +0000 (15:09 +0100)]
Fix tests.

6 years agoUnify user fetching.
lain [Sat, 24 Mar 2018 14:02:43 +0000 (15:02 +0100)]
Unify user fetching.

6 years agoFetch the same data from json webfinger as from xml webfinger.
lain [Sat, 24 Mar 2018 13:45:21 +0000 (14:45 +0100)]
Fetch the same data from json webfinger as from xml webfinger.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 24 Mar 2018 10:03:33 +0000 (11:03 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoFix hashtags.
lain [Sat, 24 Mar 2018 10:03:10 +0000 (11:03 +0100)]
Fix hashtags.

6 years agoMerge branch 'fix-star-colour' into 'develop'
lambda [Sat, 24 Mar 2018 08:23:21 +0000 (08:23 +0000)]
Merge branch 'fix-star-colour' into 'develop'

mastofe: remove excess accent colours; fix the always-starred bug

See merge request pleroma/pleroma!80

6 years agooauth: implement grant_type=password for single-page apps
William Pitcock [Fri, 23 Mar 2018 20:50:34 +0000 (20:50 +0000)]
oauth: implement grant_type=password for single-page apps

6 years agomastofe: remove excess accent colours; fix the always-starred bug
Morgan Bazalgette [Fri, 23 Mar 2018 20:33:25 +0000 (21:33 +0100)]
mastofe: remove excess accent colours; fix the always-starred bug

6 years agoStrip html from emoji stuff.
lain [Fri, 23 Mar 2018 18:52:08 +0000 (19:52 +0100)]
Strip html from emoji stuff.

6 years agoFor outgoing objects, fake mastodon style ap id for ostatus.
lain [Fri, 23 Mar 2018 15:07:02 +0000 (16:07 +0100)]
For outgoing objects, fake mastodon style ap id for ostatus.

6 years agoMerge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints
lain [Thu, 22 Mar 2018 11:48:56 +0000 (12:48 +0100)]
Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints

6 years agoClear caches on test.
lain [Thu, 22 Mar 2018 11:44:32 +0000 (12:44 +0100)]
Clear caches on test.

6 years agoFix test.
lain [Thu, 22 Mar 2018 11:37:24 +0000 (12:37 +0100)]
Fix test.

6 years agotests: webfinger: test quering a JSON response for activitypub actor URI
William Pitcock [Wed, 21 Mar 2018 19:23:09 +0000 (19:23 +0000)]
tests: webfinger: test quering a JSON response for activitypub actor URI

6 years agowebfinger: implement json response parsing
William Pitcock [Wed, 21 Mar 2018 18:53:36 +0000 (18:53 +0000)]
webfinger: implement json response parsing

6 years agowebfinger: attempt to fall back if LRDD template cannot be found
William Pitcock [Wed, 21 Mar 2018 18:06:41 +0000 (18:06 +0000)]
webfinger: attempt to fall back if LRDD template cannot be found

6 years agowebfinger: support JSON output
William Pitcock [Wed, 21 Mar 2018 17:58:31 +0000 (17:58 +0000)]
webfinger: support JSON output

6 years agoactivitypub: add outbox endpoint
William Pitcock [Thu, 22 Mar 2018 05:23:05 +0000 (05:23 +0000)]
activitypub: add outbox endpoint

6 years agoactivitypub: add restrict_limit
William Pitcock [Thu, 22 Mar 2018 04:47:18 +0000 (04:47 +0000)]
activitypub: add restrict_limit

6 years agoactivitypub: implement following/followers endpoints
William Pitcock [Wed, 21 Mar 2018 17:23:27 +0000 (17:23 +0000)]
activitypub: implement following/followers endpoints

6 years agoFetch relayed messages from source while we don't have linked data sigs.
lain [Wed, 21 Mar 2018 06:12:14 +0000 (07:12 +0100)]
Fetch relayed messages from source while we don't have linked data sigs.

6 years agoMerge branch 'feld-varnish' into 'develop'
lambda [Tue, 20 Mar 2018 06:00:01 +0000 (06:00 +0000)]
Merge branch 'feld-varnish' into 'develop'

Add example Varnish VCL

See merge request pleroma/pleroma!77

6 years agoMerge branch 'patch-README' into 'develop'
lambda [Tue, 20 Mar 2018 05:58:31 +0000 (05:58 +0000)]
Merge branch 'patch-README' into 'develop'

Update README.md

See merge request pleroma/pleroma!72

6 years agoMerge branch 'feld-mastoweb5000' into 'develop'
lambda [Tue, 20 Mar 2018 05:58:13 +0000 (05:58 +0000)]
Merge branch 'feld-mastoweb5000' into 'develop'

Set max characters for mastoweb compose field to 5000 to match pleroma default

See merge request pleroma/pleroma!74

6 years agoMerge branch 'feld-Logger' into 'develop'
lambda [Tue, 20 Mar 2018 05:57:47 +0000 (05:57 +0000)]
Merge branch 'feld-Logger' into 'develop'

Logging cleanup

See merge request pleroma/pleroma!76

6 years agoClarify vcl_synth is for all 301s we generate
Mark Felder [Tue, 20 Mar 2018 01:28:50 +0000 (01:28 +0000)]
Clarify vcl_synth is for all 301s we generate

6 years agoAdd ability to PURGE the cache
Mark Felder [Tue, 20 Mar 2018 01:24:58 +0000 (01:24 +0000)]
Add ability to PURGE the cache

Someday Pleroma will learn this skill :-)

6 years agoAdd example Varnish VCL
Mark Felder [Tue, 20 Mar 2018 01:12:40 +0000 (01:12 +0000)]
Add example Varnish VCL

6 years agoClarify that this error is about a problem decoding the expected JSON
Mark Felder [Mon, 19 Mar 2018 18:18:52 +0000 (18:18 +0000)]
Clarify that this error is about a problem decoding the expected JSON
payload

6 years agoLRDD, you are special and we love you too
Mark Felder [Mon, 19 Mar 2018 18:05:53 +0000 (18:05 +0000)]
LRDD, you are special and we love you too

6 years agocap again
Mark Felder [Mon, 19 Mar 2018 18:00:02 +0000 (18:00 +0000)]
cap again

6 years agostart with a capital
Mark Felder [Mon, 19 Mar 2018 17:58:45 +0000 (17:58 +0000)]
start with a capital

6 years agoAP again
Mark Felder [Mon, 19 Mar 2018 17:57:58 +0000 (17:57 +0000)]
AP again

6 years agoAP and WebFinger need love here
Mark Felder [Mon, 19 Mar 2018 17:56:49 +0000 (17:56 +0000)]
AP and WebFinger need love here

6 years agoMake XML feel special too
Mark Felder [Mon, 19 Mar 2018 17:51:31 +0000 (17:51 +0000)]
Make XML feel special too

6 years agoThis log message was do do 💩
Mark Felder [Mon, 19 Mar 2018 17:47:51 +0000 (17:47 +0000)]
This log message was do do ðŸ’©

6 years agoAnother WebSub CamelCase
Mark Felder [Mon, 19 Mar 2018 17:46:53 +0000 (17:46 +0000)]
Another WebSub CamelCase

6 years agoCapitalize Atom
Mark Felder [Mon, 19 Mar 2018 17:44:25 +0000 (17:44 +0000)]
Capitalize Atom

6 years agoCamelCase WebSub in log messages
Mark Felder [Mon, 19 Mar 2018 17:41:04 +0000 (17:41 +0000)]
CamelCase WebSub in log messages

6 years agoCapitalize start of log message
Mark Felder [Mon, 19 Mar 2018 17:39:12 +0000 (17:39 +0000)]
Capitalize start of log message

6 years agocapitalize Salmon protocol name
Mark Felder [Mon, 19 Mar 2018 17:38:54 +0000 (17:38 +0000)]
capitalize Salmon protocol name

6 years agoGrammar consistency
Mark Felder [Mon, 19 Mar 2018 17:31:58 +0000 (17:31 +0000)]
Grammar consistency

Most log messages are sentence fragments so make them consistent by
removing periods. Log messages that are expressing urgency with ! or
pending more work with "..." are OK.

6 years agoap -> AP for consistency
Mark Felder [Mon, 19 Mar 2018 17:28:06 +0000 (17:28 +0000)]
ap -> AP for consistency

6 years agoUse connection pools.
lain [Mon, 19 Mar 2018 16:42:09 +0000 (17:42 +0100)]
Use connection pools.

6 years agoOnly fetch if it's http.
lain [Mon, 19 Mar 2018 09:28:28 +0000 (10:28 +0100)]
Only fetch if it's http.

6 years agomastodon api tests: invalidate user cache prior to importing a test reply
William Pitcock [Fri, 16 Mar 2018 05:30:28 +0000 (05:30 +0000)]
mastodon api tests: invalidate user cache prior to importing a test reply

This is needed to ensure the user cache does not throw nil when creating the mentions
list.

Signed-off-by: lain <lain@soykaf.club>
6 years agomastodon api: fix rendering the mentions JSON
William Pitcock [Fri, 16 Mar 2018 05:30:02 +0000 (05:30 +0000)]
mastodon api: fix rendering the mentions JSON

Signed-off-by: lain <lain@soykaf.club>
6 years agoSet max characters for the compose field to 5000 to match pleroma default
Mark Felder [Thu, 15 Mar 2018 14:46:28 +0000 (14:46 +0000)]
Set max characters for the compose field to 5000 to match pleroma default

Of course you can't tell what the change is because the entire file is
written on one line, so the nearly impossible to read.

It's nice to be able to use 5000 chars from my computer and have access
to CW feature as well.

6 years agoactivitypub transmogrifier: rewrite non-http URLs using the object's external URL
William Pitcock [Tue, 13 Mar 2018 17:46:37 +0000 (17:46 +0000)]
activitypub transmogrifier: rewrite non-http URLs using the object's external URL

Signed-off-by: lain <lain@soykaf.club>
6 years agoDo more jobs by default.
lain [Tue, 13 Mar 2018 17:33:08 +0000 (18:33 +0100)]
Do more jobs by default.

6 years agoOnly push to still valid websub subscriptions.
lain [Tue, 13 Mar 2018 17:32:17 +0000 (18:32 +0100)]
Only push to still valid websub subscriptions.

6 years agoMerge branch 'andarna/pleroma-develop' into develop
lain [Tue, 13 Mar 2018 13:59:16 +0000 (14:59 +0100)]
Merge branch 'andarna/pleroma-develop' into develop

6 years agoMove stuff around.
lain [Tue, 13 Mar 2018 13:58:49 +0000 (14:58 +0100)]
Move stuff around.

6 years agoA small patch to show the instance name and favicon in the browser title
Wim Vanderbauwhede [Tue, 13 Mar 2018 09:37:55 +0000 (09:37 +0000)]
A small patch to show the instance name and favicon in the browser title
bar.

6 years agoFix Mastodon emojis.
lain [Tue, 13 Mar 2018 07:05:43 +0000 (08:05 +0100)]
Fix Mastodon emojis.

Code by Kaniini

6 years agoIgnore incoming empty chat messages.
lain [Mon, 12 Mar 2018 10:30:12 +0000 (11:30 +0100)]
Ignore incoming empty chat messages.

Fixes #62.

6 years agoDon't validate on missing public key.
lain [Sun, 11 Mar 2018 13:47:37 +0000 (14:47 +0100)]
Don't validate on missing public key.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sun, 11 Mar 2018 13:43:53 +0000 (14:43 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoMore signature debugging.
lain [Sun, 11 Mar 2018 13:37:23 +0000 (14:37 +0100)]
More signature debugging.

6 years agoUpdate README.md
feld [Sat, 10 Mar 2018 13:27:10 +0000 (13:27 +0000)]
Update README.md

6 years agoMerge branch 'fix/mastoapi-card' into 'develop'
eal [Fri, 9 Mar 2018 18:58:55 +0000 (18:58 +0000)]
Merge branch 'fix/mastoapi-card' into 'develop'

MastoAPI: Add unimplemented status card endpoint.

See merge request pleroma/pleroma!71

6 years agoMastoAPI: Add unimplemented status card endpoint.
eal [Fri, 9 Mar 2018 18:56:21 +0000 (20:56 +0200)]
MastoAPI: Add unimplemented status card endpoint.

6 years agoMerge branch 'fix/timeline-headers' into 'develop'
lambda [Fri, 9 Mar 2018 15:06:04 +0000 (15:06 +0000)]
Merge branch 'fix/timeline-headers' into 'develop'

Add next and previous headers to user pages and tag timelines.

Closes #72

See merge request pleroma/pleroma!70

6 years agoAdd next and previous headers to user pages and tag timelines.
eal [Fri, 9 Mar 2018 14:54:10 +0000 (16:54 +0200)]
Add next and previous headers to user pages and tag timelines.

6 years agoupdate frontend
lain [Thu, 8 Mar 2018 18:50:51 +0000 (19:50 +0100)]
update frontend

6 years agoRestrict activity fixing more.
lain [Thu, 8 Mar 2018 18:07:32 +0000 (19:07 +0100)]
Restrict activity fixing more.

If we need it for older ones, we can add a task for that later.

6 years agoUpdate pleroma.nginx
lambda [Thu, 8 Mar 2018 18:00:59 +0000 (18:00 +0000)]
Update pleroma.nginx

6 years agoMerge branch 'feature/activitypub' into 'develop'
lambda [Thu, 8 Mar 2018 12:29:02 +0000 (12:29 +0000)]
Merge branch 'feature/activitypub' into 'develop'

Feature/activitypub

See merge request pleroma/pleroma!67

6 years agoMerge branch 'develop' into feature/activitypub
lain [Thu, 8 Mar 2018 11:37:06 +0000 (12:37 +0100)]
Merge branch 'develop' into feature/activitypub

6 years agoOnly run the fix-up tasks once.
lain [Wed, 7 Mar 2018 19:19:48 +0000 (20:19 +0100)]
Only run the fix-up tasks once.

6 years agoadd test file.
lain [Wed, 7 Mar 2018 14:46:53 +0000 (15:46 +0100)]
add test file.

6 years agoCorrectly handle unlisted messages coming in through Ostatus.
lain [Wed, 7 Mar 2018 14:45:13 +0000 (15:45 +0100)]
Correctly handle unlisted messages coming in through Ostatus.

6 years agoDon't use special query for feed.
lain [Tue, 6 Mar 2018 15:04:29 +0000 (16:04 +0100)]
Don't use special query for feed.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Mon, 5 Mar 2018 08:27:08 +0000 (09:27 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoAdd way to disable federation.
lain [Mon, 5 Mar 2018 08:26:24 +0000 (09:26 +0100)]
Add way to disable federation.

6 years agoHandle incoming deletes.
lain [Sat, 3 Mar 2018 17:37:40 +0000 (18:37 +0100)]
Handle incoming deletes.

6 years agoRestrict public by recipients.
lain [Mon, 26 Feb 2018 09:09:30 +0000 (10:09 +0100)]
Restrict public by recipients.

This is much faster than going through the json. This does break
unlisted, for which we'll probably have to add another table field.

6 years agoOnly return posts in TwAPI user view.
lain [Mon, 26 Feb 2018 08:02:14 +0000 (09:02 +0100)]
Only return posts in TwAPI user view.

6 years agoActual real fix.
lain [Sun, 25 Feb 2018 21:28:53 +0000 (22:28 +0100)]
Actual real fix.

6 years agoOne more fix.
lain [Sun, 25 Feb 2018 21:20:38 +0000 (22:20 +0100)]
One more fix.

6 years agoFix context stitching.
lain [Sun, 25 Feb 2018 20:42:28 +0000 (21:42 +0100)]
Fix context stitching.

6 years agoMastodon API context fix.
lain [Sun, 25 Feb 2018 20:25:33 +0000 (21:25 +0100)]
Mastodon API context fix.

6 years agoAdd support for outgoing update.
lain [Sun, 25 Feb 2018 20:02:44 +0000 (21:02 +0100)]
Add support for outgoing update.

6 years agoFix signing bug.
lain [Sun, 25 Feb 2018 19:15:04 +0000 (20:15 +0100)]
Fix signing bug.

6 years agoMake likes and announces public.
lain [Sun, 25 Feb 2018 17:20:06 +0000 (18:20 +0100)]
Make likes and announces public.

6 years agoFix specs.
lain [Sun, 25 Feb 2018 17:08:41 +0000 (18:08 +0100)]
Fix specs.

6 years agoFix more specs.
lain [Sun, 25 Feb 2018 16:48:31 +0000 (17:48 +0100)]
Fix more specs.

6 years agoFix salmon tests.
lain [Sun, 25 Feb 2018 16:06:12 +0000 (17:06 +0100)]
Fix salmon tests.

6 years agoFix specs.
lain [Sun, 25 Feb 2018 15:52:33 +0000 (16:52 +0100)]
Fix specs.

6 years agoFix specs.
lain [Sun, 25 Feb 2018 15:40:37 +0000 (16:40 +0100)]
Fix specs.

6 years agoUse update_and_set cache.
lain [Sun, 25 Feb 2018 15:34:24 +0000 (16:34 +0100)]
Use update_and_set cache.

6 years agoHandle remote update activities.
lain [Sun, 25 Feb 2018 15:14:25 +0000 (16:14 +0100)]
Handle remote update activities.

6 years agoSet conversation to parent conversation.
lain [Sun, 25 Feb 2018 12:35:08 +0000 (13:35 +0100)]
Set conversation to parent conversation.

6 years agoSome fixes to AP fetching.
lain [Sun, 25 Feb 2018 09:56:01 +0000 (10:56 +0100)]
Some fixes to AP fetching.

6 years agoHotfix for tag problems.
lain [Sat, 24 Feb 2018 21:28:22 +0000 (22:28 +0100)]
Hotfix for tag problems.

6 years agoFix external url in twitterapi.
lain [Sat, 24 Feb 2018 19:29:57 +0000 (20:29 +0100)]
Fix external url in twitterapi.