akkoma
5 years agoFix compile
Mark Felder [Tue, 12 Feb 2019 00:25:12 +0000 (00:25 +0000)]
Fix compile

5 years agoWIP: Fix Twitter Cards
Mark Felder [Mon, 11 Feb 2019 23:59:04 +0000 (23:59 +0000)]
WIP: Fix Twitter Cards

Twitter cards were not passing any useful metadata. A few things were
being handled on Twitter's end by trying to match OpenGraph tags with
their own, but it wasn't working at all for media. This is an attempt to
fix that.

Common functions have been pulled out of opengraph and put into
utils. Twitter's functionality was entirely replaced with a direct copy
of Opengraph's and then modified as needed.

Profiles are now represented as Summary Cards

Posts with images are now represented as Summart with Large Image Cards

Posts with video and audio attachments are represented as Player Cards.

This now passes the Twitter Card Validator.

Validator and Docs are below

https://cards-dev.twitter.com/validator
https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards

5 years agoMerge branch 'bugfix/keyword-policy-check-summary' into 'develop'
kaniini [Mon, 11 Feb 2019 18:45:15 +0000 (18:45 +0000)]
Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'

Filter summary field in KeywordPolicy

See merge request pleroma/pleroma!812

5 years agoFilter summary in keywordpolicy
rinpatch [Mon, 11 Feb 2019 18:35:40 +0000 (21:35 +0300)]
Filter summary in keywordpolicy

5 years agoMerge branch 'feature/thread-muting' into 'develop'
rinpatch [Mon, 11 Feb 2019 15:02:14 +0000 (15:02 +0000)]
Merge branch 'feature/thread-muting' into 'develop'

Feature/thread muting

See merge request pleroma/pleroma!796

5 years agoMerge branch 'feature/rich-media-limits' into 'develop'
lambda [Mon, 11 Feb 2019 12:33:58 +0000 (12:33 +0000)]
Merge branch 'feature/rich-media-limits' into 'develop'

rich media: tighten fetching timeouts and size limits

See merge request pleroma/pleroma!809

5 years agoMerge branch 'develop' into feature/thread-muting
Karen Konou [Mon, 11 Feb 2019 11:10:10 +0000 (12:10 +0100)]
Merge branch 'develop' into feature/thread-muting

5 years agoRefactor as per Rin's suggestions, add endpoint tests
Karen Konou [Mon, 11 Feb 2019 10:59:51 +0000 (11:59 +0100)]
Refactor as per Rin's suggestions, add endpoint tests

5 years agoMerge branch 'revert-e0de0fcf' into 'develop'
lambda [Mon, 11 Feb 2019 08:22:54 +0000 (08:22 +0000)]
Merge branch 'revert-e0de0fcf' into 'develop'

Revert "Merge branch 'object-creation' into 'develop'"

See merge request pleroma/pleroma!810

5 years agoRevert "Merge branch 'object-creation' into 'develop'"
lambda [Mon, 11 Feb 2019 08:07:39 +0000 (08:07 +0000)]
Revert "Merge branch 'object-creation' into 'develop'"

This reverts merge request !802

5 years agorich media: tighten fetching timeouts and size limits
William Pitcock [Sun, 10 Feb 2019 21:37:51 +0000 (21:37 +0000)]
rich media: tighten fetching timeouts and size limits

5 years agoMerge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
kaniini [Sun, 10 Feb 2019 21:28:41 +0000 (21:28 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'

Update Mastodon Frontend to 2019-02-10 bundle

See merge request pleroma/pleroma!806

5 years agoMerge branch 'feather_mention' into 'develop'
kaniini [Sun, 10 Feb 2019 21:16:29 +0000 (21:16 +0000)]
Merge branch 'feather_mention' into 'develop'

Add Feather to the clients list

See merge request pleroma/pleroma!804

5 years agoMerge branch 'fix/credo-issues' into 'develop'
kaniini [Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)]
Merge branch 'fix/credo-issues' into 'develop'

Fix credo issues

See merge request pleroma/pleroma!786

5 years agoMerge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths...
kaniini [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'

Update service files of OpenRC and systemd to new recommended paths

See merge request pleroma/pleroma!798

5 years agoUpdate service files of OpenRC and systemd to new recommended paths
shibayashi [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Update service files of OpenRC and systemd to new recommended paths

5 years agoUpdate Mastodon Frontend to 2019-02-10 bundle
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 18:55:22 +0000 (19:55 +0100)]
Update Mastodon Frontend to 2019-02-10 bundle

See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10

[ci skip]

5 years agoadd feather to webclients
succfemboi [Sun, 10 Feb 2019 15:18:04 +0000 (16:18 +0100)]
add feather to webclients

5 years agoMerge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'
lambda [Sun, 10 Feb 2019 14:21:12 +0000 (14:21 +0000)]
Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'

Recommend the acme-challenge path that is used in the installation guides

See merge request pleroma/pleroma!803

5 years agoMerge branch 'docs/pleroma-clients' into 'develop'
lambda [Sun, 10 Feb 2019 13:47:26 +0000 (13:47 +0000)]
Merge branch 'docs/pleroma-clients' into 'develop'

docs/Clients.md: Add documentation about clients supporting pleroma

See merge request pleroma/pleroma!726

5 years agodocs/Clients.md: Add Nekonium
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 13:42:32 +0000 (14:42 +0100)]
docs/Clients.md: Add Nekonium

[ci skip]

5 years agodocs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 13:24:48 +0000 (14:24 +0100)]
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically

[ci skip]

5 years agodocs/Clients.md: Add Social (GNOME)
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:39:29 +0000 (18:39 +0100)]
docs/Clients.md: Add Social (GNOME)

[ci skip]

5 years agodocs/Clients.md: Add per-type sections
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:28:25 +0000 (18:28 +0100)]
docs/Clients.md: Add per-type sections

helps differenciate between Electrons and others like Brutaldon.
[ci skip]

5 years agodocs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:20:10 +0000 (18:20 +0100)]
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore

5 years agoWIP: docs/Clients.md: Add documentation about clients supporting pleroma
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 04:50:08 +0000 (05:50 +0100)]
WIP: docs/Clients.md: Add documentation about clients supporting pleroma

[ci skip]

5 years agorefactor, status view updating, error handling
Karen Konou [Sun, 10 Feb 2019 08:31:20 +0000 (09:31 +0100)]
refactor, status view updating, error handling

5 years agoMerge branch 'object-creation' into 'develop'
rinpatch [Sun, 10 Feb 2019 07:39:27 +0000 (07:39 +0000)]
Merge branch 'object-creation' into 'develop'

Do object insertion through Cachex

See merge request pleroma/pleroma!802

5 years agoRecommend the acme-challenge path that is used in the installation guides
shibayashi [Sat, 9 Feb 2019 22:08:27 +0000 (23:08 +0100)]
Recommend the acme-challenge path that is used in the installation guides

5 years agoMerge branch 'follow-enhancements' into 'develop'
kaniini [Sat, 9 Feb 2019 21:03:42 +0000 (21:03 +0000)]
Merge branch 'follow-enhancements' into 'develop'

Respect blocks in mass follow.

See merge request pleroma/pleroma!797

5 years agoDo object insertion through Cachex
lain [Sat, 9 Feb 2019 21:01:08 +0000 (22:01 +0100)]
Do object insertion through Cachex

So we don't flood our postgres logs with errors. Should also make things
slightly faster.

5 years agoAdd unique index and unique constraint check, uniqueness test fails
Karen Konou [Sat, 9 Feb 2019 19:52:11 +0000 (20:52 +0100)]
Add unique index and unique constraint check, uniqueness test fails

5 years agoMerged "check mute" test into the other two
Karen Konou [Sat, 9 Feb 2019 17:34:00 +0000 (18:34 +0100)]
Merged "check mute" test into the other two

5 years agoelixir too new for CI's mix format lol
Karen Konou [Sat, 9 Feb 2019 17:08:46 +0000 (18:08 +0100)]
elixir too new for CI's mix format lol

5 years agoit works!!
Karen Konou [Sat, 9 Feb 2019 16:47:57 +0000 (17:47 +0100)]
it works!!

5 years agoMix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:30:42 +0000 (16:30 +0100)]
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)

5 years agode-group import/s
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:20:18 +0000 (16:20 +0100)]
de-group import/s

5 years agode-group alias/es
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:16:26 +0000 (16:16 +0100)]
de-group alias/es

5 years agoHTML.Scrubber.Default: Consistency
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 13:39:27 +0000 (14:39 +0100)]
HTML.Scrubber.Default: Consistency

5 years agoStash
Haelwenn (lanodan) Monnier [Fri, 8 Feb 2019 16:18:44 +0000 (17:18 +0100)]
Stash

5 years agoWeb.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:19:35 +0000 (21:19 +0100)]
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it

5 years agoMix.Tasks.Pleroma.Uploads: Fix typo in documentation
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:24:57 +0000 (21:24 +0100)]
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation

5 years agoWeb.Federator: Fix unused variable
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:04:11 +0000 (21:04 +0100)]
Web.Federator: Fix unused variable

5 years agoCredo fixes: alias grouping/ordering
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 19:20:02 +0000 (20:20 +0100)]
Credo fixes: alias grouping/ordering

5 years agoCredo fixes: parameter consistency
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 19:19:39 +0000 (20:19 +0100)]
Credo fixes: parameter consistency

5 years agoMake credo happy
Haelwenn (lanodan) Monnier [Sun, 3 Feb 2019 17:44:18 +0000 (18:44 +0100)]
Make credo happy

5 years agoadded another test
Karen Konou [Sat, 9 Feb 2019 13:34:42 +0000 (14:34 +0100)]
added another test

5 years agoMade a test!
Karen Konou [Sat, 9 Feb 2019 13:23:51 +0000 (14:23 +0100)]
Made a test!

5 years agoDo autofollow first.
lain [Sat, 9 Feb 2019 12:39:57 +0000 (13:39 +0100)]
Do autofollow first.

5 years agoRespect blocks in mass follow.
lain [Sat, 9 Feb 2019 12:24:23 +0000 (13:24 +0100)]
Respect blocks in mass follow.

5 years agoMerge branch 'add-media-path-to-caddy-cache' into 'develop'
lambda [Sat, 9 Feb 2019 11:39:01 +0000 (11:39 +0000)]
Merge branch 'add-media-path-to-caddy-cache' into 'develop'

Add /media to Caddy cache

See merge request pleroma/pleroma!791

5 years agoAdd /media to Caddy cache
shibayashi [Sat, 9 Feb 2019 11:39:01 +0000 (11:39 +0000)]
Add /media to Caddy cache

5 years agoMerge branch 'feature/keyword-policy' into 'develop'
lambda [Sat, 9 Feb 2019 11:38:37 +0000 (11:38 +0000)]
Merge branch 'feature/keyword-policy' into 'develop'

Add keyword policy

See merge request pleroma/pleroma!794

5 years agooof
rinpatch [Sat, 9 Feb 2019 05:12:30 +0000 (08:12 +0300)]
oof

5 years agoAdd tests and fix a typo in docs
rinpatch [Fri, 8 Feb 2019 17:23:26 +0000 (20:23 +0300)]
Add tests and fix a typo in docs

5 years agohelp i am not good with git
Karen Konou [Fri, 8 Feb 2019 12:21:34 +0000 (13:21 +0100)]
help i am not good with git

5 years agoAdded thread unmuting (still a bit buggy maybe)
Karen Konou [Fri, 8 Feb 2019 12:17:11 +0000 (13:17 +0100)]
Added thread unmuting (still a bit buggy maybe)

5 years agoMerge branch 'fix/do-split-migration-for-local-users-only' into 'develop'
lambda [Fri, 8 Feb 2019 12:18:05 +0000 (12:18 +0000)]
Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'

Split hide_network only for local users

See merge request pleroma/pleroma!781

5 years agoAdded thread unmuting (still a bit buggy maybe)
Karen Konou [Fri, 8 Feb 2019 12:17:11 +0000 (13:17 +0100)]
Added thread unmuting (still a bit buggy maybe)

5 years agofix typo in config.md
rinpatch [Fri, 8 Feb 2019 12:12:44 +0000 (15:12 +0300)]
fix typo in config.md

5 years agowow
rinpatch [Fri, 8 Feb 2019 12:12:13 +0000 (15:12 +0300)]
wow

5 years agoMerge branch 'mark-streaming-feature-for-ios-apps' into 'develop'
lambda [Fri, 8 Feb 2019 12:10:35 +0000 (12:10 +0000)]
Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'

Mark streaming feature for iOS apps in readme

See merge request pleroma/pleroma!790

5 years agoMerge branch 'oauth2_strengthening' into 'develop'
lambda [Fri, 8 Feb 2019 12:09:43 +0000 (12:09 +0000)]
Merge branch 'oauth2_strengthening' into 'develop'

OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix

See merge request pleroma/pleroma!793

5 years agoMerge branch 'develop' into feature/thread-muting
Karen Konou [Fri, 8 Feb 2019 11:44:02 +0000 (12:44 +0100)]
Merge branch 'develop' into feature/thread-muting

5 years agoWhat idiot did that? (me)
rinpatch [Fri, 8 Feb 2019 10:16:50 +0000 (13:16 +0300)]
What idiot did that? (me)

5 years agoMerge branch 'develop' into feature/keyword-policy
rinpatch [Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)]
Merge branch 'develop' into feature/keyword-policy

5 years agorename ftl_removal to federated_timeline_removal to keep consistent naming with Simpl...
rinpatch [Fri, 8 Feb 2019 10:12:09 +0000 (13:12 +0300)]
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy

5 years agoAdd default config for keyword policy
rinpatch [Fri, 8 Feb 2019 09:48:39 +0000 (12:48 +0300)]
Add default config for keyword policy

5 years agoAdd keyword policy
rinpatch [Fri, 8 Feb 2019 09:38:24 +0000 (12:38 +0300)]
Add keyword policy

5 years agoresolved merge conflict
Karen Konou [Thu, 7 Feb 2019 22:47:13 +0000 (23:47 +0100)]
resolved merge conflict

5 years agoSomehow fixed the repo insert [skip-ci]
Karen Konou [Thu, 7 Feb 2019 22:44:30 +0000 (23:44 +0100)]
Somehow fixed the repo insert [skip-ci]

5 years agomade a silly oopsie
Karen Konou [Thu, 7 Feb 2019 21:38:54 +0000 (22:38 +0100)]
made a silly oopsie

5 years agomade a silly oopsie
Karen Konou [Thu, 7 Feb 2019 21:38:54 +0000 (22:38 +0100)]
made a silly oopsie

5 years agougghhhh
Karen Konou [Thu, 7 Feb 2019 21:25:07 +0000 (22:25 +0100)]
ugghhhh

5 years agoOAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach...
Ivan Tashkinov [Thu, 7 Feb 2019 19:14:06 +0000 (22:14 +0300)]
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.

(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).

5 years agoMigration and some boilerplate stuff
Karen Konou [Tue, 5 Feb 2019 12:35:24 +0000 (13:35 +0100)]
Migration and some boilerplate stuff

5 years agomark streaming feature for ios apps in readme
hakabahitoyo [Thu, 7 Feb 2019 03:01:35 +0000 (12:01 +0900)]
mark streaming feature for ios apps in readme

5 years agoMerge branch 'remove-pawoo-apps-from-readme' into 'develop'
kaniini [Thu, 7 Feb 2019 02:19:52 +0000 (02:19 +0000)]
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'

Remove Pawoo apps from README.md

See merge request pleroma/pleroma!788

5 years agoMerge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'
kaniini [Thu, 7 Feb 2019 02:18:51 +0000 (02:18 +0000)]
Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'

Mark streaming feature for Apps in README.md

See merge request pleroma/pleroma!789

5 years agoMark streaming feature for Apps in README.md
hakabahitoyo [Thu, 7 Feb 2019 02:04:37 +0000 (11:04 +0900)]
Mark streaming feature for Apps in README.md

5 years agoUpdate README.md
Hakaba Hitoyo [Thu, 7 Feb 2019 01:15:27 +0000 (01:15 +0000)]
Update README.md

5 years agoMerge branch 'rename-followings' into 'develop'
kaniini [Wed, 6 Feb 2019 22:40:24 +0000 (22:40 +0000)]
Merge branch 'rename-followings' into 'develop'

hide_followings was renamed to hide_followers in the FE, but never synced up in the BE

See merge request pleroma/pleroma!787

5 years agohide_followings was renamed to hide_followers in the FE, but never synced up in the BE
Mark Felder [Wed, 6 Feb 2019 22:34:44 +0000 (22:34 +0000)]
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE

This was a dirty regex replace which worked on my server

5 years agoMerge branch 'bugfix/rich-media-card' into 'develop'
Haelwenn [Wed, 6 Feb 2019 18:39:13 +0000 (18:39 +0000)]
Merge branch 'bugfix/rich-media-card' into 'develop'

rich media cards: bugfixes and regression tests

See merge request pleroma/pleroma!785

5 years agotests: add a rich media card that contains all relevant fields
William Pitcock [Wed, 6 Feb 2019 18:27:55 +0000 (18:27 +0000)]
tests: add a rich media card that contains all relevant fields

5 years agoMerge branch 'add-admin-and-moderator-fields' into 'develop'
kaniini [Wed, 6 Feb 2019 18:19:47 +0000 (18:19 +0000)]
Merge branch 'add-admin-and-moderator-fields' into 'develop'

Add admin and moderator badges to user view and make their visibility configurable

See merge request pleroma/pleroma!767

5 years agotest: add some regression tests for the rich media card rendering
William Pitcock [Wed, 6 Feb 2019 18:12:26 +0000 (18:12 +0000)]
test: add some regression tests for the rich media card rendering

5 years agomastodon api: rich media: don't clobber %URI struct with a string
William Pitcock [Wed, 6 Feb 2019 18:02:15 +0000 (18:02 +0000)]
mastodon api: rich media: don't clobber %URI struct with a string

5 years agoMerge branch 'mr/exsyslogger-doc-and-format' into 'develop'
Haelwenn [Wed, 6 Feb 2019 18:02:10 +0000 (18:02 +0000)]
Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'

Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format.

See merge request pleroma/pleroma!784

5 years agoadds a couple of explicit examples for ExSyslogger
Michael Loftis [Wed, 6 Feb 2019 17:54:30 +0000 (17:54 +0000)]
adds a couple of explicit examples for ExSyslogger

5 years agoMerge branch 'fix/activitypub-user-view-badmap' into 'develop'
rinpatch [Wed, 6 Feb 2019 17:47:58 +0000 (17:47 +0000)]
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'

Fix if clause in activity_pub user_view

See merge request pleroma/pleroma!783

5 years agoFix if clause in activity_pub user_view
href [Wed, 6 Feb 2019 17:42:19 +0000 (18:42 +0100)]
Fix if clause in activity_pub user_view

5 years agorids the duplicate timestamp from default ExSyslogger config
Michael Loftis [Wed, 6 Feb 2019 17:34:09 +0000 (17:34 +0000)]
rids the duplicate timestamp from default ExSyslogger config

5 years agoSplit hide_networ only for local users
Maxim Filippov [Wed, 6 Feb 2019 10:41:31 +0000 (13:41 +0300)]
Split hide_networ only for local users

5 years agoMerge branch '2019-02-06-update-frontend' into 'develop'
lambda [Wed, 6 Feb 2019 09:47:36 +0000 (09:47 +0000)]
Merge branch '2019-02-06-update-frontend' into 'develop'

update frontend

See merge request pleroma/pleroma!780

5 years agoupdate frontend
lain [Wed, 6 Feb 2019 09:40:01 +0000 (10:40 +0100)]
update frontend

5 years agoAllow to configure visibility for admin and moderator badges
eugenijm [Mon, 4 Feb 2019 12:28:35 +0000 (15:28 +0300)]
Allow to configure visibility for admin and moderator badges

5 years agoAdd is_admin and is_moderator boolean fields to the user view
eugenijm [Mon, 4 Feb 2019 02:03:57 +0000 (05:03 +0300)]
Add is_admin and is_moderator boolean fields to the user view

5 years agoMerge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'
rinpatch [Tue, 5 Feb 2019 21:01:20 +0000 (21:01 +0000)]
Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'

rich media: parser: reject any data which cannot be explicitly encoded into JSON

Closes #596

See merge request pleroma/pleroma!779

5 years agorich media: parser: reject any data which cannot be explicitly encoded into JSON
William Pitcock [Tue, 5 Feb 2019 20:50:57 +0000 (20:50 +0000)]
rich media: parser: reject any data which cannot be explicitly encoded into JSON