bef9b9cb66
refactored code
2019-02-13 16:23:09 +01:00
adcdd21f16
Merge branch 'develop' into hellthread-filter-fix
2019-02-13 16:22:14 +01:00
88a4de24f9
User.follow_all: Respect blocks in both directions.
2019-02-13 13:52:27 +01:00
760fec4cb8
Update token.ex
2019-02-13 12:59:56 +03:00
62a45bdc11
Add revoke token
2019-02-13 12:59:56 +03:00
61a4bc5095
Add OAuth tokens endpoint
2019-02-13 12:59:56 +03:00
b7bc666200
bugfix mdii uploader
2019-02-13 15:46:42 +09:00
1d727cd069
added checks for public url and follower collections
2019-02-13 00:01:34 +01:00
da4c662af3
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
2019-02-12 22:12:12 +01:00
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
c984e8272a
Formatting
2019-02-12 00:37:22 +00:00
4956ab5ea3
Fix compile
2019-02-12 00:25:12 +00:00
ac7ef0999d
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
2019-02-11 23:59:04 +00:00
ea1058929c
Use url[:scheme] instead of protocol to determine if https is enabled
2019-02-12 00:08:52 +01:00
379d04692c
Filter summary in keywordpolicy
2019-02-11 21:35:40 +03:00
39383a6b79
Merge branch 'feature/thread-muting' into 'develop'
...
Feature/thread muting
See merge request pleroma/pleroma!796
2019-02-11 15:02:14 +00:00
044616292b
Merge branch 'feature/rich-media-limits' into 'develop'
...
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
2019-02-11 12:33:58 +00:00
ac72b578da
Merge branch 'develop' into feature/thread-muting
2019-02-11 12:10:49 +01:00
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
2019-02-11 12:04:02 +01:00
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
2019-02-11 08:07:39 +00:00
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
45e57dd187
rich media: tighten fetching timeouts and size limits
2019-02-10 21:54:08 +00:00
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
2019-02-10 20:54:21 +00:00
cc21fc5f53
refactor, status view updating, error handling
2019-02-10 10:42:30 +01:00
e0de0fcf22
Merge branch 'object-creation' into 'develop'
...
Do object insertion through Cachex
See merge request pleroma/pleroma!802
2019-02-10 07:39:27 +00:00
d5fe05c37e
Merge branch 'follow-enhancements' into 'develop'
...
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
2019-02-09 21:03:42 +00:00
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
2019-02-09 22:01:08 +01:00
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
2019-02-09 20:52:11 +01:00
638456ce8f
elixir too new for CI's mix format lol
2019-02-09 18:08:46 +01:00
a0d732ec55
it works!!
2019-02-09 17:47:57 +01:00
6ca633ddd3
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)
2019-02-09 16:31:17 +01:00
d924dc73ba
de-group import/s
2019-02-09 16:31:17 +01:00
6a6a5b3251
de-group alias/es
2019-02-09 16:31:17 +01:00
381fe44172
HTML.Scrubber.Default: Consistency
2019-02-09 14:59:21 +01:00
2272934a5e
Stash
2019-02-09 14:59:21 +01:00
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
2019-02-09 14:59:21 +01:00
bd9b5fffbc
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation
2019-02-09 14:59:21 +01:00
473095faf2
Web.Federator: Fix unused variable
2019-02-09 14:59:20 +01:00
60ea29dfe6
Credo fixes: alias grouping/ordering
2019-02-09 14:59:20 +01:00
106f4e7a0f
Credo fixes: parameter consistency
2019-02-09 14:59:20 +01:00
8bcfac93a8
Make credo happy
2019-02-09 14:59:20 +01:00
563f04e81b
Do autofollow first.
2019-02-09 13:39:57 +01:00
bbd0049fae
Respect blocks in mass follow.
2019-02-09 13:24:23 +01:00
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
...
Add keyword policy
See merge request pleroma/pleroma!794
2019-02-09 11:38:37 +00:00
7e47a810a2
help i am not good with git
2019-02-08 13:22:29 +01:00
5c5b228f21
Added thread unmuting (still a bit buggy maybe)
2019-02-08 13:20:40 +01:00
a44e532fb1
Added thread unmuting (still a bit buggy maybe)
2019-02-08 13:17:11 +01:00
7356659273
wow
2019-02-08 15:12:13 +03:00
98ec578f4d
Merge branch 'develop' into feature/thread-muting
2019-02-08 12:44:02 +01:00
f88dec8b33
What idiot did that? (me)
2019-02-08 13:16:50 +03:00
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
2019-02-08 13:12:33 +03:00
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
2019-02-08 13:12:09 +03:00
2174f6eb4f
Add default config for keyword policy
2019-02-08 12:48:39 +03:00
46aa8c18a2
Add keyword policy
2019-02-08 12:38:24 +03:00
c43f414a79
Somehow fixed the repo insert [skip-ci]
2019-02-07 23:44:49 +01:00
7e3ec93ed0
made a silly oopsie
2019-02-07 22:59:53 +01:00
77448de492
ugghhhh
2019-02-07 22:25:07 +01:00
2c68cf7e9e
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).
2019-02-07 22:14:06 +03:00
f4ff4ffba2
Migration and some boilerplate stuff
2019-02-07 17:36:14 +01:00
74518d0b60
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
2019-02-06 22:34:44 +00:00
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
2019-02-06 18:39:13 +00:00
18e783bcb2
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
2019-02-06 18:19:47 +00:00
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
2019-02-06 18:02:15 +00:00
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
2019-02-06 17:47:58 +00:00
f753043ce0
Fix if clause in activity_pub user_view
2019-02-06 18:42:19 +01:00
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
2019-02-06 11:33:00 +07:00
035eaeb9b8
Allow to configure visibility for admin and moderator badges
2019-02-06 06:18:05 +03:00
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
2019-02-06 02:10:06 +03:00
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
2019-02-05 20:50:57 +00:00
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
2019-02-05 20:27:31 +00:00
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
2019-02-05 20:26:31 +00:00
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
2019-02-05 18:56:59 +00:00
ecdb0b7f57
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
...
mastodon api: fix rendering of cards without image URLs (closes #597 )
Closes #597
See merge request pleroma/pleroma!777
2019-02-05 18:53:43 +00:00
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
2019-02-05 18:30:27 +00:00
f8b831ecfd
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
...
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
2019-02-05 11:30:18 +00:00
a2bb5d890d
html: don't attempt to parse nil content
2019-02-05 05:06:17 +00:00
e71ab5a10f
activitypub: transmogrifier: fix bare tags
2019-02-05 00:43:28 +00:00
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
2019-02-04 22:58:29 +00:00
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
2019-02-04 23:47:29 +01:00
03991e7bc5
Merge branch 'feature/mrf-tag' into 'develop'
...
MRF TagPolicy engine
See merge request pleroma/pleroma!768
2019-02-04 19:20:11 +00:00
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
2019-02-04 19:03:54 +00:00
64a3993425
activitypub: mrf: tag policy: add support for subscription control
2019-02-04 17:48:48 +00:00
14d967f515
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
2019-02-05 00:38:05 +07:00
3ae11835a9
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
...
fix hellthread threshold deprecation warning
See merge request pleroma/pleroma!770
2019-02-04 17:32:12 +00:00
4031c94a59
fix hellthread threshold deprecation warning
2019-02-04 18:26:56 +01:00
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
2019-02-04 17:06:37 +00:00
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
2019-02-04 17:04:05 +00:00
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
2019-02-04 17:04:05 +00:00
88e32a32ce
mrf: add initial MRF.TagPolicy engine
2019-02-04 17:04:05 +00:00
93e136d70b
mix: add user tag/untag task
2019-02-04 17:04:05 +00:00
25a659d2dc
Merge branch 'mime-riff' into 'develop'
...
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
2019-02-04 16:52:41 +00:00
127f99ae18
Mime: detect RIFF formats (wave, webp, avi)
2019-02-04 17:44:41 +01:00
00835bf678
Merge branch 'fix/rich-media-relative-path' into 'develop'
...
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
2019-02-04 16:01:34 +00:00
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07:00
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
2019-02-04 12:36:50 +00:00
58262a8b8a
removed a debug thingy
2019-02-04 11:22:25 +00:00
4430641349
squished a bug
2019-02-04 12:09:00 +01:00
3cf046babb
actually commited the changes
2019-02-04 10:23:43 +01:00
63a4f4b7be
fixed Map,put arguments, updated nomenclature
2019-02-04 10:23:07 +01:00
583c4e0f17
more tweaks, fixed silly mistakes...
2019-02-03 23:56:20 +01:00
Karen Konou
lain
Maxim Filippov
hakabahitoyo
Haelwenn (lanodan) Monnier
Mark Felder
shibayashi
rinpatch
lambda
Egor Kislitsyn
William Pitcock
kaniini
Ivan Tashkinov
Haelwenn
href
eugenijm