1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
2019-04-10 06:33:19 +02:00
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
2019-04-09 23:20:31 +03:00
a53d591ac5
code style
2019-04-06 20:47:05 +07: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
47b07cec49
token -> invite renaming
2019-04-06 20:24:22 +07:00
be54e40890
twitter api registration
...
fix for twitter api tests
2019-04-06 17:18:59 +07:00
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
2019-04-05 15:19:44 +03:00
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02 20:39:52 +07:00
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
2019-04-02 12:47:40 +00:00
9e0567ec52
Merge develop into feature/770-add-emoji-tags
2019-04-02 19:16:29 +07:00
88d3cb44c3
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
2019-04-02 17:47:02 +07: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
f20e8d28de
add support for all status type (ostatus) and replase case with if
2019-04-02 12:18:00 +05:45
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
2019-04-02 10:26:09 +05:45
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
2019-04-01 22:26:58 +05:45
3601f03147
Adding tag to emoji ets table
...
changes in apis
2019-04-01 17:17:57 +07:00
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
406d19331f
Remove ActivityRepresenter
2019-03-26 17:16:21 +03:00
1b33986bfa
Fix text being nullable in TwitterAPI
2019-03-23 00:10:50 +03: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
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
a2e03d4f3c
Initial attempt at updating return type
2019-03-18 13:56:59 +00:00
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
2019-03-13 20:28:36 +03:00
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
2019-03-13 04:26:56 +01: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
4c440f12c3
[Credo] Fix the consistency
2019-03-13 04:17:30 +01:00
22ac2288be
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-03-04 20:48:43 +07:00
10248d86a2
Merge branch 'unify-follow' into 'develop'
...
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
2019-03-04 13:25:32 +00:00
eb84de0143
allow users to disable their own account
2019-03-04 19:55:11 +07:00
86e4b48a5e
Fix DM visibility for blocking users
2019-03-04 06:24:27 +03:00
594694607c
Unify Mastodon and Twitter follow implementations using CommonAPI
2019-03-04 01:00:37 +03:00
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
2019-03-03 18:42:27 +03:00
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
2019-03-03 11:13:59 +00:00
5b08b470f6
Add "local" params to users search
2019-03-01 20:13:02 +03:00
2f00814475
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
...
Bugfix #236 Prefer user look-up by nickname
See merge request pleroma/pleroma!860
2019-03-01 09:48:24 +00:00
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
2019-03-01 09:37:29 +03:00
72b7a0797e
Use Mastodon API views in Admin API
2019-02-28 17:43:09 +03:00
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
2019-02-28 10:22:19 +00:00
6b11011039
Added deactivated to the user view
2019-02-28 09:08:34 +03:00
2883f75a3a
Add pagination to users admin API
2019-02-28 01:11:56 +03:00
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
2019-02-27 17:24:51 +01:00
9ade1242c2
Add user muted status info to twitterapi.
2019-02-27 16:52:03 +01:00
90d0d055fc
Add more admin actions
2019-02-27 00:13:38 +03:00
efa506b874
delegate user retrieval to the User module
2019-02-24 13:23:47 -05:00
9e0686efa6
Move visibility into own module.
2019-02-22 13:29:52 +01:00
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
2019-02-18 04:02:41 +00:00
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
2019-02-18 04:01:26 +00:00
94708d6370
Render only "id", "valid_until" and "app_name" in TokenView
2019-02-17 23:57:35 +03:00
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
2019-02-16 17:01:15 +01:00
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
2019-02-15 12:20:20 +03:00
62a45bdc11
Add revoke token
2019-02-13 12:59:56 +03:00
61a4bc5095
Add OAuth tokens endpoint
2019-02-13 12:59:56 +03:00
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
2019-02-11 08:07:39 +00:00
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
2019-02-10 20:54:21 +00:00
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
2019-02-09 22:01:08 +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
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
2019-02-06 22:34:44 +00:00
035eaeb9b8
Allow to configure visibility for admin and moderator badges
2019-02-06 06:18:05 +03:00
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
2019-02-06 02:10:06 +03:00
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
2019-02-03 21:55:04 +03:00
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
2019-02-01 20:22:58 +00:00
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
2019-02-01 17:05:29 +00:00
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
50d6183893
Split hide_network into hide_followers & hide_followings
2019-01-28 21:40:08 +03:00
8e8a1e1ba8
Return new-style config if old-style config is set to false.
...
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
2019-01-28 13:07:12 +01:00
8e42251e06
rich media: add helpers module, use instead of MastodonAPI module
2019-01-28 06:04:54 +00:00
07a9a891ad
twitter api: fix up activity representer
2019-01-28 05:53:17 +00:00
5d895093fd
twitter api: embed card in twitterapi posts
2019-01-28 05:53:17 +00:00
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
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
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
9274cabe01
Use correct logic to determine "attentions" list
2019-01-24 23:30:43 +03:00
4333fea1dc
Send "hide_network" in user_view
2019-01-23 19:47:51 +03:00
e221c681dc
New frontend configuration mechanism.
2019-01-23 12:40:57 +01:00
973c9eed18
Treat User.Info pinned ids as strings
2019-01-23 11:26:37 +01:00
28d77e373c
Flake Ids for Users and Activities
2019-01-23 11:26:27 +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
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
651a1d64b5
Add current user to mentioned
2019-01-19 04:25:15 +03:00
943324b661
MastoAPI: Don't break on missing users.
2019-01-16 15:13:09 +01:00
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
2019-01-14 20:04:45 +03:00
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
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
a99e156f2c
Add integer casts.
2019-01-09 18:17:23 +01:00
7ac152ed38
TwitterAPI: Add follower/following pagination.
2019-01-09 18:14:32 +01:00
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
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
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
2019-01-07 20:59:30 +01:00
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
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
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
6556be344d
Resolve some test failures.
2019-01-05 18:20:42 +00:00
0787f0dfbe
Strip HTML in and allow emoji in summaries.
2019-01-05 17:28:47 +00:00
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
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
2019-01-05 00:19:46 +01:00
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
2019-01-03 17:04:27 +00:00
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
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
2018-12-31 08:19:48 +01:00
dec23500d8
Resolve merge conflict
2018-12-30 21:00:40 +01:00
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
2018-12-30 19:33:36 +01:00
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
2018-12-30 16:51:16 +01:00
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
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
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
2018-12-29 12:02:37 +03:00
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
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
2018-12-28 23:01:03 +03:00
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
2018-12-28 22:47:42 +03:00
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
2018-12-28 21:08:07 +03:00
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
2018-12-28 17:38:32 +01:00
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
2018-12-28 14:35:25 +03:00
d8cc96cb1f
Fix Twitter timelines for private instances
2018-12-27 22:43:40 -08:00
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
2018-12-27 15:46:18 +03:00
e4562105e7
Implement exclude_reblogs and include_rts
2018-12-26 21:38:00 -08:00
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
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
34a4ed22c4
twitter api: add "Video" to supported activity types list
2018-12-23 14:00:54 +00:00
79b51a97fe
twitter api: activity representer: remove peertube hack
2018-12-23 14:00:50 +00:00
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
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
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
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
2018-12-20 13:05:42 +03:00
b520d44b58
[ #114 ] `mix format`
2018-12-19 19:03:39 +03:00
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
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
2018-12-19 16:31:03 +03:00
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
2018-12-19 16:27:16 +03:00
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
2018-12-18 15:34:27 +01:00
3371a45884
[ #114 ] Formatting fix.
2018-12-18 17:30:30 +03:00
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
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
2018-12-18 17:22:45 +03:00
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
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
2018-12-18 17:21:05 +03:00
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
2018-12-18 17:18:53 +03:00
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
92a5133c42
fix text field
2018-12-17 22:53:16 +03:00
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
2018-12-17 19:45:14 +00:00
cc87880488
Support both OAuth token record and token string in UserView
2018-12-17 16:02:26 +01:00
f672555ad3
Upgrade to Phoenix 1.4
2018-12-16 17:15:07 +01:00
23549d3952
Formatting fixes
2018-12-15 22:08:26 +03:00
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
28c43a417e
Add an ability to disabled captcha
2018-12-15 03:12:47 +03:00
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
2018-12-15 03:12:44 +03:00
Haelwenn (lanodan) Monnier