fd287387a0
Do not notify subscribers for messages from users which are replies to others
2019-07-23 13:14:26 -05:00
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
2019-07-15 19:47:23 +00:00
ee5250ae56
Merge branch 'sha512-crypt' into 'develop'
...
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
2019-07-15 16:13:17 +00:00
de13c9bb8f
List messages must be visible for mentioned users
2019-07-15 14:54:40 +07:00
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
a87c313309
Support `list` visibility in StatusView
2019-07-15 14:00:29 +07:00
dce8ebc9ea
Unfollow should also unsubscribe
2019-07-14 19:25:03 +00:00
f98f7ad1b9
detect and use sha512-crypt for stored password hash.
2019-07-14 09:48:42 -07:00
958fb9aa80
Add "listMessage"
2019-07-11 16:36:08 +07:00
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
5104f65b69
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
2019-06-29 22:27:42 +03:00
d53fb55bb7
Return correct response when reply to a direct message is not direct itself
2019-06-26 10:59:27 +00:00
c4e4f7d0e4
Add proper error handling for when the post exceeds character limits
2019-06-18 05:05:05 +03:00
e1370ba131
Utils: Use update_follow_state_for_all when appropriate.
2019-06-05 16:51:28 +02:00
076c9ae40e
User: Remove superfluous `maybe_follow`.
2019-06-05 14:24:31 +02:00
ddd4a09b72
Fix merge conflict
2019-06-05 17:55:00 +07:00
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 17:53:15 +07:00
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
2019-06-05 08:28:20 +00:00
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 12:54:30 +07:00
17383861ed
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
2019-06-04 13:38:32 +03:00
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
80d4d83aac
CommonAPI: Add explicit addressing.
2019-06-03 18:17:08 +02:00
2fe3a20638
Make error message about author's inability to vote more sensible
2019-06-02 23:33:15 +03:00
e3c460353d
Refresh the object in CommonAPI.vote instead of MastoAPI controller
2019-06-02 23:24:48 +03:00
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
2019-06-01 16:17:46 +03:00
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
5f67c26baf
Accept strings in expires_in because sasuga javascript
2019-05-21 17:30:51 +03:00
a53d062730
Fix posting non-polls from mastofe
2019-05-21 14:19:03 +03:00
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
2019-05-21 10:54:20 +03:00
1d90f9b969
Remove tags/mentions/rich text from poll options because Mastodon and
...
add custom emoji
2019-05-19 17:06:44 +03:00
5ece901af3
Resolve merge conflicts and remove IO.inspects
2019-05-18 13:37:38 +03:00
fd920c8973
Mastodon API: Add support for posting polls
2019-05-18 13:29:28 +03:00
c4a55e167a
add Changelog entry
2019-05-17 23:00:14 +00:00
dc08159538
also suppress link previews from posts marked #nsfw
2019-05-17 22:13:24 +00:00
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
f2936e0a07
Add `ap_id` to List
2019-05-17 19:56:37 +07:00
7ed682213f
Fix/902 random compile failing
2019-05-17 07:25:20 +00:00
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-16 17:54:24 +07:00
7a92e701b9
CommonAPI: Visibility refactor.
2019-05-15 16:35:33 +02:00
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
2019-05-15 16:30:08 +02:00
e82e73478e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-14 19:00:07 +07:00
23276e8d68
Use pseudo ap id of a list in BCC
2019-05-13 16:15:14 +07:00
2f76a40d02
formatter.ex: Add get_emoji_map/1
2019-05-03 16:27:50 +02:00
a3dc02d282
Add addressable lists
2019-05-01 16:11:17 +07:00
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
2019-04-27 23:06:46 +03:00
501af917b5
add support for bbcode
2019-04-26 22:35:02 +00:00
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
2019-04-22 11:27:29 +03:00
b9cdf6d3b9
Use `User.get_cached*` everywhere
2019-04-22 07:20:43 +00:00
a53b917e7f
oof
2019-04-17 14:55:26 +03:00
ad681877df
Make credo happy
2019-04-17 14:52:01 +03:00
b09ae02c04
Added some more normalization calls all in mastodon api controller
2019-04-17 13:04:58 +03:00
462028688b
Fix pinned posts relying on embded objects
2019-04-17 12:34:19 +03:00
627e5a0a49
Merge branch 'develop' into feature/database-compaction
2019-04-17 12:22:32 +03:00
5d73dca064
Remove inReplyToStatusId
2019-04-15 11:50:36 +03:00
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12 19:25:53 +00:00
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
589629cf3e
Used cached user resources in subscriptions
2019-04-08 15:56:14 +01:00
76fdfd1c7f
Add check on activity visibility in sub notification
2019-04-07 15:11:29 +01:00
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
9ca91cbb87
Change relationship direction of subscriptions
2019-04-05 17:02:07 +01:00
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
2019-04-05 15:30:26 +01:00
007762e767
Add notification checks
2019-04-05 15:30:23 +01:00
79cb34a4b0
Fix preview not being usable in form data
2019-04-02 23:07:16 +03:00
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
2019-04-02 14:18:23 +00:00
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
2019-04-02 14:17:43 +00:00
9e0567ec52
Merge develop into feature/770-add-emoji-tags
2019-04-02 19:16:29 +07:00
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
2019-04-02 14:31:18 +03:00
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
2019-04-02 17:01:26 +07:00
4212527928
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
2019-04-02 16:50:31 +07:00
3db9235150
Ignore dates in wrong formats
2019-04-02 11:32:36 +02:00
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
2019-04-01 22:45:24 +02:00
3601f03147
Adding tag to emoji ets table
...
changes in apis
2019-04-01 17:17:57 +07:00
1bb4d5d65b
Implement fake status submit
2019-03-29 21:59:04 +03:00
a6973a668e
formatting
2019-03-23 00:28:16 +00:00
e75e43b949
common api: use the optimized Object.normalize whenever possible
2019-03-23 00:22:14 +00:00
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
c8f31e0bc2
Implement mastodon's reblog hiding feature
2019-03-15 14:18:21 +01:00
5c7b774f09
reports: unify sending e-mail for both remote and local reports
2019-03-14 19:44:08 +00:00
3b48d5f0c2
common api: add support for forwarding reports
2019-03-14 19:29:33 +00:00
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
2019-03-13 20:28:36 +03:00
c3d41b2b6e
[Credo] make all variables use snake_case
2019-03-13 04:26:56 +01:00
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
2827dfea50
Allow an admin to delete a user status
2019-03-08 20:21:56 +03:00
594694607c
Unify Mastodon and Twitter follow implementations using CommonAPI
2019-03-04 01:00:37 +03:00
5d961d536c
fix formatter
2019-02-27 15:40:30 +07:00
c3ac9424d2
AutoLinker
2019-02-26 23:32:26 +00:00
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
04b1c13554
Merge remote-tracking branch 'upstream/develop' into patch-image-description
2019-02-14 16:41:40 +00:00
ac72b578da
Merge branch 'develop' into feature/thread-muting
2019-02-11 12:10:49 +01:00
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
2019-02-11 12:04:02 +01:00
6a6a5b3251
de-group alias/es
2019-02-09 16:31:17 +01:00
60ea29dfe6
Credo fixes: alias grouping/ordering
2019-02-09 14:59:20 +01:00
106f4e7a0f
Credo fixes: parameter consistency
2019-02-09 14:59:20 +01:00
8bcfac93a8
Make credo happy
2019-02-09 14:59:20 +01:00
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
9274cabe01
Use correct logic to determine "attentions" list
2019-01-24 23:30:43 +03:00
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
2019-01-23 13:05:58 +01:00
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
9adc80afff
common api: set directMessage flag on our own posts
2019-01-20 02:27:48 +00:00
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
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
2019-01-18 09:30:16 +03:00
849c83ed46
formatting
2019-01-17 16:10:26 +00:00
6bc9a641ba
Default to disabled in the code in case the setting is absent from config.exs
2019-01-17 16:01:25 +00:00
8c368d42a2
Make attachment links configurable
...
Thanks @href!
2019-01-17 15:48:14 +00:00
b594a54d0c
unpin when deleting a status
2019-01-11 12:31:31 +07:00
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
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
2ecf81f10c
common api: fix newlines in markdown code blocks
2019-01-10 03:37:37 +00:00
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
2019-01-09 17:40:15 +07:00
380e9fba21
add pinned posts
2019-01-07 20:45:33 +07:00
3c86d907d4
add some brakets to the emoji list.
2019-01-05 17:35:39 +00:00
0787f0dfbe
Strip HTML in and allow emoji in summaries.
2019-01-05 17:28:47 +00:00
ba93396649
Patch to support image descriptions in Pleroma FE
2019-01-04 16:27:46 +00:00
4c95545d19
Patch to support image descriptions in Pleroma FE
2019-01-04 15:35:41 +00:00
fe2dceb66d
Patch to support image descriptions in Pleroma FE
2019-01-04 15:22:02 +00:00
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
be70272ab0
Treat only true and "true" as true
2018-12-27 13:21:04 +03:00
838c024231
Treat any present value in "no_attachment_links" as true
2018-12-27 02:39:41 +03:00
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
baead4ea4b
fix markdown formatting
2018-12-14 16:03:58 +03:00
1ca080c862
Prevent accidental double RTs or favorites
2018-12-14 07:56:49 +02:00
89b3729afa
fix warnings
2018-12-12 09:09:19 +03:00
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
d6e65f9304
common api: fix up improper Object.normalize() calls
2018-12-04 04:52:09 +00:00
67038ae15e
common api: utils: access inReplyTo object ID correctly
2018-12-04 04:52:09 +00:00
d6b266163b
common api: fetch visibility from normalized object
2018-12-04 04:52:09 +00:00
0896cf4c0f
Fix most mastodon api bugs.
2018-11-20 20:12:39 +01:00
6f0b9a5163
Fix Notification tests.
2018-11-20 19:15:28 +01:00
4e93d6ae14
common api: utils: flip to/cc for mentions
2018-11-08 19:17:01 +00:00
5bb88fd174
Runtime configuration
...
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
2018-11-06 19:41:15 +01:00
45ebc8dd9a
Check for empty string in_reply_to ids.
2018-11-02 17:33:51 +01:00
2bf358d7b4
activitypub: use Object.delete() instead of mutating the database and cache directly
2018-11-01 07:29:12 +00:00
558e6a84d6
[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/346
2018-11-01 06:52:01 +01:00
47f76bf4b1
common api: allow self-liking objects
...
mastodon allows this, for whatever reason.
closes #347 .
2018-10-31 22:29:49 +00:00
f407831120
common api: prefer formatting attachments using the attachment's name instead of URI
2018-10-29 17:59:24 +00:00
784b3a615d
utils: fix another possible leak with private S3 backends using mediaproxy
...
same rationale as the other mediaproxy changes
2018-10-29 17:26:15 +00:00
30efa86c05
common api: enable tag linking in markdown mode
2018-10-14 20:36:11 +00:00
111841ad34
common api: take the combination of the subject and content for length limit enforcement
...
closes #315
2018-10-10 07:53:44 +00:00
285ac80c36
config: allow for accepted post formats to be configured
2018-10-05 21:02:17 +00:00
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
2018-10-05 20:49:34 +00:00
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
2018-08-31 09:51:20 +00:00
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
2018-08-31 03:13:59 +00:00
63094cfd3e
Merge branch 'feature/emoji-in-local-users' into 'develop'
...
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
2018-08-26 23:24:41 +00:00
741c6ad671
common api: handle replying to orphaned threads
2018-08-26 22:37:36 +00:00
1495d04789
fix test for converting bio \r\n to <br>.
2018-08-21 14:51:27 +01:00
c033d2004b
formatting
2018-08-20 18:40:05 +00:00
145546e52a
common api: format hashtags in the same way as we format mentions
2018-08-20 18:39:47 +00:00
92caa2632b
Use Image type for emoji icons.
2018-08-13 16:21:18 +03:00
f9d13558c8
CommonAPI: add emoji to user source data on update
2018-08-13 15:27:20 +03:00
49da04c509
common api: use Object.normalize() instead of Object.get_by_ap_id() directly.
2018-06-27 13:07:35 +00:00
0f70e83e8c
Better error handling in TwitterApiController.
2018-06-03 19:11:22 +02:00
c41012053a
Merge branch 'feature/change-password' into 'develop'
...
Feature/change password
See merge request pleroma/pleroma!166
2018-05-24 17:16:37 +00:00
0b5bc62b33
Don't save double tags in AP objects we create
...
This crashed Mastodon workers.
2018-05-23 17:25:24 +02:00
d0690622cd
Added endpoint for changing passwords
2018-05-21 23:06:03 +01:00
98b36d359a
Fixed formatting and test
2018-05-13 15:43:42 +01:00
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
2018-05-13 14:36:02 +01:00
a16117225f
Added endpoint for user account deletion
2018-05-13 14:35:48 +01:00
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
2018-05-13 09:32:29 +00:00
636f0fa402
Clean up unused aliases and imports
2018-05-04 21:25:31 +00:00
ab4aa5720a
Fix a bunch of unused variable warnings
2018-05-04 20:59:01 +00:00
9e0dd21ed6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-25 00:46:28 -04:00
0574df273c
Small cleanup.
2018-04-22 10:01:10 +02:00
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-20 16:48:18 -04:00
ee6f15529d
CommonAPI post: kill \r with fire
2018-04-18 15:46:39 -05:00
b949577472
Add unrepeat functionality
2018-04-14 20:19:48 -04:00
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
675839e13c
Fix TwApi reply visibility.
2018-03-30 12:19:57 +02:00
eb7ce61ca5
Fix hashtags.
2018-03-24 11:03:10 +01:00
e9de04b74b
Add support for outgoing update.
2018-02-25 21:08:32 +01:00
8a47974217
Fix specs.
2018-02-25 18:11:03 +01:00
94db9ac4db
Merge branch 'develop' into feature/activitypub
2018-02-21 18:34:19 +01:00
eec6a87dbb
Allow moderators to delete posts.
2018-02-20 18:54:13 +01:00
c974f6544f
Show users their own posts in timeline.
2018-02-18 15:20:36 +01:00
2997fe1ba9
CommonAPI: If no visibility is given, return parent visibility.
2018-02-18 15:04:26 +01:00
d4b08dd838
MastodonAPI: Post with visibility settings
2018-02-18 14:56:36 +01:00
05ba6ca1b8
Do some transmogrifying for the output.
2018-02-17 14:11:20 +01:00
ae26604378
ActivityPub: Refactor create function.
2018-02-15 19:59:35 +01:00
4b06e46a3a
Merge branch 'fix/tootdon-mentions' into 'develop'
...
Fix Tootdon linking the whole status when mentioning someone.
See merge request pleroma/pleroma!39
2017-12-11 16:21:43 +00:00
b00e230760
Add a bunch of useless HTML to mentions.
2017-12-11 18:14:33 +02:00
35cfbf43a0
Merge branch 'fix/linkify' into 'develop'
...
Fix links with HTML elements and/or parentheses.
See merge request pleroma/pleroma!38
2017-12-08 12:34:03 +00:00
bf91e5659f
Fix HTML escape breaking some links.
2017-12-07 21:36:06 +02:00
5436dbaeaf
MastoAPI: don't add attachment links.
2017-12-07 20:44:09 +02:00
747a68a075
Treat internal emoji like external.
2017-11-20 17:53:21 +01:00
59770c3f5c
Fix all compilation warnings
2017-11-19 02:22:07 +01:00
ed3403ad8b
Merge branch 'formatting-fixes' into 'develop'
...
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
2017-11-18 15:58:44 +00:00
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
2017-11-18 16:30:18 +02:00
fb118b2978
Don't insert newlines to generated HTML.
...
MastoFE doesn't like them.
2017-11-18 14:46:54 +02:00
66e78c3ec4
Escape HTML instead of discarding it.
2017-11-18 14:43:41 +02:00
722c4614ad
Allow self-rt.
2017-11-07 16:45:27 +01:00
e014cc6ed8
Allow using cws in mastodon api.
2017-10-31 19:44:36 +01:00
4cbf17dac6
Save cws in the activitypub data.
2017-10-31 17:30:46 +01:00
4dcbb64f19
Avoid potentially slow count queries for user note count.
...
For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query.
2017-10-31 16:37:11 +01:00
2b980dea2f
Remove tag links for now, they break some regular links.
2017-09-17 23:03:03 +02:00
270c903220
Add tag links.
2017-09-17 15:21:44 +02:00
d659fcc195
MastoAPI: Fix date in account view.
2017-09-15 17:50:47 +02:00
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +02:00
d625d8db7d
Add unfav to Mastodon API.
2017-09-09 18:30:02 +02:00
454dc18570
Add favoriting to Mastodon API.
2017-09-09 18:09:37 +02:00
66e4c710d4
Add reblogging to MastodonAPI.
2017-09-09 17:48:57 +02:00
4dc517a0bb
Add deletion to masto api.
2017-09-09 13:56:51 +02:00
Mark Felder