Commit Graph

2532 Commits

Author SHA1 Message Date
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
Ivan Tashkinov 79e44042bc [#477] User trigram index adjustment. 2019-01-18 10:57:42 +03:00
Ivan Tashkinov ed8f55ab8e [#477] User: FTS and trigram search results mixing (to handle misspelled requests). 2019-01-18 10:35:45 +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 98d9dcd509 Merge branch '502_instance_stats_active_users_count_fix' into 'develop'
[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users

Closes #502

See merge request pleroma/pleroma!678
2019-01-17 19:27:15 +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
Ivan Tashkinov 954dc4a4ad [#502] Fixed `user_count` in `/api/v1/instance` to include only active local users. 2019-01-17 19:16:02 +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
rinpatch 388ceb6a7d Fix the issue with get_by_nickname never being called 2019-01-17 19:00:08 +03:00
Mark Felder 8c368d42a2 Make attachment links configurable
Thanks @href!
2019-01-17 15:48:14 +00:00
Ivan Tashkinov 2bfae25a1f [#491] Made user bio preserve full nicknames (nick@host). 2019-01-17 18:03:49 +03: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 9a90b5d91a oof 2019-01-16 18:01:17 +03:00
rinpatch 8a9f089812 remove id cast 2019-01-16 17:58:11 +03:00
rinpatch 5a08dee379 cache ap_id in id instead of caching user two times 2019-01-16 17:44:08 +03:00
rinpatch 82cf9b9751 forgot to remove this thing 2019-01-16 17:16:28 +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
lambda 608cc65d43 Merge branch 'feature/improve-microformats' into 'develop'
improve microformats support

See merge request pleroma/pleroma!672
2019-01-16 09:06:47 +00:00
lambda da4b670451 Merge branch '518_instance_stats_fix' into 'develop'
[#518] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers

Closes #518

See merge request pleroma/pleroma!673
2019-01-16 08:59:40 +00: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
Ivan Tashkinov 90433b988e [#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses. 2019-01-16 11:07:46 +03:00
rinpatch bfe2a11a6b Add config doc 2019-01-16 10:45:56 +03:00
Ivan Tashkinov 0bc6d30f7d [#477] Minor refactoring (user search query). 2019-01-16 10:44:32 +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
William Pitcock 461ab9489d formatter: improve microformats markup 2019-01-16 03:54:01 +00:00
William Pitcock 1ddab78247 html: allow microformats-related markup through the html filter 2019-01-16 03:54:01 +00: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
lambda 9a444c0d22 Merge branch 'bugfix/websub-hardening' into 'develop'
websub: improve error handling

See merge request pleroma/pleroma!670
2019-01-15 20:02:56 +00:00
rinpatch 2e630bea0d Add twitter card, filter nsfw 2019-01-15 23:00:22 +03:00
William Pitcock 2d3241753f http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else 2019-01-15 19:31:13 +00: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
Ivan Tashkinov 5b8f9ff8c1 [#477] User search tests. Normalized search rank in User.search. 2019-01-15 13:05:25 +03:00
rinpatch 2858fd2da2 add a fallback function 2019-01-15 12:11:07 +03:00
rinpatch 6f23139864 please don't bully me for this 2019-01-15 12:02:55 +03:00
rinpatch 4587a5712a cringe 2019-01-15 11:59:05 +03:00
rinpatch ce15e0659e Fix some edge cases [nervous laughter] 2019-01-15 11:56:35 +03:00
lambda 646bb87816 Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'
Fix Elixir 1.8 type annotation issue

Closes #523

See merge request pleroma/pleroma!668
2019-01-15 08:51:59 +00:00
rinpatch 4656f433f9 Move metadata.ex out of ostatus 2019-01-15 11:00:17 +03:00
Haelwenn (lanodan) Monnier 9fcdca1bdc
Upload: Fix uploading with a : in the filename 2019-01-15 07:57:48 +01:00
Haelwenn (lanodan) Monnier e3eb75bd23
Upload: Fix uploading with a ? in the filename 2019-01-15 07:40:39 +01:00
Maxim Filippov e8eff9fe03 Fix Elixir 1.8 type annotation issue 2019-01-15 02:58:48 +02:00
rinpatch f20bfc9ea5 Merge branch 'media-url-escape' into 'develop'
URI escape file upload URLs

See merge request pleroma/pleroma!665
2019-01-14 18:52:23 +00: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
Shadowfacts 42b7584068
URI escape file upload URLs 2019-01-14 11:31:44 -05: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
rinpatch 5f9786288d Prefer ids to usernames 2019-01-14 09:52:52 +03: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 f85d108c41 Merge branch 'mass-follow' into 'develop'
Mass follow

See merge request pleroma/pleroma!642
2019-01-10 02:33:11 +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
lain 65fc2df7cc Use follow_all in autofollow. 2019-01-09 11:38:45 +01:00
lain 26938d65fd Add User mass following function. 2019-01-09 11:35:23 +01:00
Egor Kislitsyn 28afcb7c31 move defaults from sample_config.exs to config.exs 2019-01-09 17:02:30 +07:00
Egor Kislitsyn 48591aab98 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
# Conflicts:
#	docs/config.md
2019-01-09 16:56:31 +07:00
sxsdv1 20c0dd1e24 Support activity+json request for activity 2019-01-09 09:33:30 +01:00
kaniini 5c5c8508c2 Merge branch 'hotfix/media-proxy-uri' into 'develop'
user: fix local vs remote determination in remote_or_auth_active?/1

See merge request pleroma/pleroma!640
2019-01-09 07:09:39 +00:00
William Pitcock f15183178c user: fix auth_active?/1 for remote users 2019-01-09 06:45:17 +00:00
William Pitcock 0015d43e13 user: factor out illogical User.Info.superuser?/1.
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
2019-01-09 06:44:50 +00:00
William Pitcock 74f48beec3 user: remove entirely redundant remote_or_auth_active?/1.
auth_active?/1 can check remote users and return true directly.
2019-01-09 06:36:50 +00:00
William Pitcock 2af67353c5 user: harden auth_active?/1, superuser?/1, visible_for?/1 2019-01-09 06:21:21 +00:00
William Pitcock 595a970493 user: use pattern matching to determine if user is local or remote instead of the previous hairy logic 2019-01-09 06:02:18 +00: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 6428ef77ad add default configuration for the pinned statuses and some doc 2019-01-08 16:11:03 +07:00
lain 0fae04c4e3 Add a setting for users to autofollow on sign up. 2019-01-08 09:57:53 +01:00
Egor Kislitsyn e679da4c34 add `pinned` property to `StatusView` 2019-01-08 15:27:02 +07:00
Egor Kislitsyn 63dbd87568 rename `post` to `status` 2019-01-08 15:25:50 +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
Sadposter 042852ecf3 Add check to prevent multiple follow notifications from the same user 2019-01-05 22:54:25 +00:00
kaniini 8d047c7a72 Merge branch 'fix/user-search-null-name' into 'develop'
fix user search results for users with unset display name

Closes #499

See merge request pleroma/pleroma!625
2019-01-05 22:34:47 +00:00
kaniini 0b54c3d643 Merge branch 'fix_486' into 'develop'
fix 486: Add option --assume-yes to allow mix pleroma.user to work non-interactive

See merge request pleroma/pleroma!627
2019-01-05 22:33:38 +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
cascode a81307251c Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name 2019-01-04 20:32:55 -08: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 1e2d58982e oopsies 2019-01-05 00:25:31 +01: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
spctrl 4aa977d3b3 fix 486: Add option --assume-yes to allow it to work non-interactive 2019-01-04 22:11: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
cascode 5b23dfa1c5 handle null 2019-01-04 01:35:26 -08: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
kaniini eaaf701319 Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
user: check that the follow request actually has an active account associated with it

See merge request pleroma/pleroma!623
2019-01-03 18:53:30 +00:00