kaniini [Thu, 10 Jan 2019 18:42:36 +0000 (18:42 +0000)]
Merge branch 'activitypub-dereference-activity-id' into 'develop'
Support activity+json request for activity
See merge request pleroma/pleroma!641
kaniini [Thu, 10 Jan 2019 18:09:56 +0000 (18:09 +0000)]
Merge branch 'feature/add-twitter-card-parser' into 'develop'
Add Twitter Card parser
See merge request pleroma/pleroma!643
Maxim Filippov [Thu, 10 Jan 2019 18:09:56 +0000 (18:09 +0000)]
Add Twitter Card parser
kaniini [Thu, 10 Jan 2019 18:03:32 +0000 (18:03 +0000)]
Merge branch 'twapi-follower-pagination' into 'develop'
Twapi follower pagination
See merge request pleroma/pleroma!648
Haelwenn [Thu, 10 Jan 2019 03:54:29 +0000 (03:54 +0000)]
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
William Pitcock [Thu, 10 Jan 2019 03:46:34 +0000 (03:46 +0000)]
test: common api: add tests for format_input/4
William Pitcock [Thu, 10 Jan 2019 03:45:58 +0000 (03:45 +0000)]
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
ok @lanodan
William Pitcock [Thu, 10 Jan 2019 02:22:11 +0000 (02:22 +0000)]
common api: fix newlines in markdown code blocks
kaniini [Thu, 10 Jan 2019 02:39:53 +0000 (02:39 +0000)]
Merge branch 'feature/pinned-posts' into 'develop'
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
kaniini [Thu, 10 Jan 2019 02:33:11 +0000 (02:33 +0000)]
Merge branch 'mass-follow' into 'develop'
Mass follow
See merge request pleroma/pleroma!642
kaniini [Thu, 10 Jan 2019 02:31:29 +0000 (02:31 +0000)]
Merge branch 'dm-optimizations' into 'develop'
Add activity visibility index.
See merge request pleroma/pleroma!646
kaniini [Thu, 10 Jan 2019 01:08:33 +0000 (01:08 +0000)]
Merge branch 'fix-alphasort' into 'develop'
Alpha sort the restricted nicknames
See merge request pleroma/pleroma!650
Mark Felder [Thu, 10 Jan 2019 00:06:03 +0000 (00:06 +0000)]
Alpha sort the restricted nicknames
rinpatch [Wed, 9 Jan 2019 18:42:00 +0000 (18:42 +0000)]
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
Rich media: Remove :commit since a tuple is already returned
See merge request pleroma/pleroma!649
rinpatch [Wed, 9 Jan 2019 18:35:01 +0000 (21:35 +0300)]
Remove :commit since a tuple is already returned
lain [Wed, 9 Jan 2019 17:17:23 +0000 (18:17 +0100)]
Add integer casts.
lain [Wed, 9 Jan 2019 17:14:32 +0000 (18:14 +0100)]
TwitterAPI: Add follower/following pagination.
lambda [Wed, 9 Jan 2019 16:26:38 +0000 (16:26 +0000)]
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
lain [Wed, 9 Jan 2019 16:18:37 +0000 (17:18 +0100)]
Add test for summary_html
lain [Wed, 9 Jan 2019 15:55:05 +0000 (16:55 +0100)]
Build the index concurrently.
lain [Wed, 9 Jan 2019 15:45:09 +0000 (16:45 +0100)]
Add activity visibility index.
Egor Kislitsyn [Wed, 9 Jan 2019 12:54:37 +0000 (19:54 +0700)]
improve tests
Egor Kislitsyn [Wed, 9 Jan 2019 12:54:19 +0000 (19:54 +0700)]
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
```
Egor Kislitsyn [Wed, 9 Jan 2019 10:40:15 +0000 (17:40 +0700)]
only non-reblogs, self-authored, public statuses can be pinned
lain [Wed, 9 Jan 2019 10:38:45 +0000 (11:38 +0100)]
Use follow_all in autofollow.
lain [Wed, 9 Jan 2019 10:35:23 +0000 (11:35 +0100)]
Add User mass following function.
Egor Kislitsyn [Wed, 9 Jan 2019 10:02:30 +0000 (17:02 +0700)]
move defaults from sample_config.exs to config.exs
Egor Kislitsyn [Wed, 9 Jan 2019 09:56:31 +0000 (16:56 +0700)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
# Conflicts:
# docs/config.md
sxsdv1 [Tue, 8 Jan 2019 22:22:15 +0000 (23:22 +0100)]
Support activity+json request for activity
kaniini [Wed, 9 Jan 2019 07:09:39 +0000 (07:09 +0000)]
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
William Pitcock [Wed, 9 Jan 2019 07:03:32 +0000 (07:03 +0000)]
test: user: add tests for visible_for?/2
William Pitcock [Wed, 9 Jan 2019 06:50:31 +0000 (06:50 +0000)]
tests: user: add tests for superuser?/1
William Pitcock [Wed, 9 Jan 2019 06:45:17 +0000 (06:45 +0000)]
user: fix auth_active?/1 for remote users
William Pitcock [Wed, 9 Jan 2019 06:41:25 +0000 (06:41 +0000)]
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.
William Pitcock [Wed, 9 Jan 2019 06:36:50 +0000 (06:36 +0000)]
user: remove entirely redundant remote_or_auth_active?/1.
auth_active?/1 can check remote users and return true directly.
William Pitcock [Wed, 9 Jan 2019 06:21:21 +0000 (06:21 +0000)]
user: harden auth_active?/1, superuser?/1, visible_for?/1
William Pitcock [Wed, 9 Jan 2019 05:02:00 +0000 (05:02 +0000)]
tests: user: add regression test for remote_or_auth_active?/1
William Pitcock [Wed, 9 Jan 2019 04:46:03 +0000 (04:46 +0000)]
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
rinpatch [Tue, 8 Jan 2019 22:58:19 +0000 (22:58 +0000)]
Merge branch 'autofollow' into 'develop'
Add a setting for users to autofollow on sign up.
See merge request pleroma/pleroma!639
Egor Kislitsyn [Tue, 8 Jan 2019 09:32:07 +0000 (16:32 +0700)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
Egor Kislitsyn [Tue, 8 Jan 2019 09:11:03 +0000 (16:11 +0700)]
add default configuration for the pinned statuses and some doc
Egor Kislitsyn [Tue, 8 Jan 2019 09:01:35 +0000 (16:01 +0700)]
improve test readability
lain [Tue, 8 Jan 2019 08:55:33 +0000 (09:55 +0100)]
Add a setting for users to autofollow on sign up.
Egor Kislitsyn [Tue, 8 Jan 2019 08:32:06 +0000 (15:32 +0700)]
fix test
Egor Kislitsyn [Tue, 8 Jan 2019 08:27:02 +0000 (15:27 +0700)]
add `pinned` property to `StatusView`
Egor Kislitsyn [Tue, 8 Jan 2019 08:25:50 +0000 (15:25 +0700)]
rename `post` to `status`
kaniini [Mon, 7 Jan 2019 22:25:02 +0000 (22:25 +0000)]
Merge branch 'features/syslog_logger' into 'develop'
Add logging to syslog
See merge request pleroma/pleroma!622
kaniini [Mon, 7 Jan 2019 20:39:46 +0000 (20:39 +0000)]
Merge branch 'spc-fix-2' into 'develop'
Actually put some onformation in the error user, make it actually properly parse in conversations.
See merge request pleroma/pleroma!638
lain [Mon, 7 Jan 2019 19:59:30 +0000 (20:59 +0100)]
Actually put some onformation in the error user, make it actually properly parse
in conversations.
kaniini [Mon, 7 Jan 2019 17:09:52 +0000 (17:09 +0000)]
Merge branch 'resilient-user-view' into 'develop'
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
Egor Kislitsyn [Mon, 7 Jan 2019 13:55:32 +0000 (20:55 +0700)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
Egor Kislitsyn [Mon, 7 Jan 2019 13:45:33 +0000 (20:45 +0700)]
add pinned posts
lambda [Mon, 7 Jan 2019 12:20:15 +0000 (12:20 +0000)]
Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop'
Scarlett/pleroma search visibility check
See merge request pleroma/pleroma!635
lain [Mon, 7 Jan 2019 12:13:37 +0000 (13:13 +0100)]
MastoAPI: Add test.
lain [Mon, 7 Jan 2019 11:41:31 +0000 (12:41 +0100)]
Make TwAPI UserView more resilient to issues.
Will work for missing users and badly migrated users.
scarlett [Mon, 7 Jan 2019 10:30:30 +0000 (10:30 +0000)]
Check visible_for_user when performing a search using a direct link.
scarlett [Sun, 6 Jan 2019 10:16:40 +0000 (10:16 +0000)]
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.
Haelwenn (lanodan) Monnier [Wed, 2 Jan 2019 22:07:48 +0000 (23:07 +0100)]
config/config.exs: Add syslog backends
Haelwenn (lanodan) Monnier [Wed, 2 Jan 2019 21:57:37 +0000 (22:57 +0100)]
Install ex_syslogger
kaniini [Sat, 5 Jan 2019 22:54:25 +0000 (22:54 +0000)]
Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop'
Add check to prevent multiple follow notifications from the same user
Closes #397
See merge request pleroma/pleroma!591
Sadposter [Sat, 5 Jan 2019 22:54:25 +0000 (22:54 +0000)]
Add check to prevent multiple follow notifications from the same user
kaniini [Sat, 5 Jan 2019 22:34:47 +0000 (22:34 +0000)]
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
kaniini [Sat, 5 Jan 2019 22:33:38 +0000 (22:33 +0000)]
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
kaniini [Sat, 5 Jan 2019 22:29:08 +0000 (22:29 +0000)]
Merge branch 'activitypub-tombstone-fix' into 'develop'
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
scarlett [Sat, 5 Jan 2019 21:52:02 +0000 (21:52 +0000)]
Merge branch 'emoji-in-summary' into 'develop'
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
scarlett [Sat, 5 Jan 2019 21:46:42 +0000 (21:46 +0000)]
Add tests for emoji and lack of HTML in summaries.
scarlett [Sat, 5 Jan 2019 18:25:36 +0000 (18:25 +0000)]
Remove redundant comma.
scarlett [Sat, 5 Jan 2019 18:20:42 +0000 (18:20 +0000)]
Resolve some test failures.
scarlett [Sat, 5 Jan 2019 17:35:39 +0000 (17:35 +0000)]
add some brakets to the emoji list.
scarlett [Sat, 5 Jan 2019 17:28:47 +0000 (17:28 +0000)]
Strip HTML in and allow emoji in summaries.
sxsdv1 [Sat, 5 Jan 2019 09:38:38 +0000 (10:38 +0100)]
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
cascode [Sat, 5 Jan 2019 04:32:55 +0000 (20:32 -0800)]
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
rinpatch [Fri, 4 Jan 2019 23:56:42 +0000 (23:56 +0000)]
Merge branch 'feature/rich-media-cachex' into 'develop'
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
William Pitcock [Fri, 4 Jan 2019 23:50:54 +0000 (23:50 +0000)]
rich media: disable cachex in test mode
kaniini [Fri, 4 Jan 2019 23:35:56 +0000 (23:35 +0000)]
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
William Pitcock [Fri, 4 Jan 2019 23:23:47 +0000 (23:23 +0000)]
rich media: use cachex to avoid flooding remote servers
Rin Toshaka [Fri, 4 Jan 2019 23:25:31 +0000 (00:25 +0100)]
oopsies
Rin Toshaka [Fri, 4 Jan 2019 23:19:46 +0000 (00:19 +0100)]
Different caches based on the module. Remove scrubber version since it is not relevant anymore
spctrl [Fri, 4 Jan 2019 21:11:46 +0000 (22:11 +0100)]
fix 486: Add option --assume-yes to allow it to work non-interactive
kaniini [Fri, 4 Jan 2019 20:50:18 +0000 (20:50 +0000)]
Merge branch 'feature/rich-media' into 'develop'
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
kaniini [Fri, 4 Jan 2019 20:32:10 +0000 (20:32 +0000)]
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
cascode [Fri, 4 Jan 2019 18:18:43 +0000 (10:18 -0800)]
formatted
cascode [Fri, 4 Jan 2019 18:14:13 +0000 (10:14 -0800)]
added test for #499
cascode [Fri, 4 Jan 2019 09:35:26 +0000 (01:35 -0800)]
handle null
kaniini [Thu, 3 Jan 2019 22:30:02 +0000 (22:30 +0000)]
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
kaniini [Thu, 3 Jan 2019 22:29:36 +0000 (22:29 +0000)]
Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'
Remove media proxy examples in config/config.exs
See merge request pleroma/pleroma!624
href [Thu, 3 Jan 2019 19:20:11 +0000 (20:20 +0100)]
Remove media proxy examples in config/config.exs
1. this was overriding the real defaults
2. it's documented in `config/config.md`
kaniini [Thu, 3 Jan 2019 18:53:30 +0000 (18:53 +0000)]
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
rinpatch [Thu, 3 Jan 2019 17:04:27 +0000 (17:04 +0000)]
Merge branch 'captcha' into 'develop'
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
rinpatch [Thu, 3 Jan 2019 08:59:05 +0000 (08:59 +0000)]
Merge branch 'fix-chat' into 'develop'
Add handler for Phoenix-style socket.
See merge request pleroma/pleroma!619
William Pitcock [Wed, 2 Jan 2019 22:47:12 +0000 (22:47 +0000)]
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.
Michael Loftis [Tue, 1 Jan 2019 15:40:57 +0000 (15:40 +0000)]
rewrites List.foldl to Enum.each
rinpatch [Wed, 2 Jan 2019 16:23:46 +0000 (16:23 +0000)]
Merge branch 'fix/reserve-media-username' into 'develop'
Reserve /media
See merge request pleroma/pleroma!620
Rin Toshaka [Wed, 2 Jan 2019 16:16:26 +0000 (17:16 +0100)]
reserve /media
Maxim Filippov [Wed, 2 Jan 2019 14:02:50 +0000 (17:02 +0300)]
Add RichMediaController and tests
lain [Wed, 2 Jan 2019 10:39:11 +0000 (11:39 +0100)]
Add handler for Phoenix-style socket.
sxsdv1 [Tue, 1 Jan 2019 22:19:40 +0000 (23:19 +0100)]
Implement delete activity
sxsdv1 [Tue, 1 Jan 2019 21:16:46 +0000 (22:16 +0100)]
Split create activity specifics from update_outbox
Maxim Filippov [Tue, 1 Jan 2019 20:29:47 +0000 (23:29 +0300)]
Better variable name
Maxim Filippov [Tue, 1 Jan 2019 20:26:40 +0000 (23:26 +0300)]
Add OGP parser
projects / akkoma / log