Commit graph

2190 commits

Author SHA1 Message Date
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
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
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
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
lain
0fae04c4e3 Add a setting for users to autofollow on sign up. 2019-01-08 09:57:53 +01: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
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
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
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
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
William Pitcock
eb1a18d22f user: check that the follow request actually has an active account associated with it
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
2019-01-02 22:47:12 +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