b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
2019-04-02 12:43:28 +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
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
2019-04-02 14:05:34 +03:00
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
2019-04-02 10:57:38 +00:00
26d509cc86
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
2019-04-02 10:52:29 +00:00
95c92c49c9
Fix account lookup for nicknames beginning with numbers
2019-04-02 10:51:33 +00:00
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-02 13:50:12 +03: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
3db9235150
Ignore dates in wrong formats
2019-04-02 11:32:36 +02:00
a14742f495
add `user delete_activities` mix task
2019-04-02 16:30:11 +07:00
08d64b977f
little changes and typos
2019-04-02 16:13:34 +07:00
9b2188da7c
refactoring of emoji tags config to use groups
2019-04-02 15:44:56 +07:00
a1869f5272
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
2019-04-02 15:41:30 +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
f56eef8d8c
router: Add fake identity proof endpoint
2019-04-02 01:53:38 +02:00
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
2019-04-01 22:45:24 +02:00
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
2019-04-01 22:26:58 +05:45
6910fb371b
Fixed local MastoFE authentication / `force_login` option.
2019-04-01 17:25:25 +03:00
cbe09d94d1
Added `force_login` authentication option (previously applied by default).
2019-04-01 14:46:50 +03:00
17d3d05a71
code style
...
little fix
2019-04-01 17:54:30 +07:00
3601f03147
Adding tag to emoji ets table
...
changes in apis
2019-04-01 17:17:57 +07:00
fe5145eeaa
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
2019-04-01 12:25:53 +03:00
975482f091
insert object defaults for fake activities and make credo happy
2019-04-01 12:16:51 +03:00
d866b59eea
oof
2019-04-01 11:58:08 +03:00
45ba10bf47
Fix the issue with HTML scrubber
2019-04-01 11:55:59 +03:00
804173fc92
[ #923 ] Minor code readability fix.
2019-04-01 09:45:44 +03:00
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
2019-04-01 09:28:56 +03:00
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-01 08:49:32 +03:00
cd387f8693
Add a fake option to lazy_put_actvity_defaults
2019-03-30 13:57:54 +03:00
1bb4d5d65b
Implement fake status submit
2019-03-29 21:59:04 +03:00
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
2019-03-29 12:46:05 +00:00
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
2019-03-28 17:23:21 +01:00
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
2019-03-28 17:23:21 +01:00
e83ad12c57
pagination.ex: Drop atom keys in params
...
Atom keys could also have been transformed to string, or the other
way around but this one is more efficient and what we actually
expect with the current param_types in Pagination
2019-03-28 17:18:59 +01:00
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
2019-03-28 17:18:59 +01:00
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-28 07:52:07 +03:00
10c81fc902
Add user show endpoint for Pleroma admin API
2019-03-27 21:44:15 +03:00
3ca6c4f443
password reset page labels align
2019-03-27 22:37:20 +06:30
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
2019-03-27 15:41:40 +03:00
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
2019-03-27 15:39:35 +03:00
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
2019-03-27 12:28:53 +03:00
3cf7539bca
Add more user filters + move search to its own module
2019-03-27 03:51:59 +05:00
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
2019-03-26 23:27:37 +03:00
691d1208b5
Add GET /api/v1/apps/verify_credentials
2019-03-26 21:53:28 +03:00
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
2019-03-26 16:01:52 +00:00
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
2019-03-26 16:59:28 +01:00
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
2019-03-26 15:13:55 +00:00
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
406d19331f
Remove ActivityRepresenter
2019-03-26 17:16:21 +03:00
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
2019-03-26 16:27:17 +03:00
568e348588
Increment replies_count on replies (MastoAPI)
2019-03-26 15:27:04 +03:00
b0759f821b
Comments split.
2019-03-26 15:24:29 +03:00
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
2019-03-26 15:09:06 +03:00
c410296120
Try sending an empty map
2019-03-25 19:00:35 -05:00
6f090f981b
Attempt to fix incorrect federation of default instance avatars
2019-03-25 18:47:04 -05:00
b028b0f97d
Merge branch 'bugfix/missing-announces' into 'develop'
...
fix up missing announcements with preloads
See merge request pleroma/pleroma!972
2019-03-25 09:24:08 +00:00
26b0c802c3
fix up missing announcements with preloads
2019-03-25 07:38:09 +00:00
bc14c98de1
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
...
add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969
2019-03-25 02:25:59 +00:00
63ffa4842c
Merge branch 'fix/mastoapi-liked' into 'develop'
...
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
2019-03-25 02:24:27 +00:00
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
2019-03-25 02:15:45 +03:00
6c96d68f77
add overriding truncated_namespace condition for truncating paths for digital ocean
2019-03-24 11:32:09 -07:00
750de7d842
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
...
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
2019-03-24 15:02:13 +00:00
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
2019-03-24 15:47:50 +01:00
4aa699271c
activity: use left join instead of inner join when fetching activities that may or may not have a child object
2019-03-23 03:17:50 +00:00
332dc1371b
user: use preloads when deleting accounts
2019-03-23 03:06:00 +00:00
debf7f016d
ostatus: use preload objects with Object.normalize() when opportunistic
2019-03-23 03:05:57 +00:00
3c2350cbee
object: downgrade normalize warning to debug severity
2019-03-23 03:05:15 +00:00
8c70156157
activitypub: object view: use preloaded object when possible
2019-03-23 03:05:14 +00:00
f9d5c13b21
activity: add get_by_ap_id_with_object()
2019-03-23 03:05:13 +00:00
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
2019-03-23 03:05:10 +00:00
aabcecb269
notification: formatting
2019-03-23 02:30:53 +00:00
07cdd9ed02
streamer: use the preloaded object if possible
2019-03-23 02:29:01 +00:00
c62220c500
rich media: helpers: only crawl Create activities
2019-03-23 02:28:59 +00:00
9a06d9f6e8
notification: preload child objects
2019-03-23 02:28:57 +00:00
4cedf45423
relay: use preloaded object since we always have it
2019-03-23 02:28:56 +00:00
e430a71d37
ostatus: fetch preloaded object in note handler for testsuite
2019-03-23 01:17:26 +00:00
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
2019-03-23 01:09:12 +00:00
ba7299fc87
activitypub: add missing with_preloaded_object()
2019-03-23 00:53:35 +00:00
e4307cadc8
activitypub: splice in the child object if we have one
2019-03-23 00:40:08 +00:00
a6973a668e
formatting
2019-03-23 00:28:16 +00:00
59518cbcd8
activity: fix credo nitpick
2019-03-23 00:26:12 +00:00
b3bf523c09
rich media: use optimized Object.normalize()
2019-03-23 00:22:57 +00:00
e75e43b949
common api: use the optimized Object.normalize whenever possible
2019-03-23 00:22:14 +00:00
9aea7cc224
activitypub: preload child objects when fetching timelines
2019-03-23 00:10:17 +00:00
092cedede5
activity: add with_preloaded_object() convenience
2019-03-23 00:09:56 +00:00
62bccddde0
object: add support for preloading objects when walking an activity graph in normal form
2019-03-22 23:51:12 +00:00
1b33986bfa
Fix text being nullable in TwitterAPI
2019-03-23 00:10:50 +03:00
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
2019-03-22 11:03:56 +00:00
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
2019-03-22 11:57:20 +01:00
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
2019-03-22 08:39:49 +03:00
27e03a2177
reports: fix up email generation for remote reports
2019-03-22 01:17: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
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
2019-03-21 23:25:41 +00:00
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
bf8b29e080
Merge branch 'feature/move-search-to-db' into 'develop'
...
Move gluing search results from application to database and get mutuals a higher score multiplier
See merge request pleroma/pleroma!960
2019-03-21 21:41:04 +00:00
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
2019-03-21 23:16:32 +03:00
80bc9ed2ba
Add a gopher url port config option
...
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
2019-03-21 19:59:43 +03:00
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
2019-03-20 20:25:48 +03:00
19a19bdd81
Fix migration timestamp type
2019-03-20 16:04:59 +03:00
9a7b817c9a
Ecto 3.0.5 migration
...
kms
2019-03-20 15:59:54 +03:00
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
2019-03-20 10:35:31 +03:00
7ac9fff437
Format
2019-03-20 01:40:50 +03:00
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
2019-03-19 18:39:33 +00:00
67ff8d9311
user: properly cope with actors which do not declare a followers collection
2019-03-19 18:23:06 +00:00
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
2019-03-19 18:04:57 +00:00
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
2019-03-19 17:30:25 +00:00
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
2019-03-19 17:27:42 +00:00
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
aba4c27120
Merge branch 'masto-api-notifications' into 'develop'
...
Add support for exclude_types, limit and min_id in Mastodon notifications
See merge request pleroma/pleroma!949
2019-03-18 19:17:36 +00:00
40e9a04c31
[ #923 ] Registration validations & unique index on [:user_id, :provider].
2019-03-18 20:31:24 +03:00
a1aacc08a4
Check if the user has indeed not been federated with
...
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
2019-03-18 20:16:31 +03:00
8d21859717
[ #923 ] External User registration refactoring, password randomization.
2019-03-18 18:09:53 +03:00
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
2019-03-18 17:23:38 +03:00
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
2019-03-17 11:03:19 -04:00
93291c3d7a
Order users by nickname
2019-03-17 13:23:31 +03: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
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
e0edc706cf
oauth: add me property to token responses
2019-03-16 01:12:50 +00:00
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
4b3c86c1a6
Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
...
MediaProxy: parse filename from content-disposition for non-whitelisted types
See merge request pleroma/pleroma!936
2019-03-15 20:06:08 +00:00
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
2019-03-15 17:11:00 +03:00
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
2019-03-15 17:08:03 +03:00
d8244c2a1b
remove unused function
2019-03-15 15:03:03 +01:00
dfeb3aec44
fix credo warning
2019-03-15 14:36:07 +01:00
094e1ef048
formatting
2019-03-15 14:28:14 +01:00
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
be465c762b
formatting
2019-03-15 14:18:53 +01:00
15b21d1983
refactor filtering mechanism
2019-03-15 14:18:53 +01:00
aa71139e4a
Fix elixir 1.8 vs 1.7 format conflict
2019-03-15 14:18:53 +01:00
fe4c1d26fc
Add ActivityPub.contain_activity checks to streamer
2019-03-15 14:18:53 +01:00
c8f31e0bc2
Implement mastodon's reblog hiding feature
2019-03-15 14:18:21 +01:00
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
2019-03-15 11:58:12 +03:00
d02f1120f9
Content-Disposition regex improvements
2019-03-15 08:29:51 +03:00
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
2019-03-15 02:59:17 +00:00
lambda
Alex S
rinpatch
Ivan Tashkinov
cascode
Egor Kislitsyn
Sergey Suprunenko
Sachin Joshi
Haelwenn (lanodan) Monnier
eugenijm
Maxim Filippov
Mark Felder
William Pitcock
kaniini
Austin Lanari
Quentin Rameau
Ekaterina Vaartis
Fong-Wan Chau
Karen Konou
Haelwenn