lechindianer/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
4355 commits 9 branches 75 tags 308 MiB
Commit graph

2370 commits

Author SHA1 Message Date
William Pitcock
ddc7ae2c1a mastodon api: card: force OGP images through mediaproxy 2019-01-28 06:42:27 +00:00
William Pitcock
ebeabdcc72 rich media: helpers: clean up unused aliases 2019-01-28 06:10:25 +00:00
William Pitcock
91ef64a1ec activitypub: prime OGP crawler cache when new messages are inserted into the database 2019-01-28 06:07:18 +00:00
William Pitcock
8e42251e06 rich media: add helpers module, use instead of MastodonAPI module 2019-01-28 06:04:54 +00:00
William Pitcock
24a103a1fe mastodon api: formatting 2019-01-28 05:53:17 +00:00
William Pitcock
6096846f5f API: kill /api/rich_media/parse endpoint 2019-01-28 05:53:17 +00:00
William Pitcock
07a9a891ad twitter api: fix up activity representer 2019-01-28 05:53:17 +00:00
William Pitcock
de42646634 rich media: add try/rescue to ensure we catch parsing and fetching failures 2019-01-28 05:53:17 +00:00
William Pitcock
5d895093fd twitter api: embed card in twitterapi posts 2019-01-28 05:53:17 +00:00
William Pitcock
5a37ddc2dc mastodon api: embed card in status object 2019-01-28 05:53:17 +00:00
William Pitcock
132d815f1f mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data 2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks 2019-01-28 04:47:32 +01:00
Haelwenn (lanodan) Monnier
872241d7c5
/web/index template: Modify for glitch-soc 2019-01-28 04:43:36 +01:00
href
71bb90073b
/notice/:id - send the FE index even if 404 
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
 2019-01-27 22:51:50 +01:00
lambda
16ab1437d6 Merge branch 'safe-render-activities' into 'develop' 
Views: wrap activity rendering in a rescue

See merge request pleroma/pleroma!723
 2019-01-27 20:10:09 +00:00
kaniini
ea12371a01 Merge branch 'discard-invalid-likes' into 'develop' 
Transmogrifier: fix incoming objects with invalid likes

See merge request pleroma/pleroma!724
 2019-01-27 19:10:15 +00:00
href
77f2137383
Transmogrifier: fix incoming objects with invalid likes 2019-01-27 19:33:21 +01:00
href
f83bae7c22
Views: wrap activity rendering in a rescue 
this avoids complete timeline breakage when an activity fucks up
rendering.
 2019-01-27 19:16:20 +01:00
kaniini
5eb81d2c72 Merge branch 'features/mastoapi-multi-hashtag' into 'develop' 
MastodonAPI multi-hashtag

See merge request pleroma/pleroma!652
 2019-01-27 12:45:50 +00:00
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
 2019-01-27 10:33:22 +01:00
William Pitcock
8f2f471e94 rich media: gracefully handle fetching nil URIs 2019-01-26 16:36:17 +00:00
Haelwenn (lanodan) Monnier
de956b9e04
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it 2019-01-26 16:46:20 +01:00
William Pitcock
1f7843b9b8 mastodon api: use OGP uri instead of page_url for deducing domain name, fix test 2019-01-26 15:24:16 +00:00
William Pitcock
86037e9c39 mastodon api: use HTML.extract_first_external_url() 2019-01-26 15:13:27 +00:00
William Pitcock
78047d57bf mastodon api: provider_name setting is required too on the card 2019-01-26 14:47:32 +00:00
Haelwenn (lanodan) Monnier
39863236eb Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x 
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
 2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier
3f64379b13 Web.MastodonAPI.MastodonAPIController: Add Rich-Media support 2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier
1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag() 
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier
f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines 2019-01-26 04:45:36 +01:00
Haelwenn (lanodan) Monnier
15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil 2019-01-26 03:50:49 +01:00
Ivan Tashkinov
060d280e64 [#534] Made Salmon.send_to_user calls be handled through Federator.enqueue. 2019-01-25 20:38:13 +03:00
Ivan Tashkinov
465adedb7c [#534] Websub fix: made SQL use UTC time zone when comparing with valid_until (instead of postgresql-server default time zone). 2019-01-25 18:29:43 +03:00
rinpatch
3a5b3c5a3a Merge remote-tracking branch 'pl/develop' into oembed_provider 2019-01-25 10:40:51 +03:00
kaniini
4c99b6d35a Merge branch 'fix/tusky-dm' into 'develop' 
Add actor to recipients list

Closes #390

See merge request pleroma/pleroma!683
 2019-01-25 05:19:32 +00:00
kaniini
c9b418e547 Merge branch 'develop' into 'oembed_provider' 
# Conflicts:
#   lib/pleroma/activity.ex
 2019-01-25 05:00:47 +00:00
kaniini
4df71cd88b Merge branch 'classic-flakeids' into 'develop' 
Flake Ids for Users and Activities

Closes #450

See merge request pleroma/pleroma!645
 2019-01-25 04:59:06 +00:00
Maxim Filippov
9274cabe01 Use correct logic to determine "attentions" list 2019-01-24 23:30:43 +03:00
Ivan Tashkinov
3e9399ec0b [#534] Optimized bulk publish ops to filter on reachability early. Instance refactoring. 2019-01-24 19:15:23 +03:00
Ivan Tashkinov
8654a591f0 [#534] Updating external instances reachability on incoming federation. 2019-01-24 17:37:23 +03:00
William Pitcock
54ec6d09b0 mrf: add anti-followbot policy 2019-01-24 09:35:19 +00:00
Ivan Tashkinov
20b54366ee [#534] Federation publish requests status control (enforced 2xx response code check). 2019-01-24 11:54:52 +03:00
Maxim Filippov
4333fea1dc Send "hide_network" in user_view 2019-01-23 19:47:51 +03:00
Ivan Tashkinov
f161a92cb1 [#534] Initial implementation of unreachable federation targets retirement. 2019-01-23 18:37:25 +03:00
lain
2de208817c Merge branch 'develop' into rename/pleroma_activity_consistency 2019-01-23 13:05:58 +01:00
lain
e221c681dc New frontend configuration mechanism. 2019-01-23 12:40:57 +01:00
href
973c9eed18
Treat User.Info pinned ids as strings 2019-01-23 11:26:37 +01:00
href
cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param 2019-01-23 11:26:35 +01:00
href
28d77e373c
Flake Ids for Users and Activities 2019-01-23 11:26:27 +01:00
href
f9a3269099
Uploader callback controller 2019-01-21 22:44:14 +01:00
lambda
8cd853ce0c Merge branch '530_federator_user_info_overwrite_fix' into 'develop' 
[#530] Prevents user `info` from being overwritten because of race conditions

Closes #530

See merge request pleroma/pleroma!691
 2019-01-21 13:03:32 +00:00
lambda
69454c8345 Merge branch 'feature/dm-sanity' into 'develop' 
DM sanitization

See merge request pleroma/pleroma!458
 2019-01-21 12:35:10 +00:00
Ivan Tashkinov
a4d3fec8a7 [#502] Code comments update. 2019-01-21 14:52:41 +03:00
Ivan Tashkinov
aa480f4a8b [#530] Prevents user info from being overwritten because of race conditions 
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
 2019-01-21 14:16:51 +03:00
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1 2019-01-21 08:00:41 +01:00
Haelwenn (lanodan) Monnier
2fdbd4d137
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list 2019-01-21 08:00:40 +01:00
Haelwenn (lanodan) Monnier
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1 2019-01-21 08:00:38 +01:00
Haelwenn (lanodan) Monnier
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1 2019-01-21 07:49:59 +01:00
lain
cf1f35a93a Send delete event over Mastodon streaming api 
Closes #116
 2019-01-20 13:00:46 +01:00
lambda
f3045a179e Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop' 
I1t/pleroma 477 user search improvements

See merge request pleroma/pleroma!685
 2019-01-20 10:24:05 +00:00
William Pitcock
aa37313416 activitypub: short-circuit is_public?() with directMessage flag check 2019-01-20 02:33:21 +00:00
William Pitcock
7c9749f793 transmogrifier: slightly clean up fix_explicit_addressing pipeline 2019-01-20 02:27:48 +00:00
William Pitcock
420651157b transmogrifier: don't apply heuristics against messages which have directMessage set true 2019-01-20 02:27:48 +00:00
William Pitcock
ddae43eb43 activitypub: add is_private?/is_direct? helpers 2019-01-20 02:27:48 +00:00
William Pitcock
9adc80afff common api: set directMessage flag on our own posts 2019-01-20 02:27:48 +00:00
William Pitcock
75dfa1f0b0 mastodon api: get_visibility(): DMs never have a cc list. 2019-01-20 02:27:48 +00:00
William Pitcock
681f40ee5c activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs 2019-01-20 02:27:48 +00:00
William Pitcock
8d06be35e0 activitypub: utils: add determine_explicit_mentions() and tests 2019-01-20 02:27:48 +00:00
kaniini
42612b1c8d Merge branch 'bugfix/improve-boost-targeting' into 'develop' 
improve handling of non-public Announces

See merge request pleroma/pleroma!681
 2019-01-19 23:44:08 +00:00
rinpatch
44693fbf6e Formating 2019-01-20 01:28:46 +03:00
rinpatch
afd83db0d7 Provide local og:url for remote activities 2019-01-19 10:58:27 +03:00
kaniini
651ce1c97b Merge branch '491_full_mentions_in_user_bio' into 'develop' 
[#491] Made user bio preserve full nicknames (nick@host)

Closes #491

See merge request pleroma/pleroma!676
 2019-01-19 07:36:58 +00:00
Maxim Filippov
651a1d64b5 Add current user to mentioned 2019-01-19 04:25:15 +03:00
Maxim Filippov
e116e55cab Add actor to recipients 2019-01-18 22:40:52 +03:00
rinpatch
74346a7035 Fix merge conflict 2019-01-18 18:31:25 +03:00
rinpatch
997f4a5e09 Remove custom emojis and trailing whitespaces from previews 2019-01-18 10:28:19 +03:00
rinpatch
1b1af4798a Use object instead of activity for metadata 2019-01-18 09:32:52 +03:00
Ivan Tashkinov
65bb9b2fba [#491] Made full nicknames be preserved in user links text only in Bio. 2019-01-18 09:30:16 +03:00
William Pitcock
75a9b2a851 activitypub: add a match clause for objects, not just activities 2019-01-17 23:32:16 +00:00
William Pitcock
dbc4e92509 activitypub: transmogrifier: do not clobber the addressing on relayed announcements 2019-01-17 23:21:31 +00:00
William Pitcock
33b473cc02 activitypub: allow is_public?() to work on any type of map representing an AS2 object 2019-01-17 23:21:31 +00:00
William Pitcock
8e9f1d5587 activitypub: relay: chase selective public announce changes 2019-01-17 23:21:31 +00:00
William Pitcock
2479e88815 activitypub: announce: add new public parameter 2019-01-17 23:21:31 +00:00
kaniini
ae8a5942cf Merge branch 'bad-copy-paste' into 'develop' 
Fix bad link in likes collection

See merge request pleroma/pleroma!679
 2019-01-17 19:22:21 +00:00
sxsdv1
948fba6f76 Fix bad link in likes collection 
Don't copy and paste, mkay
 2019-01-17 18:21:43 +01:00
rinpatch
a95d5da607 Don't show content if empty or zero width space 2019-01-17 20:18:28 +03:00
Mark Felder
849c83ed46 formatting 2019-01-17 16:10:26 +00:00
Mark Felder
6bc9a641ba Default to disabled in the code in case the setting is absent from config.exs 2019-01-17 16:01:25 +00:00
Mark Felder
8c368d42a2 Make attachment links configurable 
Thanks @href!
 2019-01-17 15:48:14 +00:00
rinpatch
4d5f15cd42 Introduce optional unfurling of nsfw content 2019-01-17 11:00:02 +03:00
rinpatch
0256bd2f1d Use object url instead of a hack 2019-01-17 10:34:19 +03:00
rinpatch
fd3a558230 Apply feld's patch 2019-01-17 09:18:46 +03:00
rinpatch
5fa508cc2b Remove @providers and call Pleroma.config on runtime 2019-01-16 18:04:41 +03:00
rinpatch
bb43f4cee9 Remove useless with in opengraph.ex 2019-01-16 18:02:46 +03:00
rinpatch
293f6a8b71 join us now and share the software~. Also tests 2019-01-16 17:15:13 +03:00
lain
943324b661 MastoAPI: Don't break on missing users. 2019-01-16 15:13:09 +01:00
rinpatch
b44995866b Replace map with reduce to remove nils 2019-01-16 16:52:01 +03:00
rinpatch
ff01fd3c4f Remove caching because it does not affect performance and may be even worse in some cases 2019-01-16 11:18:25 +03:00
rinpatch
bfe2a11a6b Add config doc 2019-01-16 10:45:56 +03:00
rinpatch
a9c27e137d Add a fallback function to handle generic params, just in case 2019-01-16 10:38:42 +03:00
rinpatch
a76793006b Thanks you rinpatch, very cool 2019-01-16 10:35:06 +03:00
rinpatch
0039d45b5b No need to use activity in the key 2019-01-16 10:30:47 +03:00
rinpatch
70b2bb6ede add caching 2019-01-16 10:26:01 +03:00
rinpatch
dd1432d695 Disable previews for any activity, but create 2019-01-16 09:42:24 +03:00
rinpatch
565caff3f4 cache HTML in OGP 2019-01-16 00:07:28 +03:00
rinpatch
9aa69e12b8 Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate 2019-01-15 23:25:28 +03:00
rinpatch
2e630bea0d Add twitter card, filter nsfw 2019-01-15 23:00:22 +03:00
rinpatch
70f140681f Add space between name and nickname 2019-01-15 21:47:45 +03:00
rinpatch
e8eecd61b4 Formating 2019-01-15 21:20:27 +03:00
rinpatch
410fd9d774 Attach attachments 2019-01-15 21:17:56 +03:00
William Pitcock
17da432dbb websub: improve error handling 2019-01-15 18:03:49 +00:00
rinpatch
ff6c9a5c96 Introduce get_by_id in Activity, replace newlines with spaces 2019-01-15 20:00:21 +03:00
rinpatch
850912b06b refactor opengraph to a different module with a behaviour 2019-01-15 19:43:52 +03:00
rinpatch
8745c8c990 remove useless newlines after every tag. Make domain.com/username provide opengraph too 2019-01-15 18:34:47 +03:00
rinpatch
2858fd2da2 add a fallback function 2019-01-15 12:11:07 +03:00
rinpatch
ce15e0659e Fix some edge cases [nervous laughter] 2019-01-15 11:56:35 +03:00
rinpatch
4656f433f9 Move metadata.ex out of ostatus 2019-01-15 11:00:17 +03:00
lambda
fd2f1258fb Merge branch 'load-all-dms' into 'develop' 
Remove recent activity restriction.

See merge request pleroma/pleroma!644
 2019-01-14 18:49:53 +00:00
Ivan Tashkinov
dc45ec62c2 [#477] User search improvements: tsquery search with field weights, friends & followers boosting. 2019-01-14 20:04:45 +03:00
kaniini
de1da7b3d1 Merge branch 'feature/add-oembed-parser' into 'develop' 
Add OEmbed parser

See merge request pleroma/pleroma!661
 2019-01-14 07:28:04 +00:00
kaniini
fa0392e49c Merge branch 'activitypub-likes' into 'develop' 
Activitypub c2s likes

See merge request pleroma/pleroma!658
 2019-01-14 07:27:05 +00:00
William Pitcock
6e5b0406b9 mrf: add no placeholder-text policy, strips pointless "." content from posts with images 2019-01-14 05:42:38 +00:00
rinpatch
e4dc3f71ae Resolve merge conflict 2019-01-13 13:38:28 +03:00
Maxim Filippov
b8a77c5d70 Add OEmbed parser 2019-01-13 02:06:50 +02:00
sxsdv1
868034375c Add likes to activitypub object representation 
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
 2019-01-12 20:24:41 +01:00
sxsdv1
581edd5a91 Add route to get object like activities 2019-01-12 20:24:38 +01:00
sxsdv1
36711e1c83 Handle client submitted activitypub like activity 2019-01-12 20:24:35 +01:00
sxsdv1
1eb7318831 Prepare all types objects before serialising 
Activities returned from inbox can include other types of objects like
Article
 2019-01-12 20:24:32 +01:00
Sadposter
9daf162461 Honour parameters on MastoAPI /favourites 2019-01-12 14:42:52 +00:00
Sadposter
144b48da95 Add link headers to MastoAPI /favourites 
As documented at https://docs.joinmastodon.org/api/rest/favourites/
 2019-01-12 14:03:35 +00:00
Egor Kislitsyn
b594a54d0c unpin when deleting a status 2019-01-11 12:31:31 +07:00
kaniini
e4afe1359b Merge branch 'activitypub-dereference-activity-id' into 'develop' 
Support activity+json request for activity

See merge request pleroma/pleroma!641
 2019-01-10 18:42:36 +00:00
Maxim Filippov
1f851a0723 Add Twitter Card parser 2019-01-10 18:09:56 +00:00
kaniini
11d08c6226 Merge branch 'twapi-follower-pagination' into 'develop' 
Twapi follower pagination

See merge request pleroma/pleroma!648
 2019-01-10 18:03:32 +00:00
Haelwenn
ab4c5f5bf7 Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop' 
common api: fix newlines in markdown code blocks

See merge request pleroma/pleroma!651
 2019-01-10 03:54:29 +00:00
William Pitcock
0bdbd4f968 common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown 
ok @lanodan
 2019-01-10 03:45:58 +00:00
William Pitcock
2ecf81f10c common api: fix newlines in markdown code blocks 2019-01-10 03:37:37 +00:00
kaniini
7f5efddd6e Merge branch 'feature/pinned-posts' into 'develop' 
Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636
 2019-01-10 02:39:53 +00:00
kaniini
d203b0b4d3 Merge branch 'dm-optimizations' into 'develop' 
Add activity visibility index.

See merge request pleroma/pleroma!646
 2019-01-10 02:31:29 +00:00
rinpatch
b57db828c7 Merge branch 'hotfix/ogp-cachex-fix' into 'develop' 
Rich media: Remove :commit since a tuple is already returned

See merge request pleroma/pleroma!649
 2019-01-09 18:42:00 +00:00
rinpatch
a2d7f0e0e9 Remove :commit since a tuple is already returned 2019-01-09 21:35:01 +03:00
lain
a99e156f2c Add integer casts. 2019-01-09 18:17:23 +01:00
lain
7ac152ed38 TwitterAPI: Add follower/following pagination. 2019-01-09 18:14:32 +01:00
lambda
1881680e28 Merge branch 'scarlett/pleroma-summary-html-api' into 'develop' 
Scarlett/pleroma summary html api

See merge request pleroma/pleroma!647
 2019-01-09 16:26:38 +00:00
lain
5027f82cde Add activity visibility index. 2019-01-09 16:45:09 +01:00
Egor Kislitsyn
44a1e69484 Add Twitter API for the pinned statuses 
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true

# Pin
POST /api/statuses/pin/:id

# Unpin
POST /api/statuses/unpin/:id
```
 2019-01-09 19:54:19 +07:00
lain
9854978b8b Remove recent activity restriction. 
This should be fine now, everything should be covered by indices.
 2019-01-09 12:38:23 +01:00
Egor Kislitsyn
1b06e6fdf3 only non-reblogs, self-authored, public statuses can be pinned 2019-01-09 17:40:15 +07:00
sxsdv1
20c0dd1e24 Support activity+json request for activity 2019-01-09 09:33:30 +01:00
Egor Kislitsyn
0c750bc432 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 2019-01-08 16:32:07 +07:00
Egor Kislitsyn
e679da4c34 add pinned property to StatusView 2019-01-08 15:27:02 +07:00
lain
a16b17cc61 Actually put some onformation in the error user, make it actually properly parse 
in conversations.
 2019-01-07 20:59:30 +01:00
kaniini
74e1093732 Merge branch 'resilient-user-view' into 'develop' 
Make TwAPI UserView more resilient to issues.

See merge request pleroma/pleroma!634
 2019-01-07 17:09:52 +00:00
Egor Kislitsyn
f24087f96e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 2019-01-07 20:55:32 +07:00
Egor Kislitsyn
380e9fba21 add pinned posts 2019-01-07 20:45:33 +07:00
lain
7382adf407 Make TwAPI UserView more resilient to issues. 
Will work for missing users and badly migrated users.
 2019-01-07 12:41:31 +01:00
scarlett
36fa5e8802 Check visible_for_user when performing a search using a direct link. 2019-01-07 10:36:31 +00:00
scarlett
52493467ac Twitter API: Add a summary_html field. 
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
 2019-01-06 10:19:00 +00:00
kaniini
576368237c Merge branch 'activitypub-tombstone-fix' into 'develop' 
Don't crash on AP request for tombstone

See merge request pleroma/pleroma!630
 2019-01-05 22:29:08 +00:00
scarlett
145d6fe6e9 Merge branch 'emoji-in-summary' into 'develop' 
Strip HTML in and allow emoji in summaries.

See merge request pleroma/pleroma!631
 2019-01-05 21:52:02 +00:00
scarlett
6556be344d Resolve some test failures. 2019-01-05 18:20:42 +00:00
scarlett
3c86d907d4 add some brakets to the emoji list. 2019-01-05 17:35:39 +00:00
scarlett
0787f0dfbe Strip HTML in and allow emoji in summaries. 2019-01-05 17:28:47 +00:00
sxsdv1
2d7da5f437 Don't crash on AP request for tombstone 
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
 2019-01-05 11:16:05 +01:00
rinpatch
ba17518a0a Merge branch 'feature/rich-media-cachex' into 'develop' 
rich media: use cachex to avoid flooding remote servers

See merge request pleroma/pleroma!629
 2019-01-04 23:56:42 +00:00
William Pitcock
487c00d36d rich media: disable cachex in test mode 2019-01-04 23:53:26 +00:00
kaniini
bf5aaefbb5 Merge branch 'fix/html-cache-content-collision' into 'develop' 
Different caches based on the module. Remove scrubber version since it is not relevant anymore

See merge request pleroma/pleroma!628
 2019-01-04 23:35:56 +00:00
William Pitcock
0964c207eb rich media: use cachex to avoid flooding remote servers 2019-01-04 23:32:01 +00:00
Rin Toshaka
846082e54f Different caches based on the module. Remove scrubber version since it is not relevant anymore 2019-01-05 00:19:46 +01:00
kaniini
4258dd8633 Merge branch 'feature/rich-media' into 'develop' 
URL previews in posts

Closes #402

See merge request pleroma/pleroma!617
 2019-01-04 20:50:18 +00:00
kaniini
ffea81b84f Merge branch 'activitypub-c2s-delete-activity' into 'develop' 
Activitypub c2s delete activity

See merge request pleroma/pleroma!618
 2019-01-04 20:32:10 +00:00
Wim Vanderbauwhede
ba93396649 Patch to support image descriptions in Pleroma FE 2019-01-04 16:27:46 +00:00
Wim Vanderbauwhede
4c95545d19 Patch to support image descriptions in Pleroma FE 2019-01-04 15:35:41 +00:00
Wim Vanderbauwhede
fe2dceb66d Patch to support image descriptions in Pleroma FE 2019-01-04 15:22:02 +00:00
kaniini
d9d62a110c Merge branch 'mr/retry-queue-remove-fold' into 'develop' 
rewrites List.foldl to Enum.each in RetryQueue

See merge request pleroma/pleroma!621
 2019-01-03 22:30:02 +00:00
rinpatch
b73a1a33de Merge branch 'captcha' into 'develop' 
Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
 2019-01-03 17:04:27 +00:00
Michael Loftis
943211b035 rewrites List.foldl to Enum.each 2019-01-02 21:21:40 +00:00
Maxim Filippov
48e81d3d40 Add RichMediaController and tests 2019-01-02 17:02:50 +03:00
sxsdv1
4e1cc2bab6 Implement delete activity 2019-01-01 23:20:43 +01:00
sxsdv1
551c3d9391 Split create activity specifics from update_outbox 2019-01-01 23:20:28 +01:00
Maxim Filippov
917d48d09b Better variable name 2019-01-01 23:29:47 +03:00
Maxim Filippov
2aab4e03c3 Add OGP parser 2019-01-01 23:26:40 +03:00
kaniini
32bed66471 Merge branch 'pool-usage' into 'develop' 
Update of hackney and tesla, removal of superflous default options.

See merge request pleroma/pleroma!614
 2019-01-01 20:12:34 +00:00
rinpatch
34fa709015 Merge branch 'configurable-federator' into 'develop' 
Make Federator options configurable.

See merge request pleroma/pleroma!615
 2019-01-01 18:55:59 +00:00
lambda
32541172cd Merge branch 'cleanup/admin-api-useless-if' into 'develop' 
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete

See merge request pleroma/pleroma!612
 2019-01-01 13:48:59 +00:00
lain
400337b0a7 Make Federator options configurable. 2019-01-01 14:46:55 +01:00
lain
096a927805 Merge remote-tracking branch 'origin/develop' into pool-usage 2019-01-01 14:19:55 +01:00
lain
d4799e0dc2 Remove default pool, it's used automatically anyway. 2019-01-01 13:49:24 +01:00
Haelwenn (lanodan) Monnier
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete 2018-12-31 19:50:14 +01:00
kaniini
90e157ef80 Merge branch 'features/admin-api-user-views' into 'develop' 
User/Account views: Add rights.admin

Closes #472

See merge request pleroma/pleroma!589
 2018-12-31 15:49:34 +00:00
William Pitcock
980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
lambda
33e3a7ba7d Merge branch 'fix/scrubber-cache' into 'develop' 
[#481] Store scrubbed posts in Cachex

Closes #481

See merge request pleroma/pleroma!610
 2018-12-31 09:56:26 +00:00
Rin Toshaka
7e09c2bd7d Move scrubber cache-related functions to Pleroma.HTML 2018-12-31 08:19:48 +01:00
kaniini
8e7da98b18 Merge branch 'mr/retry-queue' into 'develop' 
Improves RetryQueue behavior

See merge request pleroma/pleroma!609
 2018-12-30 21:47:50 +00:00
Rin Toshaka
dec23500d8 Resolve merge conflict 2018-12-30 21:00:40 +01:00
Rin Toshaka
c119ea3a57 Friendship ended with Postgresql now Cachex is my best friend 2018-12-30 20:00:01 +01:00
Rin Toshaka
535fddd286 Friendship ended with Postgresql now Cachex is my best friend 2018-12-30 19:33:36 +01:00
Rin Toshaka
d9f40b05b3 Added get_stripped_html_for_object. Renamed a few things 2018-12-30 16:51:16 +01:00
Michael Loftis
cb286fdeba Improves RetryQueue behavior 
reduces to one single timer firing once a second
switches to a parallel worker model
 2018-12-30 15:16:26 +00:00
Rin Toshaka
bce152aba0 Tidy up the code. Rename key to signature 2018-12-30 15:58:19 +01:00
Rin Toshaka
66d1c31461 Fix some stupid typos 2018-12-30 13:51:01 +01:00
sxsdv1
f40562b4e1 Respond with full activity to outbox post 2018-12-30 12:01:39 +01:00
sxsdv1
1e781715c8 Limit activity types accepted to outbox to only 'Create' 2018-12-30 12:01:39 +01:00
sxsdv1
569bad8210 Create activity when client posts to outbox 2018-12-30 12:01:39 +01:00
sxsdv1
26dc2dddab Implement ActivityPub inbox view 
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
 2018-12-30 12:01:39 +01:00
Rin Toshaka
a32e23905a Use Object.change instead of Ecto.Changeset.change 2018-12-30 11:08:19 +01:00
sxsdv1
aa082ca7b6 Wire up stub routes for client calls of activitypub inbox/outbox 
Code style: remove wrapping function of outbox
 2018-12-29 22:22:03 +01:00
Rin Toshaka
9a0163db53 use Kernel.put_in instead of Map.merge 2018-12-29 21:50:34 +01:00
Rin Toshaka
19f9889fbe I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD 2018-12-29 17:45:50 +01:00
kaniini
3dc5f04976 Merge branch 'carrot-bullying' into 'develop' 
Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595
 2018-12-29 11:46:06 +00:00
kaniini
dd8f2196f6 Merge branch '483_blocks_import_export' into 'develop' 
[#483] Blocked users list import & export

Closes #483

See merge request pleroma/pleroma!603
 2018-12-29 11:34:51 +00:00
Maksim Pechnikov
523848d1fd Salmon# fixed publish an activity to remote accounts 2018-12-29 12:48:54 +03:00
Ivan Tashkinov
67b4297f4d [#483] Refactored blocks and follows import, added tests. 2018-12-29 12:02:37 +03:00
kaniini
49cf5f9ce0 Merge branch '471_invalid_accounts_rendering' into 'develop' 
[#471] Prevented rendering of inactive local accounts

Closes #471

See merge request pleroma/pleroma!599
 2018-12-29 03:03:18 +00:00
Ivan Tashkinov
700661b761 [#483] Blocked users list import (TwitterAPI). 2018-12-28 23:01:03 +03:00
Ivan Tashkinov
0a41786624 [#467] Refactored valid / invalid user rendering. 2018-12-28 22:47:42 +03:00
kaniini
68f483ef4c Merge branch 'fix/no-attachment-links' into 'develop' 
Treat any present value in "no_attachment_links" as true

Closes pleroma-fe#175

See merge request pleroma/pleroma!597
 2018-12-28 18:33:14 +00:00
Ivan Tashkinov
6e9a15b181 [#483] Blocked users export for TwitterAPI. 2018-12-28 21:08:07 +03:00
Haelwenn (lanodan) Monnier
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin 2018-12-28 17:38:32 +01:00
Ivan Tashkinov
0d1788ce44 [#471] Factored out User.visible_for?/2. 2018-12-28 14:35:25 +03:00
Vyr Cossont
d8cc96cb1f Fix Twitter timelines for private instances 2018-12-27 22:43:40 -08:00
kaniini
cff0292d4b Merge branch 'reserve-user-names' into 'develop' 
Reserve a few user names

See merge request pleroma/pleroma!594
 2018-12-27 19:35:06 +00:00
Ivan Tashkinov
e6aeb1d4a5 [#471] Prevented rendering of inactive local accounts. 2018-12-27 15:46:18 +03:00
Maxim Filippov
be70272ab0 Treat only true and "true" as true 2018-12-27 13:21:04 +03:00
Vyr Cossont
e4562105e7 Implement exclude_reblogs and include_rts 2018-12-26 21:38:00 -08:00
Maxim Filippov
838c024231 Treat any present value in "no_attachment_links" as true 2018-12-27 02:39:41 +03:00
lain
551d80cc01 Expose restricted names in nodeinfo. 2018-12-26 12:46:16 +01:00
lain
5811e65e67 Add some hard limits on inserted activities. 2018-12-26 12:39:35 +01:00
William Pitcock
2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
lambda
005b4194ff Merge branch 'bugfix/trans_fix_url_videos' into 'develop' 
Fix "url" of Videos in transmogrifier

Closes #367

See merge request pleroma/pleroma!459
 2018-12-23 14:46:58 +00:00
William Pitcock
34a4ed22c4 twitter api: add "Video" to supported activity types list 2018-12-23 14:00:54 +00:00
William Pitcock
79b51a97fe twitter api: activity representer: remove peertube hack 2018-12-23 14:00:50 +00:00
William Pitcock
32dfc1d12a mastodon api: status view: remove obsolete peertube hack 2018-12-23 13:40:33 +00:00
William Pitcock
71f6d9f418 transmogrifier: significantly rework handling of peertube videos, add test 2018-12-23 13:31:08 +00:00
lambda
a3e33fa177 Merge branch 'hotfix/activity-without-content' into 'develop' 
Twitter ActivityView: fix crash with activity without content

See merge request pleroma/pleroma!572
 2018-12-23 13:17:25 +00:00
Haelwenn (lanodan) Monnier
3aff8067e4 transmogrifier: When it’s a Video move "url" to "attachment" 2018-12-23 13:00:25 +00:00
Karen Konou
a7f07bb6e5 Implement kaniini's tweaks 2018-12-23 12:24:53 +01:00
Karen Konou
c76179419d Renamed the things 2018-12-23 11:14:29 +01:00
Karen Konou
409ff60bf8 Fix formatting 2018-12-22 23:32:38 +01:00
Karen Konou
92362e1e22 Implement large thread filter 2018-12-22 23:18:31 +01:00
Ekaterina Vaartis
336e37d98f Make captcha (kocaptcha) stateless 
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
 2018-12-21 09:55:47 +03:00
kaniini
2e2030ada8 Merge branch '114_email_confirmation' into 'develop' 
[#114] Email confirmation

See merge request pleroma/pleroma!546
 2018-12-20 13:28:36 +00:00
Ivan Tashkinov
f69cbf4755 [#114] Added :user_id component to email confirmation path to improve the security. 
Added tests for `confirm_email` action.
 2018-12-20 13:41:30 +03:00
Ivan Tashkinov
8adcd1e80f [#114] Removed flash messages rendering on redirects. 2018-12-20 13:05:42 +03:00
kaniini
fda148a9a2 Merge branch 'documentation/copy-pleroma-api' into 'develop' 
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints

See merge request pleroma/pleroma!571
 2018-12-20 04:01:54 +00:00
raeno
652f49d176 Remove extra bracket 2018-12-19 23:06:10 +04:00
raeno
7fb3780431 Merge branch 'develop' into oembed_provider 2018-12-19 22:39:44 +04:00
Ivan Tashkinov
b520d44b58 [#114] mix format 2018-12-19 19:03:39 +03:00
Ivan Tashkinov
279096228c [#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users 
unless requested by admin or moderator.
 2018-12-19 18:56:52 +03:00
Ivan Tashkinov
968d7490b6 [#114] User.Info: renamed confirmation_update to confirmation_changeset. 2018-12-19 16:31:03 +03:00
Ivan Tashkinov
59fc5d15df [#114] User.Info: renamed confirmation_update to confirmation_change. 2018-12-19 16:27:16 +03:00
lain
f3eb414e28 Add a way to use the admin api without a user. 2018-12-18 21:08:52 +01:00
Haelwenn (lanodan) Monnier
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex 2018-12-18 17:05:36 +01:00
href
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil 2018-12-18 15:34:27 +01:00
Ivan Tashkinov
3371a45884 [#114] Formatting fix. 2018-12-18 17:30:30 +03:00
Ivan Tashkinov
b096e30cff [#114] Added email confirmation resend action. Added tests 
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
 2018-12-18 17:22:46 +03:00
Ivan Tashkinov
aed0f90287 [#114] Added pleroma.confirmation_pending to user views, adjusted view tests. 2018-12-18 17:22:45 +03:00
Ivan Tashkinov
b86057cc7f [#114] Refactored User.register_changeset to init confirmation data. 
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
 2018-12-18 17:22:42 +03:00
Ivan Tashkinov
1de0aa2f10 [#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed. 2018-12-18 17:21:05 +03:00
Ivan Tashkinov
a05cb10a95 [#114] Email confirmation route, action, node setting, User.Info fields. 2018-12-18 17:18:53 +03:00
raeno
a300336459 Merge branch 'develop' into oembed_provider 2018-12-18 14:59:32 +01:00
href
b1860fe85a
Instance/Static runtime plug 
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.

If the files are not present in the directory, the bundled ones in
priv/static will be used.
 2018-12-17 22:50:59 +01:00
lambda
3d980daa49 Merge branch '459_fix_user_profile_crash' into 'develop' 
Fix update_profile failing due to OAuth token record in assigns instead of string

Closes #459

See merge request pleroma/pleroma!561
 2018-12-17 20:16:15 +00:00
Maksim Pechnikov
92a5133c42 fix text field 2018-12-17 22:53:16 +03:00
lambda
52ac7dce5c Merge branch 'captcha' into 'develop' 
Captcha

See merge request pleroma/pleroma!550
 2018-12-17 19:45:14 +00:00
lambda
078b8b6d22 Merge branch 'phoenix14' into 'develop' 
Upgrade to Phoenix 1.4

Closes #451

See merge request pleroma/pleroma!560
 2018-12-17 19:30:05 +00:00
href
77b5154c82
Cowboy handler for Mastodon WebSocket 2018-12-17 17:06:18 +01:00
raeno
cc87880488 Support both OAuth token record and token string in UserView 2018-12-17 16:02:26 +01:00
lambda
567359790e Merge branch 'testfix/webfinger-jrd' into 'develop' 
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test

See merge request pleroma/pleroma!554
 2018-12-17 09:19:27 +00:00
href
5dcb7aecea
More put_view. 2018-12-16 17:51:22 +01:00
href
f672555ad3
Upgrade to Phoenix 1.4 2018-12-16 17:15:07 +01:00
eal
28478a9c4f Merge branch 'fix/masto-put-settings' into 'develop' 
Mastodon API: Fix PUT /api/web/settings

See merge request pleroma/pleroma!557
 2018-12-16 11:21:26 +00:00
eal
4c783e35c0 Mastodon API: Fix PUT /api/web/settings 2018-12-16 13:15:34 +02:00
Ekaterina Vaartis
23549d3952 Formatting fixes 2018-12-15 22:08:26 +03:00
Haelwenn (lanodan) Monnier
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test 2018-12-15 17:56:12 +01:00
lambda
cc6689cc20 Merge branch 'fix/views-ignore-unhandled-activites' into 'develop' 
TwitterAPI.ActivityView: Ignore unhandled activities

See merge request pleroma/pleroma!547
 2018-12-15 15:23:51 +00:00
Ekaterina Vaartis
28c43a417e Add an ability to disabled captcha 2018-12-15 03:12:47 +03:00
Ekaterina Vaartis
a2399c1c7c Add base CAPTCHA support (currently only kocaptcha) 2018-12-15 03:12:44 +03:00
href
e74f384b68 Merge branch 'fix/issue_433' into 'develop' 
[#433] fix markdown formatting

See merge request pleroma/pleroma!545
 2018-12-14 20:30:35 +00:00
href
bfe27c1b55 Merge branch '114_email_invites' into 'develop' 
[#114] Email invites

See merge request pleroma/pleroma!541
 2018-12-14 20:22:24 +00:00
href
acec11626d Merge branch 'fix/issue_272' into 'develop' 
[#272] fix tags

See merge request pleroma/pleroma!540
 2018-12-14 20:20:30 +00:00
Maksim Pechnikov
ea72ac549b fix case when tags is invalid 2018-12-14 23:16:12 +03:00
raeno
b0c3211984 Scrub html from activity.content or user.bio for opengraph meta 2018-12-14 21:07:06 +01:00
raeno
90b00701ff Merge branch 'develop' into oembed_provider 2018-12-14 20:28:35 +01:00
Maksim Pechnikov
d3ec09bb38 fix tags 2018-12-14 22:09:04 +03:00
raeno
46486595ff Handle "users/:id" links as well. Fix comments in MR. 2018-12-14 19:55:40 +01:00
href
980131b4db Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' 
Improve web push

Closes #393, #422, and #452

See merge request pleroma/pleroma!524
 2018-12-14 18:50:44 +00:00
href
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities 2018-12-14 18:09:59 +01:00
href
412df2cd38
Warn if push is disabled.. 2018-12-14 16:19:28 +01:00
Maksim Pechnikov
baead4ea4b fix markdown formatting 2018-12-14 16:03:58 +03:00
href
91236c60c7 Merge branch 'feature/file-size-checking' into 'develop' 
[#36] Add warnings when file upload fails

See merge request pleroma/pleroma!523
 2018-12-14 13:00:24 +00:00
href
0b4c61e8d5
Fix warning 2018-12-14 13:56:42 +01:00
href
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1 2018-12-14 13:22:10 +01:00
href
331396cbcd
Properly disable Web Push if no VAPID key is set 2018-12-14 13:05:51 +01:00
href
6822916183
Typos 2018-12-14 13:05:51 +01:00
href
b1bcd97a0f
Push: respect alerts settings 2018-12-14 13:05:49 +01:00
href
d8984b7bf8
Push: add missing notification_type field 2018-12-14 13:05:48 +01:00
href
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe 2018-12-14 13:05:47 +01:00
Egor Kislitsyn
324933a0ac
improve push message format (compatibility with mastodon) 2018-12-14 13:05:46 +01:00
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs 2018-12-14 13:05:29 +01:00
Ivan Tashkinov
69fd63e248 [#114] Added invitesEnabled to metadata of nodeinfo. 2018-12-14 14:13:13 +03:00
Ivan Tashkinov
66380b0641 [#114] Removed confirm_email action stub (to be addressed in a separate MR). 2018-12-14 14:01:00 +03:00
Ivan Tashkinov
9666376f5f [#114] Readded invites_enabled config setting, updated readme. 2018-12-14 12:37:06 +03:00
Ivan Tashkinov
a89e3b4b60 [#114] Moved email_invite action to AdminAPIController, adjusted tests. 2018-12-14 12:28:23 +03:00
Ivan Tashkinov
3cbf16a5fe [#114] Added UserInviteToken creation, adjusted invitation email link to include it. 2018-12-14 12:28:22 +03:00
Ivan Tashkinov
cc83d7ffe7 [#114] Naive implementation of email invitations. 2018-12-14 12:28:14 +03:00
href
30dc81667c Merge branch '114_user_registration_emails' into 'develop' 
[#114] User registration emails

Closes #114

See merge request pleroma/pleroma!531
 2018-12-14 09:16:03 +00:00
Ivan Tashkinov
f81213910f [#114] Addressed MR comments. Removed functionality to be extracted to other MRs. 2018-12-14 12:09:55 +03:00
lambda
262cc6d44b Merge branch 'fix/double-rt-or-fav' into 'develop' 
Prevent accidental double RTs or favorites

See merge request pleroma/pleroma!542
 2018-12-14 08:26:08 +00:00
eal
61ad2ce422 TwitterAPI: Include favorited post in json 2018-12-14 08:24:18 +02:00
eal
1ca080c862 Prevent accidental double RTs or favorites 2018-12-14 07:56:49 +02:00
raeno
c5c3ad90d0 Fix tests. Remove oembed template 2018-12-14 03:00:50 +01:00
raeno
b5de7c4c4d Remove oembed for now, will submit it in another MR. Fix warnings 2018-12-13 22:34:15 +01:00
raeno
018516d3f3 Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links 2018-12-13 22:21:14 +01:00
raeno
9b3a6cdb07 Extract opengraph/oembed into separate module 2018-12-13 22:17:53 +01:00
raeno
d903e34cac Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata 2018-12-13 22:17:53 +01:00
raeno
8902942128 WIP. Implement oembed route and handle both json/xml for "Note" type activity 2018-12-13 22:17:53 +01:00
raeno
21afdf6d99 Insert meta tags into static index.html on the fly for OStatus#notice 2018-12-13 22:17:53 +01:00
Ivan Tashkinov
18b9467d1a [#114] Removed email_invite implementation (to be addressed separately). 2018-12-13 16:22:42 +03:00
Ivan Tashkinov
00744c6b03 [#114] Initial implementation of user email invitations. 2018-12-13 14:30:48 +03:00
Ivan Tashkinov
908943352f [#114] Refactored password_reset (moved to TwitterAPI). Added homepage links to password reset result pages. 2018-12-13 13:17:49 +03:00
Ivan Tashkinov
bfff2399ff [#114] Routes and config for confirm_email and email_invite (Twitter API). 2018-12-12 20:15:43 +03:00
Ivan Tashkinov
e3a21bcd45 [#114] Addressed warnings. Fix of with statement clause in password_reset. 2018-12-12 17:14:31 +03:00
Ivan Tashkinov
f5afb11032 [#114] Initial implementation of user password reset emails (user-initiated). 2018-12-12 17:04:39 +03:00
Ivan Tashkinov
12905ce1ad [#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples. 2018-12-12 17:02:41 +03:00
Maksim Pechnikov
89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
scarlett
213176c3c3 Add new frontend options to server-side config. 2018-12-10 23:15:01 +00:00
lambda
ff10b9927b Merge branch 'support/bugfix_272' into 'develop' 
[#272] fix hashtags in api

See merge request pleroma/pleroma!510
 2018-12-10 19:05:16 +00:00
lain
c81c74d847 Treat warnings as errors outside of tests. 2018-12-10 19:13:53 +01:00
Maksim Pechnikov
e94c3442f4 updates 2018-12-10 13:27:37 +03:00
Maksim Pechnikov
074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
Maksim Pechnikov
068353ac0b formatting 2018-12-09 11:24:46 +03:00
Maksim Pechnikov
9442588ae9 fix hashtags in api response 2018-12-09 11:24:46 +03:00
Rin Toshaka
15616eda5e Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content 2018-12-08 21:48:49 +01:00
lambda
beadeaffa1 Merge branch 'fix/nodeinfo-nil-features' into 'develop' 
Nodeinfo: remove null features; relay feature.

See merge request pleroma/pleroma!520
 2018-12-08 09:12:06 +00:00
href
bdc8112e40
Media proxy: fix url encoding 2018-12-07 21:57:59 +01:00
Rin Toshaka
578051809f Add uploadlimit to Twitter API config 2018-12-07 20:03:30 +01:00
lambda
94ac0075bf Merge branch 'media-proxy-follow-redirect' into 'develop' 
Media proxy: follow HTTP redirects by default

Closes #421

See merge request pleroma/pleroma!519
 2018-12-07 18:48:26 +00:00
href
134cc94cbd
Nodeinfo: remove null features; relay feature. 2018-12-07 19:44:45 +01:00
href
d8fcf7c5cf
Media proxy: follow HTTP redirects by default 2018-12-07 19:36:44 +01:00
lambda
94d8f1ab30 Merge branch '394_user_tags' into 'develop' 
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
 2018-12-07 18:25:38 +00:00
Ivan Tashkinov
6ed5044c4e [#394] Refactoring (using Ecto.Multi; "untag" route change). 2018-12-07 11:04:39 +03:00
Ivan Tashkinov
7a2162bbcb [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. 2018-12-06 22:26:25 +03:00
Ivan Tashkinov
7bcb6a183a [#394] Refactoring. 2018-12-06 20:23:16 +03:00
Ivan Tashkinov
7b19487389 [#394] Added users.tags and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
kaniini
1d531fd2f3 Merge branch 'fix/mastodon-api-settings' into 'develop' 
Fix put_settings and remove info_changeset

See merge request pleroma/pleroma!507
 2018-12-06 16:01:58 +00:00
kaniini
abead01ab6 Merge branch 'correct-and-improve-http-options' into 'develop' 
Correct and improve http options

See merge request pleroma/pleroma!505
 2018-12-06 15:57:56 +00:00
kaniini
b0adea30b3 Merge branch 're-mrf' into 'develop' 
Add a MRF Policy for appending re: to identical subjects in replies.

See merge request pleroma/pleroma!499
 2018-12-06 15:36:41 +00:00
rinpatch
2ae1128d9f MastoAPI: Fix put_settings 2018-12-06 17:42:07 +03:00
scarlett
d27e3f269f Rename regular expression 'have_re' to 'reply_prefix'. 2018-12-06 14:00:41 +00:00
Egor Kislitsyn
6f36e903b0 use User.avatar_url 2018-12-06 20:55:46 +07:00
Egor Kislitsyn
79668c08fc cleanup 2018-12-06 20:50:20 +07:00
scarlett
3dff61ebec Harden re: detection. 2018-12-06 13:48:12 +00:00
Egor Kislitsyn
3d492795b7 clean up 2018-12-06 20:42:00 +07:00
Egor Kislitsyn
4944498133 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
 2018-12-06 20:15:16 +07:00
Egor Kislitsyn
bac58b1524 show warning if VAPID is not set 2018-12-06 19:56:56 +07:00
Egor Kislitsyn
8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock
 2018-12-06 19:55:58 +07:00
Egor Kislitsyn
04a48286e6 Add web push support 2018-12-06 19:29:04 +07:00
scarlett
6a6aaa0e1a Use object.normalize. 2018-12-06 11:37:29 +00:00
Hakaba Hitoyo
a09ed0f5af avoid mix format bug 2018-12-06 18:41:29 +09:00
kaniini
ccf0b46dd6 Merge branch '210_twitter_api_uploads_alt_text' into 'develop' 
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.

See merge request pleroma/pleroma!496
 2018-12-06 07:36:21 +00:00
Ivan Tashkinov
3e90f688f1 [#210] Mastodon: actor storing for media uploads, ownership check to update_media. 
Refactoring.
 2018-12-06 10:26:17 +03:00
Hakaba Hitoyo
96ba95df2e remove follow_redirect options 2018-12-06 11:38:33 +09:00
Hakaba Hitoyo
27792b2d77 remove pool and timeout options which duplicate with the default 2018-12-06 11:23:15 +09:00
Hakaba Hitoyo
505d820827 Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options 2018-12-06 10:48:05 +09:00
lain
76d6b1c6ab Merge remote-tracking branch 'origin' into follower-hiding 2018-12-05 21:27:56 +01:00
lain
3ea4476445 MastodonAPI: Show users their own network. 2018-12-05 21:25:06 +01:00
lain
fdac215091 TwitterAPI: Show users their own network. 2018-12-05 21:14:06 +01:00
Ivan Tashkinov
3b5be09f45 [#210] Stylistic change. 2018-12-05 21:48:21 +03:00
lain
839526a913 TwitterAPI: Add network hiding. 2018-12-05 19:22:40 +01:00
Ivan Tashkinov
c4f3c5e939 [#210] Stylistic change. 2018-12-05 20:23:28 +03:00
Ivan Tashkinov
848151f7cb [#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check 
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
 2018-12-05 13:37:06 +03:00
Ivan Tashkinov
be187f82f7 [#210] Further refactoring. 2018-12-05 11:48:50 +03:00
hakabahitoyo
a418547bdf debug /api/v1/suggestions 2018-12-05 16:08:34 +09:00
scarlett
8a1df182cf Add a MRF Policy for appending re: to identical subjects in replies. 2018-12-04 23:35:07 +00:00
kaniini
ec1ec32f20 Merge branch 'optional-retry-queue' into 'develop' 
Make retry queue optional.

See merge request pleroma/pleroma!498
 2018-12-04 19:00:18 +00:00
lain
925b05054f Make retry queue optional. 
At the moment, it can use a lot of memory really fast.
 2018-12-04 19:54:42 +01:00
kaniini
114b95cee2 Merge branch 'feature/integration_tesla' into 'develop' 
[#354] Move all http interactions to Tesla

See merge request pleroma/pleroma!487
 2018-12-04 18:41:00 +00:00
William Pitcock
b57d83e3c9 MRF: simple policy: fix media removal 2018-12-04 18:30:01 +00:00
Ivan Tashkinov
48e6193bf2 [#210] Refactoring. 2018-12-04 19:24:41 +03:00
Ivan Tashkinov
826fc446d5 [#210] TwitterAPI: implemented /api/media/metadata/create 
to allow uploads description (alt text) setting.
 2018-12-04 18:35:57 +03:00
Maksim Pechnikov
87109482f3 status_code -> status 2018-12-04 14:04:06 +03:00
Maksim Pechnikov
97252a27d9 fix http request in Salmon 2018-12-04 14:04:06 +03:00
Maksim Pechnikov
3ce16e5a56 init tesla and updated the http requests in Pleroma.Web.Websub 2018-12-04 14:03:32 +03:00
lambda
88b05aeabb Merge branch 'fix/parse-user-bio' into 'develop' 
Parse user's bio on register

See merge request pleroma/pleroma!492
 2018-12-03 16:31:00 +00:00
lambda
42ef7cd227 Merge branch 'fix-media-proxy-defaults' into 'develop' 
Fix media proxy config defaults

See merge request pleroma/pleroma!495
 2018-12-03 16:14:58 +00:00
Maxim Filippov
4b70e5eae9 Parse bio for MastodonAPI 2018-12-03 18:59:50 +03:00
Maxim Filippov
ce98d5eb9b Parse user's bio on register 2018-12-02 22:03:53 +03:00
lain
8c9a4e8b40 TwitterAPI: Implement hide_network. 2018-12-02 18:14:13 +01:00
lain
2a639de9b3 MastodonApi: Implement hide_network. 2018-12-02 17:48:00 +01:00
lain
6be0ab1e55 Hide network in ap. 2018-12-02 17:35:32 +01:00
href
43d5e4f7fa
Fix media proxy config defaults 2018-12-02 11:24:02 +01:00
lain
f18b86fd5f More fixes for Info schema. 2018-12-01 12:46:08 +01:00
lain
93f2dc19d9 TwitterAPI: Fix banner and background update. 2018-12-01 12:01:22 +01:00
lain
347df6421d Fix masto api user updating. 2018-12-01 10:40:01 +01:00
lain
c443c9bd72 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-12-01 09:55:46 +01:00
lain
1c67277c80 Fix admin api. 2018-12-01 09:03:16 +01:00
href
680716b3c9
Config docs 2018-11-30 18:02:51 +01:00
href
02d3dc6869
Uploads fun, part. 2 2018-11-30 18:02:37 +01:00
href
b19597f602
reverse proxy / uploads 2018-11-30 18:00:47 +01:00
lain
d0ec2812bd Merge remote-tracking branch 'origin' into validate-user-info 2018-11-30 17:34:20 +01:00
lain
8f1fffebc6 Fix transmogrifier test. 2018-11-30 17:31:05 +01:00
lain
d088ac6286 Fix OStatus user updates. 
Breaks banner updating.
 2018-11-30 17:21:58 +01:00
lain
48b95a9b95 Assorted fixes. 2018-11-30 17:08:02 +01:00
lain
d407f662af Fix TwitterApiController. 2018-11-30 17:07:37 +01:00
lain
a6812bc9df Remove "most recent notification" endpoint. 2018-11-30 16:47:37 +01:00
KokaKiwi
87098d1676 Streamer: Don't send unwanted DMs to list streams 2018-11-27 20:50:19 +01:00
lain
3c61df6b9e Webfinger fixes. 2018-11-27 18:31:44 +01:00
lain
ec464ef20a HTTP sig fixes. 2018-11-27 17:42:45 +01:00
Haelwenn
5ae6088d37 Merge branch 'feature/mrf-user-allowlist' into 'develop' 
MRF: user allowlist module

See merge request pleroma/pleroma!477
 2018-11-27 00:12:03 +00:00
William Pitcock
271f9f1335 nodeinfo: add mrf_user_allowlist data 2018-11-26 23:52:19 +00:00
William Pitcock
8c05d19c7f MRF: add user allowlist module 2018-11-26 23:51:58 +00:00
Mark Felder
6cc94404d7 Replace this hardcoded <title> 2018-11-26 22:51:25 +00:00
Haelwenn (lanodan) Monnier
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation 2018-11-24 08:45:45 +01:00
Haelwenn (lanodan) Monnier
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level 2018-11-24 06:43:03 +01:00
Haelwenn (lanodan) Monnier
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints 
reported by soka on CRTNet
 2018-11-24 06:13:36 +01:00
kaniini
675653ceb7 Merge branch 'feature/admin-api' into 'develop' 
Add a admin API

See merge request pleroma/pleroma!366
 2018-11-22 00:28:04 +00:00
kaniini
182e3e8da2 Merge branch 'feature/improve-version' into 'develop' 
Improved version string

See merge request pleroma/pleroma!467
 2018-11-21 16:53:38 +00:00
kaniini
a591a044a9 Merge branch 'runtime-fixes' into 'develop' 
Various runtime configuration fixes

See merge request pleroma/pleroma!468
 2018-11-20 22:25:35 +00:00
lain
0bea0308f1 Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-11-20 20:16:16 +01:00
lain
0896cf4c0f Fix most mastodon api bugs. 2018-11-20 20:12:39 +01:00
Haelwenn
c7d08bc1cf Merge branch 'feature/retry-queue' into 'develop' 
Federator: add retry queue.

See merge request pleroma/pleroma!323
 2018-11-20 19:04:52 +00:00
William Pitcock
3456948cd1 mastodon api: fix up quite a few test failures 2018-11-20 19:02:23 +00:00
William Pitcock
ef6c64a5d2 activitypub: fix restrict_blocked() 2018-11-20 18:58:08 +00:00
William Pitcock
c196754b4d mastodon api: account view: fix tests 2018-11-20 18:54:48 +00:00
William Pitcock
ece8656733 streamer: fix fetching the user's block list 2018-11-20 18:47:12 +00:00
William Pitcock
4ac849cb4a common api: fix moderator check when deleting posts 2018-11-20 18:42:28 +00:00
lain
6f0b9a5163 Fix Notification tests. 2018-11-20 19:15:28 +01:00
href
bc5cf2c192
Improved version string 2018-11-20 17:55:03 +01:00
href
7f4c3a1e99
mediaproxy: fix empty url & add some tests 2018-11-20 17:50:03 +01:00
eal
689b46efc8 RetryQueue: tiny refractor, add tests 2018-11-19 18:08:41 +02:00
href
bcecdc3ab1
Various runtime configuration fixes 2018-11-19 10:09:24 +01:00
lain
fbb70d25fe Several twitter api fixes. 2018-11-18 22:36:47 +01:00
lain
40d9d2098c Fix user updating from AP. 2018-11-18 22:15:03 +01:00
lain
cafa15131a Mix format. 2018-11-18 21:41:35 +01:00
lain
4c918392c6 Fix most User tests. 2018-11-18 21:40:52 +01:00
lain
e7cd6e9739 Fix setting of keys. 2018-11-18 19:33:43 +01:00
eal
62299be094 Federator: add retry queue. 2018-11-18 17:46:29 +02:00
William Pitcock
f6be980f4f activitypub: object view: avoid leaking private details 2018-11-17 22:30:53 +00:00
William Pitcock
98795172a7 ostatus controller: respond with AS2 objects instead of activities to notice URIs 2018-11-17 22:10:15 +00:00
William Pitcock
dfcfb184b1 activitypub: transmogrifier: make deletes secure 2018-11-17 21:22:57 +00:00
Haelwenn (lanodan) Monnier
0ca00b3a07
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit 2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier
12ccf0c4f8
Change Relay from status to {status, message} 2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier
4634d99d0d
Web.Router: Change right to permission group (except for function names) 2018-11-17 22:12:13 +01:00
William Pitcock
0d1375f274 federator: return :ok or :error depending on if an AP doc was accepted or not 2018-11-17 21:00:37 +00:00
William Pitcock
3d9266a8cb federator: do origin containment when processing inbound messages 2018-11-17 20:43:43 +00:00
William Pitcock
c88533209c activitypub: user fetching: use fetch_and_contain_remote_object_from_id() 2018-11-17 20:16:03 +00:00
William Pitcock
daa8ec3d62 activitypub: factor out AP object fetching to it's own function and add ID-based containment 2018-11-17 20:15:59 +00:00
Haelwenn (lanodan) Monnier
e0b0fde713
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names) 2018-11-17 20:25:57 +01:00