Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,578 Commits 1 Branch 0 Tags 222 MiB
b97a7709c7
Commit Graph

4280 Commits

Author SHA1 Message Date
Maksim Pechnikov
1e7bb69a95 update ActivityPub#fetch_activities_query 2019-06-04 15:21:18 +03:00
Maksim Pechnikov
d3d1704e84 Merge branch 'develop' into issue/941 2019-06-04 15:06:58 +03:00
Maksim Pechnikov
0acfcf6c52 update ActivityPub#fetch_activities_query 2019-06-04 15:04:36 +03:00
lain
a3a7178b60 Participations: Filter out participations without activities. 2019-06-04 13:58:36 +02:00
Haelwenn
0eb7464c10 Merge branch 'emoji-loader-fix' into 'develop' 
Emoji: Don't die when files are present in the emoji folder.

Closes #957

See merge request pleroma/pleroma!1245
 2019-06-04 11:26:42 +00:00
rinpatch
17383861ed Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities 2019-06-04 13:38:32 +03:00
lain
e74581a5c4 Emoji: Don't die when files are present in the emoji folder. 2019-06-04 12:14:43 +02:00
rinpatch
29b022bb59 Restrict get_existing_votes to only get Create activities 2019-06-04 12:42:10 +03:00
Egor Kislitsyn
9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-04 16:28:23 +07:00
lain
4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing 2019-06-04 11:23:46 +02:00
William Pitcock
37a4ba0624 utils: access inReplyTo as an explicit string when fetching poll results` 2019-06-04 08:45:03 +00:00
Maksim Pechnikov
4f2e359687 Merge branch 'develop' into issue/941 2019-06-04 09:49:08 +03:00
William Pitcock
1c6cf0a348 nodeinfo: add pollLimits to metadata 2019-06-04 06:19:44 +00:00
kaniini
9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop' 
MRF: subchain policy

See merge request pleroma/pleroma!1233
 2019-06-04 05:49:54 +00:00
kaniini
9d2563a3de Merge branch 'generic-fe-settings' into 'develop' 
Generic settings store for frontend user settings

See merge request pleroma/pleroma!1221
 2019-06-04 05:43:43 +00:00
Roman Chvanikov
3e17610587 Add task to test emails 2019-06-04 02:48:21 +03:00
Mark Felder
6ef145b4fc Merge branch 'develop' into feature/digest-email 2019-06-03 15:29:53 -05:00
Maksim Pechnikov
f13d6c7f78 update api to set skip_thread_containment 2019-06-03 21:02:57 +03:00
eugenijm
f2c4c99e03 Remove repeated scope lists 2019-06-03 19:18:21 +03:00
lain
80d4d83aac CommonAPI: Add explicit addressing. 2019-06-03 18:17:08 +02:00
lain
2b664b048e User: Add function to get AP ids from nicknames. 2019-06-03 18:16:11 +02:00
eugenijm
243d8ed94e Use workaround for the heavy checkmark symbol in iOS 2019-06-03 18:28:36 +03:00
Mark Felder
f4e2595592 Merge branch 'develop' into update-oauth-template 2019-06-03 09:12:17 -05:00
Maksim Pechnikov
080e1aa70e add option skip_thread_containment 2019-06-03 16:13:37 +03:00
rinpatch
dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo 2019-06-03 13:16:17 +03:00
lambda
314758c25b Merge branch 'align-mastodon-conversations' into 'develop' 
Mastodon Conversations API: Align to Mastodon behavior

See merge request pleroma/pleroma!1215
 2019-06-03 09:48:37 +00:00
rinpatch
026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo 2019-06-03 11:14:52 +03:00
rinpatch
5bd41fef8b Change query order in fetch_activities_for_context_query to make poll vote exclusion work 2019-06-03 10:58:37 +03:00
rinpatch
1fd8e19d76 Remove a TODO comment as the tests for poll view were written 2019-06-02 23:46:17 +03:00
rinpatch
2fe3a20638 Make error message about author's inability to vote more sensible 2019-06-02 23:33:15 +03:00
rinpatch
e3c460353d Refresh the object in CommonAPI.vote instead of MastoAPI controller 2019-06-02 23:24:48 +03:00
William Pitcock
561a21986d formatting 2019-06-02 10:29:15 +00:00
William Pitcock
4087ccdab8 mrf: add subchain policy 2019-06-02 10:07:42 +00:00
William Pitcock
edf772d41e mrf: allow a policy chain to be specified when filtering 2019-06-02 09:44:42 +00:00
William Pitcock
52e09807d4 reverse proxy: clean up some @hackney leftovers 2019-06-02 09:09:58 +00:00
kaniini
5402d04e3c Merge branch 'feature/notification-control-part-2' into 'develop' 
notification controls, part 2

See merge request pleroma/pleroma!1204
 2019-06-02 08:25:37 +00:00
rinpatch
6bc9e5c020 Mastodon API: Refresh the object before rendering it after voting 2019-06-01 21:41:49 +03:00
rinpatch
444406167b Mastodon API: actually check for poll votes 2019-06-01 21:41:23 +03:00
rinpatch
65db5e9f52 Resolve merge conflicts 2019-06-01 16:29:58 +03:00
rinpatch
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
Sachin Joshi
ad5263c647 Merge remote-tracking branch 'upstream/develop' into admin-create-users 2019-06-01 11:42:37 +05:45
Sachin Joshi
5534d4c676 make bulk user creation from admin works as a transaction 2019-06-01 11:17:53 +05:45
kaniini
e706b42f51 Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop' 
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility

See merge request pleroma/pleroma!1230
 2019-06-01 03:39:13 +00:00
Sergey Suprunenko
2bbc2a801f Remove all follower collections but actor's from "cc" 2019-06-01 03:26:45 +00:00
William Pitcock
f2efe24cf8 visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility 2019-06-01 03:24:08 +00:00
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching 2019-06-01 01:44:10 +02:00
Haelwenn (lanodan) Monnier
aa9f52edd2
mastodon_api_controller.ex: Remove vanilla from supported_flavours 2019-06-01 01:44:10 +02:00
feld
6872c5f88f Mastodon API search default value for "resolve" is false 
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
 2019-05-31 18:46:57 +00:00
lambda
2993361075 Merge branch 'hotfix/leaking-lists' into 'develop' 
Mastodon API: Fix lists leaking private posts

See merge request pleroma/pleroma!1222
 2019-05-31 13:26:48 +00:00
lain
7861974ab2 MastodonAPI: Add extension to set and get pleroma_settings_store. 2019-05-31 14:50:18 +02:00
lain
aaad85c4d9 AccountView: settings -> settings_store 2019-05-31 14:49:46 +02:00
lain
eb2963bc43 User: Add settings store to Info, AccountView 
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
 2019-05-31 14:27:15 +02:00
rinpatch
d9c0650ff9 Mastodon API: Fix lists leaking private posts 
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).

Reported by @kurisu@iscute.moe via a DM
 2019-05-31 15:25:17 +03:00
rinpatch
a9eaa55885 Fix fix_explicit_addressing moving follower collection to cc and add tests for it 2019-05-31 14:17:05 +03:00
lain
97fb50d9fa Mastodon Conversation API: Don't return own account in 'accounts'. 2019-05-31 11:27:14 +02:00
Sergey Suprunenko
1690be991e Replace missing non-nullable Card attributes with empty strings 2019-05-30 21:03:31 +00:00
lambda
91ac8b075b Merge branch 'use-pleroma-config' into 'develop' 
Use Pleroma.Config everywhere

See merge request pleroma/pleroma!1214
 2019-05-30 13:16:08 +00:00
Egor Kislitsyn
99f70c7e20 Use Pleroma.Config everywhere 2019-05-30 15:33:58 +07:00
kaniini
6aec0d1b58 Revert "Merge branch 'feature/search-authenticated-only' into 'develop'" 
This reverts merge request !1209
 2019-05-29 22:10:16 +00:00
Roman Chvanikov
5cee2fe9fe Replace Application.get_env/2 with Pleroma.Config.get/1 2019-05-29 21:31:27 +03:00
Mark Felder
e7edfd9fec Permit fetching statuses from API with nickname or id 2019-05-29 12:20:18 -05:00
Roman Chvanikov
ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
Mark Felder
672fddb721 Default search limit should be 40 
https://docs.joinmastodon.org/api/rest/search/
 2019-05-29 08:06:26 -05:00
William Pitcock
0159a6dbe9 router: require oauth_read for searching 
Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords.  An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.

Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion.  It also
removes Pleroma as a potential vector in distributed search engines.
 2019-05-29 10:58:45 +00:00
jeff
9f3bcf0efe Respect proxy settings federation 2019-05-28 06:49:53 +00:00
Sachin Joshi
1452a96ad6 ability to set and reset avatar, profile banner and backgroud in Mastodon API 2019-05-27 15:31:01 +05:45
lambda
5bb843ceec Merge branch 'refactor/die-httpoison-die' into 'develop' 
remove @httpoison, @ostatus and @websub compile-time constants

See merge request pleroma/pleroma!1203
 2019-05-26 13:33:11 +00:00
William Pitcock
79503ce90f mrf: simple policy: fix matching imported activitypub and ostatus statuses 2019-05-26 02:01:24 +00:00
William Pitcock
750ede5764 notification: remove local/remote match rules (too complicated) 2019-05-26 00:05:47 +00:00
William Pitcock
e7e2e7a1a6 user info: allow formdata for notification settings like every other API 2019-05-25 05:54:02 +00:00
William Pitcock
59a703fcbe twitter api: user view: expose user notification settings under pleroma object 2019-05-25 05:31:13 +00:00
William Pitcock
4030837d91 notification: add non_follows/non_followers notification control settings 2019-05-25 05:19:47 +00:00
William Pitcock
56fd7dbdd7 remove @websub and @ostatus module-level constants 2019-05-25 04:43:11 +00:00
William Pitcock
9bec891eb4 kill @httpoison 2019-05-25 04:24:21 +00:00
Aaron Tinio
9415932af5 Keep nodeinfo available when not federating 2019-05-25 08:15:12 +08:00
Sergey Suprunenko
bbea5691da Mention all people in the beginning of DM 2019-05-24 20:34:23 +00:00
feld
f916e4cdd9 Move the Cache Control header test to its own file 
We can consolidate our cache control header tests here
 2019-05-24 20:33:55 +00:00
Egor Kislitsyn
f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-24 21:05:57 +07:00
rinpatch
8b2d39c1ec Change the order of preloading when fetching activities for context 2019-05-23 14:03:16 +03:00
Sachin Joshi
0c53d91f3b fix merge conflict 2019-05-23 09:45:12 +02:00
rinpatch
e6b175ed6c Fix credo issues 2019-05-22 21:57:46 +03:00
William Pitcock
baf72d6c58 mrf: simple policy: add the ability to strip avatars and banners from user profiles 2019-05-22 18:53:12 +00:00
William Pitcock
60f882b09f activitypub: run user objects through MRF filters 2019-05-22 18:53:12 +00:00
William Pitcock
75b6c4b004 mrf: defang policy modules for filtering user profile objects 2019-05-22 18:53:12 +00:00
rinpatch
ac7702f800 Exclude Answers from fetching by default 2019-05-22 21:52:12 +03:00
rinpatch
19c90d47c4 Normalize poll votes to Answer objects 2019-05-22 21:17:57 +03:00
rinpatch
54e10a3e55 Disable timeouts for object pruning query 2019-05-22 20:10:52 +03:00
Maksim
620908a2db [#699] add worker to clean expired oauth tokens 2019-05-22 15:44:50 +00:00
lambda
714d8d4ef9 Merge branch 'feature/object-pruning' into 'develop' 
Object pruning

See merge request pleroma/pleroma!1181
 2019-05-22 11:04:30 +00:00
lambda
ff363f70b5 Merge branch 'refactor/keys' into 'develop' 
move key generation functions into Pleroma.Keys module

See merge request pleroma/pleroma!1186
 2019-05-22 06:28:16 +00:00
William Pitcock
1344c85e2f salmon: fix credo 2019-05-22 05:58:51 +00:00
rinpatch
cdac5efd10 Merge branch 'bugfix/account_view_source.note' into 'develop' 
MastoAPI AccountView: fill source.note with plaintext version of note

Closes #926

See merge request pleroma/pleroma!1189
 2019-05-22 05:39:01 +00:00
Haelwenn (lanodan) Monnier
0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
 2019-05-22 07:22:19 +02:00
Sachin Joshi
17bfd000d7 Ability to reset avatar, profile banner and backgroud 2019-05-22 06:47:18 +02:00
kaniini
79c2cef2fb Merge branch 'mongooseim-support' into 'develop' 
MongooseIM: Add basic integration endpoints.

See merge request pleroma/pleroma!1172
 2019-05-22 04:06:54 +00:00
kaniini
ab6e15622b Merge branch 'fix/api-fallback' into 'develop' 
Do not fallback to index.html for /api/* routes

Closes #920

See merge request pleroma/pleroma!1182
 2019-05-22 04:05:41 +00:00
Sergey Suprunenko
9134848170 Do not truncate DM when it contains newlines and safe_dm_mentions is set to true 2019-05-22 04:04:20 +00:00
William Pitcock
045803346d move key generation functions into Pleroma.Keys module 2019-05-22 03:58:15 +00:00
William Pitcock
a023ca004c prune objects task: use Repo.delete_all() 2019-05-22 03:12:48 +00:00
Aaron Tinio
3ab9255eda Respond with a 404 Not implemented JSON error message 
when requested API is not implemented
 2019-05-22 07:15:52 +08:00
William Pitcock
16b260fb19 add mix task to prune the object database using a configured retention period 2019-05-21 21:38:56 +00:00
William Pitcock
73df9d690d object: fetcher: add support for reinjecting pruned objects 2019-05-21 21:38:56 +00:00
William Pitcock
c2b0b82e6a object: add Object.prune() 2019-05-21 21:38:56 +00:00
rinpatch
63b0b7190c MastoAPI: Add GET /api/v1/polls/:id 2019-05-21 20:40:35 +03:00
rinpatch
ff61d34502 Accept question objects for conversations 2019-05-21 17:33:54 +03:00
rinpatch
5f67c26baf Accept strings in expires_in because sasuga javascript 2019-05-21 17:30:51 +03:00
rinpatch
0407ffe75f Change validation error status codes to be more appropriate 2019-05-21 17:12:38 +03:00
rinpatch
ee68244141 Do not stream out poll replies 2019-05-21 16:58:15 +03:00
rinpatch
d7c4d029c8 Restrict poll replies when fetching activiites for context 2019-05-21 14:35:20 +03:00
rinpatch
f28747858b Actual vote count in poll view 2019-05-21 14:27:09 +03:00
rinpatch
a53d062730 Fix posting non-polls from mastofe 2019-05-21 14:19:03 +03:00
rinpatch
aafe30d94e Handle poll votes 2019-05-21 14:12:10 +03:00
rinpatch
3f96b3e4b8 Enforce poll limits and add error handling for MastodonAPI's post endpoint 2019-05-21 10:54:20 +03:00
rinpatch
76a7429bef Add poll limits to /api/v1/instance and initial state 2019-05-21 09:13:10 +03:00
kaniini
be6b57193a Merge branch 'trivial/increase-hackney-timeouts' into 'develop' 
http: bump connection timeout to 10 seconds

See merge request pleroma/pleroma!1183
 2019-05-21 05:15:29 +00:00
William Pitcock
c972d0bb14 http: bump connection timeout to 10 seconds 2019-05-21 04:59:15 +00:00
kaniini
94caca924d Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop' 
Fix prometheus-ecto error when not configured

Closes #917

See merge request pleroma/pleroma!1180
 2019-05-21 01:36:06 +00:00
kaniini
d4847b17ca Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop' 
Add virtual :thread_muted? field

Closes #901

See merge request pleroma/pleroma!1178
 2019-05-20 23:30:19 +00:00
Aaron Tinio
f96e9b28bb Fix prometheus-ecto error when not configured 2019-05-21 07:30:18 +08:00
Aaron Tinio
eb02edcad9 Add virtual :thread_muted? field 
that may be set when fetching activities
 2019-05-21 00:35:46 +08:00
Sadposter
daeae8e2e7
Move default mascot configuration to config/ 2019-05-20 16:12:55 +01:00
Sadposter
3d0d9e7a56
Use string map for default mascot 2019-05-20 13:10:04 +01:00
Sadposter
e81f0fc6d4
Add mascot get/set tests 2019-05-20 12:58:06 +01:00
Sadposter
54e9cb5c2d
Add API endpoints for a custom user mascot 2019-05-20 12:39:23 +01:00
Aaron Tinio
2375e9a95b Add report filtering to MRF.SimplePolicy 2019-05-20 06:02:50 +08:00
rinpatch
6430cb1bf7 Restrict poll replies from fetch queries by default 2019-05-19 17:44:18 +03:00
rinpatch
1d90f9b969 Remove tags/mentions/rich text from poll options because Mastodon and 
add custom emoji
 2019-05-19 17:06:44 +03:00
rinpatch
5ece901af3 Resolve merge conflicts and remove IO.inspects 2019-05-18 13:37:38 +03:00
rinpatch
fd920c8973 Mastodon API: Add support for posting polls 2019-05-18 13:29:28 +03:00
rinpatch
8e9a764dfc Merge branch 'feature/mrf-always-nsfw' into 'develop' 
suppress link previews from posts marked sensitive

Closes #865

See merge request pleroma/pleroma!1173
 2019-05-18 07:13:18 +00:00
William Pitcock
c4a55e167a add Changelog entry 2019-05-17 23:00:14 +00:00
William Pitcock
dc08159538 also suppress link previews from posts marked #nsfw 2019-05-17 22:13:24 +00:00
William Pitcock
290f5b2cfe config: make sending the user agent configurable, disable sending the user agent in tests 2019-05-17 20:28:58 +00:00
William Pitcock
d3b8cd342f http: request builder: send user-agent when making requests 2019-05-17 19:04:17 +00:00
William Pitcock
0da1233e8e rich media: suppress link previews if post is marked as sensitive 2019-05-17 18:49:43 +00:00
William Pitcock
78588dbd80 mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw 2019-05-17 18:49:10 +00:00
Egor Kislitsyn
3b71612d3d Improve Pleroma.Web.ActivityPub.ActivityPub.maybe_update_cc/3 2019-05-18 01:17:14 +07:00
lain
075eecec90 Linting. 2019-05-17 18:32:30 +02:00
lain
f959bf7aa6 MongooseIM: Add basic integration endpoints. 2019-05-17 18:21:11 +02:00
Egor Kislitsyn
557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-17 19:57:14 +07:00
Egor Kislitsyn
f2936e0a07 Add ap_id to List 2019-05-17 19:56:37 +07:00
lain
412a3d8a0f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index 2019-05-17 12:26:59 +02:00
lambda
e5b34f5e05 Merge branch 'ecto_sql_update' into 'develop' 
Dependencies: Update Ecto SQL.

See merge request pleroma/pleroma!1160
 2019-05-17 10:21:38 +00:00
lambda
1dcdcd8871 Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop' 
MastoAPI account_view.ex: requested is false when following is true

Closes #903

See merge request pleroma/pleroma!1169
 2019-05-17 10:07:51 +00:00
lambda
46684db84d Update account_view.ex 2019-05-17 09:53:44 +00:00
lain
249b31ffe5 Fix specs. 2019-05-17 11:49:13 +02:00
rinpatch
642a67dd44 Render polls in statuses 2019-05-17 11:44:47 +03:00
Alexander Strizhakov
7ed682213f Fix/902 random compile failing 2019-05-17 07:25:20 +00:00
Sachin Joshi
5c028b8f92 user creation admin api will create multiple users 2019-05-17 12:21:58 +05:45
Haelwenn (lanodan) Monnier
68c75a08e8
MastoAPI account_view.ex: requested is false when following is true 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
 2019-05-17 07:44:09 +02:00
Aaron Tinio
70235ce840 Fix typo: s/"tags"/"tag"/g 2019-05-17 09:02:34 +08:00
kaniini
bf84d50c76 Merge branch 'feature/890-add-report-uri' into 'develop' 
Feature/890 add report uri

Closes #890

See merge request pleroma/pleroma!1164
 2019-05-16 20:11:12 +00:00
Sergey Suprunenko
2c303afc8b Remove duplicated entries in users' following lists 2019-05-16 20:04:08 +00:00
Sergey Suprunenko
e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
feld
e190b3022b Merge branch 'fix/domain-unblocked-reblogs' into 'develop' 
Fix domain-unblocked reblogs

Closes #892

See merge request pleroma/pleroma!1157
 2019-05-16 18:57:14 +00:00
Mark Felder
efa61c1610 Move to pleroma.database mix task 2019-05-16 13:14:48 -05:00
Mark Felder
ebb0482116 Merge branch 'develop' into conversations-import 2019-05-16 13:11:17 -05:00
lambda
fde30aee43 Merge branch 'feature/sql-thread-sat' into 'develop' 
SQL thread visibility solver

See merge request pleroma/pleroma!971
 2019-05-16 13:44:22 +00:00
Alexander Strizhakov
73ae58fdfa Feature/896 toggling confirmation 2019-05-16 13:23:41 +00:00
Egor Kislitsyn
fc7246d715 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-16 17:54:24 +07:00
Alex S
9d14214eb9 Merge branch 'develop' into feature/890-add-report-uri 2019-05-16 12:54:06 +07:00
Alex S
aa11fa4864 add report uri and report to 2019-05-16 12:49:40 +07:00
William Pitcock
c31026423c publisher: use the correct queue name for outgoing federation 2019-05-16 04:41:27 +00:00
Aaron Tinio
793f1834d2 Use named binding to conditionally join object 2019-05-16 06:25:14 +08:00
Aaron Tinio
2b6119dfbf Restrict reblogs of activities from blocked domains 2019-05-16 05:53:51 +08:00
rinpatch
62e42b03ab Handle incoming Question objects 2019-05-15 20:10:16 +03:00
William Pitcock
a591ab6112 activity pub: remove Ecto SQL query dumps 2019-05-15 16:56:46 +00:00
William Pitcock
f09c3afdf5 chase test failures 2019-05-15 16:23:01 +00:00
William Pitcock
0aada88b55 bbs: chase timeline containment patch 2019-05-15 16:02:15 +00:00
William Pitcock
31db31c587 activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread 2019-05-15 15:54:10 +00:00
William Pitcock
de114ffbb0 activitypub: remove contain_timeline() 2019-05-15 15:53:06 +00:00
William Pitcock
0387f52138 activitypub: add restrict_thread_visibility() 2019-05-15 15:53:06 +00:00
lain
f168a1cbdc Merge remote-tracking branch 'origin/develop' into conversations-import 2019-05-15 17:47:29 +02:00
kaniini
62516be9c4 Merge branch 'fix/public-option-not-working' into 'develop' 
Fix public option not working

Closes #873

See merge request pleroma/pleroma!1143
 2019-05-15 15:42:21 +00:00
lambda
4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop' 
switch to pleroma/http_signatures library

See merge request pleroma/pleroma!1155
 2019-05-15 15:37:31 +00:00
lain
7a92e701b9 CommonAPI: Visibility refactor. 2019-05-15 16:35:33 +02:00
lain
cbb3451023 CommonAPI: Refactor visibility, forbid public to private replies. 2019-05-15 16:30:08 +02:00
lain
f1e67bdc31 Search: Add optional rum indexing / searching. 2019-05-15 15:28:01 +02:00
Sachin Joshi
ee22fff5ac remove deprecated PleromaFE configuration 2019-05-15 15:29:59 +05:45
Egor Kislitsyn
a7a8f3bc2c Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-15 14:31:24 +07:00
Aaron Tinio
70c81b95d0 Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug 2019-05-15 05:09:32 +08:00
Aaron Tinio
7b8dc99ef1 Implement Pleroma.Plugs.EnsurePublicOrAuthenticated 2019-05-15 05:09:29 +08:00
William Pitcock
071f78733a switch to pleroma/http_signatures library 2019-05-14 20:03:13 +00:00
Mark Felder
1caa6331ea Group def perform() together to fix the build 2019-05-14 12:33:03 -05:00
lambda
fa4bd898f1 Merge branch 'fix/gopher' into 'develop' 
gopher: fix rendering of post content (closes #895)

Closes #895

See merge request pleroma/pleroma!1150
 2019-05-14 15:41:37 +00:00
William Pitcock
51325fd60c gopher: fix rendering of post content (closes #895) 2019-05-14 15:35:06 +00:00
lambda
692919c7d2 Merge branch 'refactor/use-job-queue-everywhere' into 'develop' 
use job queue everywhere

Closes #862

See merge request pleroma/pleroma!1142
 2019-05-14 15:27:34 +00:00
William Pitcock
ac3a3abf6b clean up follow/block imports a little 2019-05-14 15:07:38 +00:00
kaniini
dfd031c26a Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop' 
Fix Pleroma.Config.get!/1 raising an error when value is false

See merge request pleroma/pleroma!1148
 2019-05-14 14:58:45 +00:00
Maksim
52297920e7 Refactoring oauth response. 2019-05-14 14:49:45 +00:00
Egor Kislitsyn
e82e73478e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-14 19:00:07 +07:00
Egor Kislitsyn
b92c004ea8 Reuse query from User.restrict_deactivated/1 2019-05-14 18:29:10 +07:00
Egor Kislitsyn
5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-14 18:15:56 +07:00
Aaron Tinio
a18b2c0b12 Fix Pleroma.Config.get!/1 raising an error when value is false 2019-05-14 06:40:59 +08:00
Mark Felder
bbacdf2352 Bump Mastodon API level 2019-05-13 15:52:16 -05:00
Mark Felder
498bfdf403 Switch to Jason over Poison 2019-05-13 15:37:38 -05:00
William Pitcock
69a9e0563c user: migrate follow/blocks import to job queue 2019-05-13 19:36:00 +00:00
William Pitcock
57d11ac9db activitypub: move post rich media fetching to job queue 2019-05-13 19:36:00 +00:00
William Pitcock
32d4630c9c user: move initial post fetching to job queue 2019-05-13 19:36:00 +00:00
lambda
b14a314ce7 Merge branch 'feature/federator-behaviours' into 'develop' 
federator modularization (outgoing)

See merge request pleroma/pleroma!1140
 2019-05-13 18:58:04 +00:00
Alexander Strizhakov
a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal 
[ci skip]
 2019-05-13 18:35:45 +00:00
Sachin Joshi
7701a4c841 Make irreversible field default to false in filters 2019-05-14 00:13:15 +05:45
Mark Felder
786f2c7a84 Update shortdoc description 2019-05-13 11:16:54 -05:00
Egor Kislitsyn
23276e8d68 Use pseudo ap id of a list in BCC 2019-05-13 16:15:14 +07:00
William Pitcock
44b182732e nodeinfo: gather supported protocol names from federation modules 2019-05-12 19:15:29 +00:00
William Pitcock
28f7f4c6de webfinger: build the response based on enabled federation modules 2019-05-12 19:05:03 +00:00
William Pitcock
80759f012e xml builder: properly escape quotes 2019-05-12 19:04:37 +00:00
William Pitcock
55fa4b812a federator: websub removal 2019-05-12 05:04:24 +00:00
William Pitcock
c23276a59a activitypub: publisher: fixups 2019-05-12 05:04:24 +00:00
William Pitcock
fedaca15a3 websub: adapt to work as a federator publishing module 2019-05-12 05:04:24 +00:00
William Pitcock
179293e51c salmon: refactor to work as a federator publishing module 2019-05-12 05:04:21 +00:00
William Pitcock
2aee62a456 federator: publisher: only attempt publishing if we know the activity is representable 2019-05-12 05:04:16 +00:00
William Pitcock
69158f1065 ostatus: only as:Public activities are representable 2019-05-12 05:04:16 +00:00
William Pitcock
85377c0b67 federator: move activitypub relaying to the AP publisher module 2019-05-12 05:04:16 +00:00
William Pitcock
676752bb83 federator: hook up Publisher.publish() 2019-05-12 05:04:16 +00:00
William Pitcock
f7a6a37c4e federator: remove no longer used :publish_single_ap 2019-05-12 05:04:16 +00:00
William Pitcock
10695a28d2 federator: publisher: add publish() wrapper 2019-05-12 05:04:16 +00:00
William Pitcock
0afc8d7856 federator: publisher: integrate job queue, simplify publish_one logic 2019-05-12 05:04:16 +00:00
William Pitcock
ef1f9e8d4e activitypub: split out outgoing federation into a federation module 2019-05-12 05:04:11 +00:00
William Pitcock
e7d292f80e federator: add publisher module defining a contract for publishing behaviours 2019-05-12 03:08:50 +00:00
rinpatch
b9f84a382a Normalize the object only after ensuring the activity type is Create 2019-05-12 03:01:42 +03:00
kaniini
131f883207 Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop' 
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects

See merge request pleroma/pleroma!1129
 2019-05-11 16:52:26 +00:00
lain
01c45ddc9e Search: Use RUM index. 2019-05-11 11:26:46 +02:00
Sachin Joshi
f01f995816 make url uniform in admin api 2019-05-11 14:46:00 +05:45
Roman Chvanikov
f1f7a11222 Merge develop 2019-05-11 14:45:54 +07:00
feld
c953ae8c3d Initial bundle of basic AdminFE 
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
 2019-05-11 01:34:17 +00:00
rinpatch
1d78e42fd4 Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects 2019-05-10 13:49:34 +03:00
Francis Dinh
2a54e8c1f5 Use "repeated" instead of "retweeted" for repeated statuses in Twitter API 
This makes it consistent with the language used in Pleroma FE (at least
in English).

Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
 2019-05-09 19:58:34 -04:00
rinpatch
e4523c3010 Fix get_in_reply_to in OStatus' activity representer depending on embedded objects 2019-05-09 22:27:00 +03:00
lain
a33bec7d58 Conversations: Import order, import as read. 2019-05-09 16:39:28 +02:00
lain
e6d7f8d223 Credo fixes. 2019-05-08 18:19:20 +02:00
lain
6d19bb4eae Conversations: Add mix task to 'import' old DMs. 2019-05-08 18:09:07 +02:00
lain
a4598b5e8b Visibility: Make it more resilient. 2019-05-08 18:08:50 +02:00
lain
920bd47055 ActivityPub: Remove leftover printf debugging. 2019-05-08 17:40:24 +02:00
lain
fcf2f38d20 Conversations: Add a function to 'import' old DMs. 2019-05-08 17:37:00 +02:00
Alexander Strizhakov
bfeb33e951 Merge develop 
Merge conflict in lib/pleroma/activity.ex
 2019-05-08 14:34:36 +00:00
Alex S
a76e2622ca emoji dowload follow redirects 2019-05-08 19:05:25 +07:00
Maksim
799e1f48b5 Refactoring functions for dealing with oauth scopes. 2019-05-08 10:52:13 +00:00
Roman Chvanikov
b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
kaniini
14deed7f7d Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop' 
Optimize bookmarks by preloading them with activities

Closes #861

See merge request pleroma/pleroma!1121
 2019-05-07 19:37:41 +00:00
William Pitcock
d64c3b604e twitterapi: use order constraint to force descending order 2019-05-07 19:33:25 +00:00
William Pitcock
6020ff3fb6 activitypub: add optional order constraint to timeline query builder 2019-05-07 19:33:22 +00:00
rinpatch
4c5125dedc Remove bookmarks assoc and add a fake bookmark assoc instead 2019-05-07 19:33:22 +00:00
rinpatch
be067ec2ab Use with_preloaded_bookmark in create_by_object_ap_id_with_object 2019-05-07 19:33:22 +00:00
rinpatch
3a7c14645e - Actually use preloaded bookmarks in views 
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
 2019-05-07 19:33:22 +00:00
rinpatch
f841eb7cdb Preload bookmarks wherever the object is preloaded 2019-05-07 19:33:22 +00:00
rinpatch
06947c9147 Remove bookmarks assoc 2019-05-07 19:33:22 +00:00
kaniini
a1a0df19c4 Merge branch 'docs/MRF-modules' into 'develop' 
Documentation: MRF Modules

See merge request pleroma/pleroma!1122
 2019-05-07 16:15:27 +00:00
William Pitcock
e71ddf23ba containment: remove pointless moduledoc line 2019-05-07 16:11:22 +00:00
lambda
238dd72fad Merge branch 'conversations_three' into 'develop' 
Conversations once more.

See merge request pleroma/pleroma!1119
 2019-05-07 14:43:21 +00:00
Egor Kislitsyn
1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-07 16:51:11 +07:00
Maksim
1040caf096 fix format 
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
 2019-05-06 17:51:03 +00:00
lambda
aacac9da0b Merge branch 'feature/bbs' into 'develop' 
BBS / SSH

See merge request pleroma/pleroma!997
 2019-05-06 17:17:03 +00:00
Alexander Strizhakov
ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion 2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier
69a5074893
Remove H1 in @moduledoc 2019-05-06 04:53:12 +02:00
Haelwenn (lanodan) Monnier
e41a2f98d5
mrf/tag_policy.ex: Add some documentation 
mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one?
 2019-05-06 04:53:11 +02:00
Haelwenn (lanodan) Monnier
af62ace954
Add short documentation on every MRF Policy 2019-05-06 04:49:50 +02:00
lain
eb0fb73ddb BBS: Credo fixes. 2019-05-04 15:47:50 +02:00
lain
c9d1cb2dce BBS: Use cached user fetcher. 2019-05-04 15:08:07 +02:00
lain
4c76f49e60 BBS: small fixes. 2019-05-04 15:06:18 +02:00
lain
6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs 2019-05-04 15:00:45 +02:00
rinpatch
d089ff2460 Merge branch 'fix/embeded-relationship-in-follows' into 'develop' 
Fix embeded relationships in Mastodon API

See merge request pleroma/pleroma!1118
 2019-05-03 20:36:13 +00:00
rinpatch
9907e974ca Merge branch 'fix-search-speed' into 'develop' 
Search: Add fts index on objects table.

See merge request pleroma/pleroma!1120
 2019-05-03 18:35:02 +00:00
lain
0e37fddd5a Search: Add fts index on objects table. 2019-05-03 19:21:09 +02:00
Haelwenn (lanodan) Monnier
b5ad1715b2
MastoAPI: profile update with emoji_map 2019-05-03 16:41:23 +02:00
Haelwenn (lanodan) Monnier
46bbf9e1cf
TwitterAPI: profile update with emoji_map 2019-05-03 16:30:24 +02:00
Haelwenn (lanodan) Monnier
85434669bb
Web.TwitterAPI.UserView: Also view local user emojis 2019-05-03 16:27:51 +02:00
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1 2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio 2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
85b5c60694
Pleroma.Formatter: width/height to class=emoji 2019-05-03 16:25:58 +02:00
lain
c42ded13a2 Credo fixes. 2019-05-03 13:53:17 +02:00
feld
acb04306b6 Standardize construction of websocket URL 
This follows up on the change made in d747bd98
 2019-05-03 11:45:04 +00:00
lain
a0c755cc4a MastodonApi: Bump api level. 2019-05-03 13:40:43 +02:00
lain
81d1aa424d Streamer: Stream out Conversations/Participations. 2019-05-03 13:39:14 +02:00
rinpatch
38b79461df Fix embeded relationships in Mastodon API 
Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case
 2019-05-03 00:49:17 +03:00
lambda
497d34b825 Merge branch 'iss-849' into 'develop' 
Parse access_token from body parameters and URL parameters

See merge request pleroma/pleroma!1103
 2019-05-02 14:17:17 +00:00
AkiraFukushima
533d8cd581 Parse access_token from body parameters and URL parameters 2019-05-02 21:04:00 +09:00
Mark Felder
3c4cab9be1 Merge branch 'develop' into update-oauth-template 2019-05-01 12:32:17 -05:00
Mark Felder
9a98f48ec3 Remove incorrect statement about valid characters 2019-05-01 12:29:48 -05:00
Roman Chvanikov
8af55728e4 Fix tests 2019-05-01 19:03:55 +02:00
lain
45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three 2019-05-01 18:40:41 +02:00
Maksim
c854bff8f5 Refactored Pleroma.Web.Auth.Authenticator 2019-05-01 13:28:04 +00:00
rinpatch
51e26f14f7 Remove redundant ensure_scrubbed_html 
It is never used as handling for fake and non-fake activities was merged
into one function above it
 2019-05-01 13:52:44 +03:00
lambda
0bcdaf378e Merge branch 'bugfix/web-notification-special-char' into 'develop' 
fix the web push notification with special char for status created

See merge request pleroma/pleroma!1092
 2019-05-01 10:45:32 +00:00
Egor Kislitsyn
a3dc02d282 Add addressable lists 2019-05-01 16:11:17 +07:00
Alex S
f11e7037c2 test fixes 2019-05-01 16:09:53 +07:00
Alex S
bdfa3a6fa8 Merging with develop 
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
 2019-05-01 12:29:33 +07:00
Sachin Joshi
85fa2fbce4 add scrubber for html special char 2019-05-01 01:37:17 +05:45
Sachin Joshi
cd6da3606b Merge branch 'develop' into bugfix/web-notification-special-char 2019-05-01 00:21:30 +05:45
rinpatch
ce4825c1dc Do not normalize objects in stream_out unless the activity type is 
Create

Saves quite a bit of time with delete activities because they would
always query the db
 2019-04-30 20:21:28 +03:00
Roman Chvanikov
0f0cc2703b Merge develop 2019-04-30 20:17:52 +07:00
lain
b0951a8849 WebPush: Use Object.normalize, rewrite tests so they test reality. 2019-04-29 18:15:30 +02:00
rinpatch
0fd176b990 Merge branch 'fix/add-default-scope-mastoapi' into 'develop' 
Add default_scope to /api/v1/update_credentials

See merge request pleroma/pleroma!1100
 2019-04-29 06:45:18 +00:00
kaniini
292c69481b Merge branch 'regression/rights-only-for-admin' into 'develop' 
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators

See merge request pleroma/pleroma!1102
 2019-04-28 23:05:14 +00:00
rinpatch
61ca2f7a4e Fix rights in TwitterAPI's user entity being present only for 
Admins/Moderators

In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
 2019-04-28 19:42:43 +03:00
rinpatch
ce3789e39a Add default_scope to /api/v1/update_credentials 2019-04-27 23:55:54 +03:00
rinpatch
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
kaniini
002ea343f8 Merge branch 'feature/bbcode' into 'develop' 
BBCode support (backend)

See merge request pleroma/pleroma!1097
 2019-04-27 07:44:24 +00:00
William Pitcock
501af917b5 add support for bbcode 2019-04-26 22:35:02 +00:00
lambda
4de5fef1f8 Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' 
Feature/807 bookmark endpoint extension

Closes #807

See merge request pleroma/pleroma!1059
 2019-04-26 11:59:47 +00:00
kaniini
48f68fd133 Merge branch 'feature/mastoapi-new-config' into 'develop' 
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API

This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role` 
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674)

Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs

See merge request pleroma/pleroma!1093
 2019-04-26 02:41:35 +00:00
Mark Felder
24c3e2db2c Add mediaproxy whitelist capability 2019-04-25 18:11:47 -05:00
rinpatch
dfc8425659 Move settings to Source subentity 2019-04-25 10:31:14 +03:00
Alex S
a825056d4d test fixes 2019-04-25 14:09:57 +07:00
Alex S
85953c0836 fixes for tests 2019-04-25 13:46:40 +07:00
Alex S
229ce6abbc migration without using old field name 
removing old field from db, after bookmarks migration
 2019-04-25 13:42:10 +07:00
Alex S
3c2ae80008 unused 2019-04-25 13:42:10 +07:00
Egor Kislitsyn
c157e27a00 Merge branch 'develop' into feature/disable-account 2019-04-25 13:41:10 +07:00
Alex S
1258128f4f favourites add bookmark display 2019-04-25 13:38:24 +07:00
Alex S
324c9c8ab5 migrate user.bookmarks to separate table 2019-04-25 13:38:24 +07:00
Alex S
73d01857e3 bookmarks in separate table 2019-04-25 13:38:24 +07:00
William Pitcock
0fd0ffcd76 activitypub: transmogrifier: send reject follow if following does not succeed 2019-04-25 00:48:45 +00:00
rinpatch
4baea6e6d9 Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API 
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674)

Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
 2019-04-24 20:01:42 +03:00
Sachin Joshi
963d5774af fix the status notification with special char 2019-04-24 07:06:17 +05:45
kaniini
030a7876b4 Merge branch 'security/fix-html-class-scrubbing' into 'develop' 
html: lock down allowed class attributes to only those related to microformats

See merge request pleroma/pleroma!1090
 2019-04-23 23:07:56 +00:00
William Pitcock
f5535e5743 html: lock down allowed class attributes to only those related to microformats 2019-04-23 23:03:45 +00:00
Sergey Suprunenko
9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) 2019-04-23 02:47:43 +00:00
kaniini
10c40e13d2 Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop' 
Add `in_reply_to_account_acct` to MastoAPI status entity

See merge request pleroma/pleroma!1086
 2019-04-23 02:43:53 +00:00
kaniini
aa9d378985 Merge branch 'fix/normalize-activities' into 'develop' 
Normalize acitvities instead of objects inside them

See merge request pleroma/pleroma!1085
 2019-04-23 02:43:26 +00:00
Alex S
d35246c449 added healthcheck setting to instance config 2019-04-22 17:00:06 +07:00
rinpatch
f60d072bbb Add pleroma.in_reply_to_account_acct to MastoAPI status entity 2019-04-22 11:54:27 +03:00
rinpatch
d21d921def Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading 2019-04-22 11:27:29 +03:00
rinpatch
952a4ae68e Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix 
task docs
 2019-04-22 11:02:31 +03:00
Egor
b9cdf6d3b9 Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
Alexander Strizhakov
88f0be9693 Feature/826 healthcheck endpoint 2019-04-22 07:19:53 +00:00
Egor Kislitsyn
e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-22 13:08:30 +07:00
kaniini
7fcbda702e Merge branch 'rework-emoji-management' into 'develop' 
Remove finmoji and add a way to download emojis in packs

Closes #817 and #821

See merge request pleroma/pleroma!1073
 2019-04-22 02:07:19 +00:00
Ekaterina Vaartis
3cefdc62e0 Fix emoji.txt / custom_emoji.txt / shortcode_globs handling 2019-04-21 23:07:14 +03:00
Ekaterina Vaartis
ba19ba8a88 Formatting 2019-04-21 22:33:54 +03:00
Ekaterina Vaartis
153f5375a6 Replace MD5 with SHA256 for emoji pack verification 2019-04-21 22:28:41 +03:00
Ekaterina Vaartis
d5c0fd35e1 Wrap the docstrings to 70 characters 2019-04-21 22:16:46 +03:00
Roman Chvanikov
4908e0eeee Fix Credo warning 2019-04-21 23:24:33 +07:00
Roman Chvanikov
eeb093631c Fix Credo warning 2019-04-21 23:19:36 +07:00
Roman Chvanikov
e56afefef9 Refactor conversation function in MastodonAPIController to use a View 2019-04-21 23:14:27 +07:00
Roman Chvanikov
2662bea4e0 Add accounts and last_status to conversation read response 2019-04-21 20:26:13 +07:00
Roman Chvanikov
f1d90ee942 Remove debug code 2019-04-21 16:40:05 +07:00
Roman Chvanikov
2359ee38b3 Set digest emails to false by default 2019-04-21 16:36:25 +07:00
Ivan Tashkinov
9256d2d4b4 [#923] Refactored OAuthController#authorize definitions, added test. 2019-04-21 10:51:32 +03:00
eugenijm
375fd21055 Set correct values in the MastoAPI reblog status view 2019-04-21 05:40:22 +03:00
Roman Chvanikov
24073f829f Refactor query to return only 1 message instead of 20 2019-04-21 00:40:41 +07:00
Roman Chvanikov
724311e151 Fix Credo warnings 2019-04-20 19:57:43 +07:00
Roman Chvanikov
60f213bb1a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-20 19:43:06 +07:00
Roman Chvanikov
64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
Ekaterina Vaartis
8f93d4c423 Remove most finmoji mentions where appropriate 2019-04-20 15:42:14 +03:00
Ekaterina Vaartis
53a3e61016 Fix priv/static/instance/static to be just instance/static 
It was a misunderstanding
 2019-04-20 15:08:51 +03:00
Ekaterina Vaartis
31cff7dbca Document the pleroma.emoji task 2019-04-20 15:06:07 +03:00
Ekaterina Vaartis
1e311d6662 Add a newline at the end of pack in ls-packs 2019-04-20 11:34:03 +03:00
Ekaterina Vaartis
52ed287e87 Fix incorrect multiple emoji tag handling introduced in initial impl 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
9bd5e2dec9 Make emoji default_manifest a config option 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
98d4b3de53 Treat the manifest path as a file if it doesn't start with http 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
aaaa428512 mix format 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
a141f0807b Assume packs without emoji.txt only have emoji pictures, unhardcode 
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.

packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
eff725c3af Add a task to generate emoji packs 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
1e44b5478d Remove useless comment 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
c5b7286b5f Move helper functions of emoji manager task down in the file 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
06db3ee1a8 Add MD5 verification for emoji pack source 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
af5494f942 Separate emoji pack file lists in a different file 
The file should be in the same directory as the manifest file
 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
21b39c54a3 Allow using a custom manfest and getting multiple packs at once 
A custom manifest can be provided as a command-line options --manifest/-m
 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
c26724cc55 Remove finmoji and add a way to download emojis in packs 
These packs are stored in a git repo on pleroma gitlab
 2019-04-20 11:17:17 +03:00
eugenijm
fa48532387 Handle reblogs on the first follow request in MastoAPI 2019-04-20 04:39:49 +03:00
kaniini
9da8b287f8 Merge branch 'feature/database-compaction' into 'develop' 
database compaction

See merge request pleroma/pleroma!473
 2019-04-19 16:55:33 +00:00
Roman Chvanikov
73407f4eea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-19 23:27:13 +07:00
Roman Chvanikov
bc7862106d Fix tests 2019-04-19 23:26:41 +07:00
Roman Chvanikov
8add119444 Add User.list_inactive_users_query/1 2019-04-19 22:19:00 +07:00
Roman Chvanikov
aeafa0b2ef Add Notification.for_user_since/2 2019-04-19 22:16:17 +07:00
Alexander Strizhakov
ada384207b typo fix 
docs for RelMe provider
 2019-04-19 07:50:21 +00:00
lambda
218d96a26b Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' 
OAuth consumer params handling refactoring

See merge request pleroma/pleroma!1047
 2019-04-19 07:49:26 +00:00
rinpatch
f9865cf943 Stream out deletes, mistakingly removed when resolving merge conflicts 2019-04-19 00:47:02 +03:00
rinpatch
73b8c5387b Add some logging 2019-04-19 00:17:37 +03:00
rinpatch
945325013a remove query timeouts 2019-04-18 23:58:59 +03:00
rinpatch
099f89367e Replace embedded object migration with a mix task 2019-04-18 23:34:01 +03:00
rinpatch
9238dccac1 Add a guard to fetching reply activity 2019-04-18 21:40:40 +03:00
Haelwenn
eba3db0966 Merge branch 'bugfix/filter-boosted-blocks' into 'develop' 
activitypub: fix filtering of boosts from blocked users

See merge request pleroma/pleroma!1074
 2019-04-18 18:29:57 +00:00
Mark Felder
1aa4994f6d Do not require authentication for user search in MastoAPI 2019-04-18 12:44:25 -05:00
rinpatch
a11ca87f40 Add a migration to remove embeded objects 2019-04-18 13:10:38 +03:00
rinpatch
83589ca6a5 Merge branch 'develop' into feature/database-compaction 2019-04-18 12:56:38 +03:00
rinpatch
ac04311b3f Fix search in TwitterAPI 2019-04-18 10:24:06 +03:00
rinpatch
6069d0fd36 Fix object search depending on embeded object 2019-04-18 09:28:20 +03:00
rinpatch
e31a22043b Fix media timeline depending on embeded object and add some guards 2019-04-18 08:31:08 +03:00
rinpatch
2abc09570f Use the preloaded object in tag queries 2019-04-18 01:37:04 +03:00
William Pitcock
36f78c6dcd activitypub: fix filtering of boosts from blocked users 2019-04-17 22:27:59 +00:00
William Pitcock
2140e164d7 activitypub: properly filter out transitive activities concerning blocked users 2019-04-17 20:05:09 +00:00
rinpatch
35ac672b8d Remove containment tests from transmogrifier and fix thread visibility solver 2019-04-17 17:59:15 +03:00
rinpatch
4c289e924e Fix delete-by_ap_id to expect not only embeded objects 2019-04-17 16:35:01 +03:00
rinpatch
8e4d950f31 Remove updating reply count for embeded objects 2019-04-17 15:54:09 +03:00
rinpatch
c3a2052806 If it's an object struct it is already normalized 2019-04-17 15:11:22 +03:00
rinpatch
a53b917e7f oof 2019-04-17 14:55:26 +03:00
rinpatch
ad681877df Make credo happy 2019-04-17 14:52:01 +03:00
rinpatch
e641651e2b Fix unbookmarking 2019-04-17 14:27:02 +03:00
rinpatch
e7c3c36766 Update functions in object fetcher for tesla and set up a proper mock for tests 2019-04-17 14:21:39 +03:00
rinpatch
b09ae02c04 Added some more normalization calls all in mastodon api controller 2019-04-17 13:04:58 +03:00
Roman Chvanikov
2f0203a4a1 Resolve conflicts 2019-04-17 16:59:05 +07:00
Roman Chvanikov
87013f8438 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-17 16:58:08 +07:00
rinpatch
462028688b Fix pinned posts relying on embded objects 2019-04-17 12:34:19 +03:00
rinpatch
627e5a0a49 Merge branch 'develop' into feature/database-compaction 2019-04-17 12:22:32 +03:00
Ivan Tashkinov
128aae05f3 [#923] Minor semantic adjustment. 2019-04-17 11:33:21 +03:00
kaniini
73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop' 
Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040
 2019-04-16 18:44:07 +00:00
kaniini
02a53d00c9 Merge branch 'fix/remote-follow-auth' into 'develop' 
Fix: remote follows should not ask user to log-in again for authorization

See merge request pleroma/pleroma!1060
 2019-04-16 18:40:56 +00:00
Haelwenn
cde7711b12 Merge branch 'bugfix/relax-spam-protection' into 'develop' 
activitypub: allow indirect messages from users being followed at a personal inbox

See merge request pleroma/pleroma!1069
 2019-04-16 18:38:11 +00:00
Normandy
d4a749cfb2 Handle new-style mastodon follow lists 
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
 2019-04-16 18:35:38 +00:00
William Pitcock
750b369d04 activitypub: allow indirect messages from users being followed at a personal inbox 2019-04-16 18:31:12 +00:00
Hakurei Reimu
6e26ac10a3 make Pleroma.Endpoint use extra_cookie_attrs in config 2019-04-16 22:20:56 +08:00
lain
76999c73a7 Conversation: Add accounts to output. 2019-04-15 22:28:42 +02:00
lain
0da985182f Conversation: Return full status object, id is a string. 2019-04-15 21:58:58 +02:00
lain
c1ebb38d3a Conversation: Also create participations for remote users. 
Needed to get the participating user list.
 2019-04-15 21:45:25 +02:00
lambda
56956de6fa Merge branch 'fix/status-reblogged' into 'develop' 
Assign reblogged in the Mastodon reblog status view

Closes #812

See merge request pleroma/pleroma!1057
 2019-04-15 10:26:23 +00:00
lambda
f358295cbe Merge branch 'unfollow-oneself' into 'develop' 
Consistent response for self follow/unfollow

Closes #819

See merge request pleroma/pleroma!1061
 2019-04-15 10:24:37 +00:00
eugenijm
27d78dc526 Use User.get_cached_by* 2019-04-15 12:37:49 +03:00
rinpatch
5d73dca064 Remove inReplyToStatusId 2019-04-15 11:50:36 +03:00
eugenijm
507e7821e3 Handle follow/unfollow directed to themselves 2019-04-15 10:21:18 +03:00
Roman Chvanikov
dc21181f65 Update updated_at field on notification read 2019-04-14 22:29:05 +07:00
Sadposter
e513504e88 Revert "Assert on the success of enqueue before returning" 
This reverts commit 16d8c8b33b.
Because it breaks everything
 2019-04-14 16:12:54 +01:00
Sadposter
16d8c8b33b Assert on the success of enqueue before returning 2019-04-14 16:05:26 +01:00
Sadposter
5e45557751 Always return {atom, _} from try_send_confirmation 2019-04-14 16:01:48 +01:00
Sadposter
ec42b639a3 fix pattern match on user registration 
deliver_async will return a single atom
 2019-04-14 15:46:54 +01:00
eugenijm
679a8ef629 Assign reblogged in the Mastodon reblog status view 2019-04-14 11:35:15 +03:00
Roman Chvanikov
0cd4b6024d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-14 14:05:21 +07:00
Roman Chvanikov
371a4aed2c Add User.Info.email_notifications 2019-04-13 17:40:42 +07:00
Alex S
c349573791 Merge develop to 788-separate-email-addresses 
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
 2019-04-13 12:24:38 +07:00
Alex S
a64eb2b389 fallback to the old behaviour 
admin and user mailers
 2019-04-13 12:20:36 +07:00
Egor
f9af90c5aa Revert "simplify mentions escape" 
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
 2019-04-12 19:25:53 +00:00
lambda
184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop' 
Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
 2019-04-12 10:41:09 +00:00
Egor Kislitsyn
dd097a406b add tests 2019-04-12 16:38:32 +07:00
lambda
0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' 
Features: mastoapi-2.6.0 `min_id` pagination

Closes #351

See merge request pleroma/pleroma!976
 2019-04-12 09:34:12 +00:00
lambda
57d5ff57d6 Merge branch 'fix/732-password-align' into 'develop' 
password reset page labels align

See merge request pleroma/pleroma!986
 2019-04-12 09:13:30 +00:00
Alexander Strizhakov
711ade961e adding destroy multiple for mastofe 2019-04-12 02:28:46 +00:00
Alexander Strizhakov
e03d24af96 in_reply_to_id - null 2019-04-12 02:21:32 +00:00
kaniini
31c06dba5a Merge branch 'fix/hackney_max_body_param' into 'develop' 
Add `with_body: true` to requests relying on `max_body: val`

Closes #778

See merge request pleroma/pleroma!1049
 2019-04-11 17:54:31 +00:00
Roman Chvanikov
4615e56219 Add with_body: true to requests relying on max_body: val 2019-04-12 00:16:33 +07:00
Mark Felder
d6d5f46bae Update OAuth web template 2019-04-11 16:02:38 +00:00
Egor Kislitsyn
46bd5c1d87 fix format 2019-04-11 17:28:12 +07:00
Egor Kislitsyn
db4badc6aa move user disable into deactivation 2019-04-11 17:22:42 +07:00
Egor Kislitsyn
0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-11 15:51:52 +07:00
Ivan Tashkinov
c3f12cf3c3 [#923] OAuth consumer params handling refactoring. 
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
 2019-04-10 21:40:38 +03:00
lain
d115d2a27e Conversations: Tidying up. 2019-04-10 18:17:22 +02:00
lain
c352a0aba6 Conversations: Make tests run. 2019-04-10 17:48:31 +02:00
lain
cf353514fe Participations: Add last activity. 2019-04-10 17:28:02 +02:00
lain
20d9b90760 Participation: Get for a user. 2019-04-10 17:05:33 +02:00
lain
280172f6f6 Conversations: Create or bump on inserting a dm. 2019-04-10 16:33:45 +02:00
lain
64c1c3a407 Participations: Add marking as read and unread. 2019-04-10 15:12:01 +02:00
lain
d1da6b155a Conversation: Add Conversations and Participations. 2019-04-10 15:01:42 +02:00
Alex S
fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses 2019-04-10 18:06:54 +07:00
Alex S
fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
lambda
e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop' 
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
 2019-04-10 10:10:08 +00:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
lambda
c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop' 
Change response format of /api/pleroma/emoji so it makes sense

See merge request pleroma/pleroma!1038
 2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ 2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ 2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/ 2019-04-10 06:33:19 +02:00
kaniini
0ab563d334 Merge branch 'hotfix/fix_undefined_summary' into 'develop' 
transmogrifier.ex: Add fix_summary/1

See merge request pleroma/pleroma!1039
 2019-04-10 02:10:47 +00:00
kaniini
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
Haelwenn (lanodan) Monnier
cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1 
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
 2019-04-10 02:32:04 +02:00
rinpatch
b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense 2019-04-09 23:20:31 +03:00
rinpatch
144648de92 Merge branch 'mastoapi/plaintext-statuses' into 'develop' 
Provide plaintext representations of content/cw in MastoAPI

Closes #787

See merge request pleroma/pleroma!1035
 2019-04-09 17:25:31 +00:00
lambda
0a02ed7a2f Merge branch 'bugfix/follower_count' into 'develop' 
update the follower count when a follower is blocked

See merge request pleroma/pleroma!1033
 2019-04-09 07:30:38 +00:00
Sachin Joshi
07afb9b537 update the follower count when a follower is blocked 2019-04-09 09:15:45 +05:45
Sadposter
589629cf3e
Used cached user resources in subscriptions 2019-04-08 15:56:14 +01:00
Alex S
fee50636d0 removing not needed invite update 2019-04-08 20:08:16 +07:00
Alex S
d0696fdfd6 fix for elixir 1.7.4 2019-04-08 19:16:59 +07:00
lain
a9f805c871 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations 2019-04-08 14:10:51 +02:00
Sadposter
87a01f9ee0
Use Pleroma.Config instead of Application.get_env 2019-04-08 13:04:30 +01:00
Egor Kislitsyn
9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 18:48:10 +07:00
Sadposter
13ff312c48
Sever subscription in case of block 2019-04-08 12:46:12 +01:00
lambda
e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' 
Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019
 2019-04-08 11:42:20 +00:00
lambda
fd45cab9ec Merge branch 'twitter_oauth' into 'develop' 
OAuth consumer (sign in / sign up with external provider)

See merge request pleroma/pleroma!923
 2019-04-08 11:41:50 +00:00
Alexander Strizhakov
36c0a10fdf adding language tag 2019-04-08 11:03:10 +00:00
lambda
23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop' 
Feature/770 add emoji tags

See merge request pleroma/pleroma!998
 2019-04-08 09:50:00 +00:00
Egor Kislitsyn
c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 16:46:59 +07:00
Egor Kislitsyn
a1a854646e Merge branch 'develop' into use-jobs-in-webpush 2019-04-08 16:29:20 +07:00
Ivan Tashkinov
bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
 2019-04-08 12:20:26 +03:00
lambda
b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' 
# Conflicts:
#   config/config.exs
#   docs/config.md
 2019-04-08 09:18:01 +00:00
lambda
b177e1e7f3 Merge branch 'scheduled-activities' into 'develop' 
Scheduled activities

See merge request pleroma/pleroma!989
 2019-04-08 09:08:18 +00:00
Alex S
012bb5dcc9 renaming expire_at -> expires_at 
keyword style change
 2019-04-08 16:01:28 +07:00
Sadposter
76fdfd1c7f Add check on activity visibility in sub notification 2019-04-07 15:11:29 +01:00
Alex S
56c75aec12 credo fix 2019-04-07 20:59:53 +07:00
Alex S
b810aac117 added docs to docs/api/admin_api.md 
code style and little renamings
 2019-04-07 19:48:52 +07:00
Ivan Tashkinov
e3328bc138 [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring. 2019-04-07 11:08:37 +03:00
feld
fb2040d061 Merge branch 'fix/deactivated-user-error' into 'develop' 
Return 403 for deactivated user on token request

Closes #785

See merge request pleroma/pleroma!1031
 2019-04-06 22:19:30 +00:00
eugenijm
2056efa714 Add scheduler for sending scheduled activities to the queue 2019-04-06 23:56:29 +03:00
eugenijm
fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm
b3870df51f Handle scheduled_at on status creation. 2019-04-06 23:55:58 +03:00
eugenijm
7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
eugenijm
7aa53d52bd Return 403 on oauth token exchange for a deactivated user 2019-04-06 23:27:55 +03:00
Alex S
ce8d457132 little channges 2019-04-06 22:38:35 +07:00
Sadposter
c05fe4da0a
Document subscription endpoints, fix typos 
Also adds a quick error case on the subscription endpoints
to avoid 500s
 2019-04-06 16:20:06 +01:00
feld
9aeac7dcca Merge branch 'feature/prometheus' into 'develop' 
Upstream: Metrics and debugging

See merge request pleroma/pleroma!1020
 2019-04-06 14:51:46 +00:00
Alex S
a53d591ac5 code style 2019-04-06 20:47:05 +07:00
Alex S
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
Alex S
dcc54f8cfa admin api endpoints for invites 2019-04-06 20:25:19 +07:00
Alex S
47b07cec49 token -> invite renaming 2019-04-06 20:24:22 +07:00
Alex S
be54e40890 twitter api registration 
fix for twitter api tests
 2019-04-06 17:18:59 +07:00
Alex S
0484f3a8b1 generating tokens with mix 2019-04-06 16:58:22 +07:00
Sergey Suprunenko
325a268017 Redirect to the referer url after mastofe authorization 2019-04-05 23:36:42 +00:00
Mark Felder
b5a2d384f7 Redundant Repo.get_by usage was recently removed from the codebase 2019-04-05 11:41:41 -05:00
Roger Braun
7895ee37fa Add user following / unfollowing to the admin api. 2019-04-05 11:27:07 -05:00
Sadposter
9ca91cbb87 Change relationship direction of subscriptions 2019-04-05 17:02:07 +01:00
Sadposter
d35f6551c1 Move subscriptions endpoint to be under /pleroma 2019-04-05 17:02:02 +01:00
Sadposter
d56866c824 Add subscribed status to user view 
Added in pleroma extensions, but can be moved whenever
 2019-04-05 15:30:31 +01:00
Sadposter
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
Sadposter
23c4f49494 Fix subscription endpoint return formats 2019-04-05 15:30:24 +01:00
Sadposter
007762e767 Add notification checks 2019-04-05 15:30:23 +01:00
Sadposter
79910ce5cc Add API endpoints and user column for subscription 2019-04-05 15:30:18 +01:00
Egor Kislitsyn
1c2e4f88d1 fix credo 2019-04-05 19:46:28 +07:00
Egor Kislitsyn
f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push 2019-04-05 19:38:44 +07:00
rinpatch
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
Ivan Tashkinov
47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. 2019-04-05 15:12:02 +03:00
Ivan Tashkinov
3e7f2bfc2f [#923] OAuthController#callback adjustments (with tests). 2019-04-05 09:19:17 +03:00
Ivan Tashkinov
45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-04 23:43:08 +03:00
Ivan Tashkinov
f7cd9131d4 [#923] OAuth consumer controller tests. Misc. improvements. 2019-04-04 22:41:03 +03:00
Mark Felder
69038887b2 Code readability tweak 2019-04-04 12:36:57 -05:00
Egor Kislitsyn
0b5c818cb7 [#1] fix telemetry 2019-04-04 11:35:09 -05:00
href
bc3618a38d Set up telemetry and prometheus 2019-04-04 11:30:43 -05:00
Egor Kislitsyn
cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
Haelwenn (lanodan) Monnier
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state 2019-04-04 09:07:25 +02:00
lambda
3f8be270c6 Merge branch 'feature/robotstxt' into 'develop' 
Generate permissive or restrictive robots.txt in the config generator

See merge request pleroma/pleroma!1012
 2019-04-03 17:31:34 +00:00
Sachin Joshi
cd41584ac4 Generate permissive or restrictive robots.txt in the config generator 2019-04-03 22:12:58 +05:45
rinpatch
79cb34a4b0 Fix preview not being usable in form data 2019-04-02 23:07:16 +03:00
Haelwenn
0cb94cfa94 Merge branch 'fix-slow-relationships' into 'develop' 
ActivityPub Utils: Greatly speed up the follow / block activity fetching.

See merge request pleroma/pleroma!1011
 2019-04-02 18:43:48 +00:00
lambda
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
lambda
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
lain
39bcf93007 Merge remote-tracking branch 'origin/develop' into fix-slow-relationships 2019-04-02 16:10:38 +02:00
lain
fd07745d1b ActivityPub Utils: Greatly speed up the follow / block activity fetching. 2019-04-02 16:08:55 +02:00
Alex S
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
Alex S
d140738edf second level of headertext change in doc 2019-04-02 20:36:36 +07:00
lambda
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
lambda
ce9284b36f Merge branch 'remove-user-activities' into 'develop' 
[#757] Add mix task to delete user's activities

See merge request pleroma/pleroma!1008
 2019-04-02 12:45:29 +00:00
lambda
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
Alex S
9e0567ec52 Merge develop into feature/770-add-emoji-tags 2019-04-02 19:16:29 +07:00
rinpatch
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
Ivan Tashkinov
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
lambda
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
lambda
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
cascode
95c92c49c9 Fix account lookup for nicknames beginning with numbers 2019-04-02 10:51:33 +00:00
Ivan Tashkinov
590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-02 13:50:12 +03:00
Egor Kislitsyn
88d3cb44c3 replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) 2019-04-02 17:47:02 +07:00
Egor Kislitsyn
1b3d921921 change Repo.get(User, id) => User.get_by_id(id) 2019-04-02 17:01:26 +07:00
Egor Kislitsyn
4212527928 change Repo.get(Activity, id) => Activity.get_by_id(id) 2019-04-02 16:50:31 +07:00
Sergey Suprunenko
3db9235150
Ignore dates in wrong formats 2019-04-02 11:32:36 +02:00
Egor Kislitsyn
a14742f495 add user delete_activities mix task 2019-04-02 16:30:11 +07:00
Alex S
08d64b977f little changes and typos 2019-04-02 16:13:34 +07:00
Alex S
9b2188da7c refactoring of emoji tags config to use groups 2019-04-02 15:44:56 +07:00
Egor Kislitsyn
a1869f5272 Merge remote-tracking branch 'pleroma/develop' into remove-user-activities 2019-04-02 15:41:30 +07:00
Sachin Joshi
f20e8d28de add support for all status type (ostatus) and replase case with if 2019-04-02 12:18:00 +05:45
Ivan Tashkinov
aac48d0cc6 Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations 2019-04-02 09:19:10 +03:00
Sachin Joshi
6386c1c9c1 fetch url for OStatus to know if it is a/c or status 2019-04-02 10:26:09 +05:45
Haelwenn (lanodan) Monnier
f56eef8d8c
router: Add fake identity proof endpoint 2019-04-02 01:53:38 +02:00
Sergey Suprunenko
b6f9f7b8aa
Handle dates in the Unix timestamp format (Fixes #763) 2019-04-01 22:45:24 +02:00
Sachin Joshi
1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status 2019-04-01 22:26:58 +05:45
Ivan Tashkinov
6910fb371b Fixed local MastoFE authentication / force_login option. 2019-04-01 17:25:25 +03:00
Ivan Tashkinov
cbe09d94d1 Added force_login authentication option (previously applied by default). 2019-04-01 14:46:50 +03:00
Alex S
17d3d05a71 code style 
little fix
 2019-04-01 17:54:30 +07:00
Alex S
3601f03147 Adding tag to emoji ets table 
changes in apis
 2019-04-01 17:17:57 +07:00
rinpatch
fe5145eeaa Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex 2019-04-01 12:25:53 +03:00
rinpatch
975482f091 insert object defaults for fake activities and make credo happy 2019-04-01 12:16:51 +03:00
rinpatch
d866b59eea oof 2019-04-01 11:58:08 +03:00
rinpatch
45ba10bf47 Fix the issue with HTML scrubber 2019-04-01 11:55:59 +03:00
Ivan Tashkinov
804173fc92 [#923] Minor code readability fix. 2019-04-01 09:45:44 +03:00
Ivan Tashkinov
eadafc88b8 [#923] Deps config adjustment (no override for httpoison), code analysis issues fixes. 2019-04-01 09:28:56 +03:00
Ivan Tashkinov
baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-01 08:49:32 +03:00
lain
629ad1766c BBS: Some fixes. 2019-03-31 21:53:17 +02:00
lain
e3bf6655ba Add replying. 2019-03-31 21:24:29 +02:00
lain
10fdc080a0 BBS: Tests and formatting. 2019-03-31 20:35:10 +02:00
lain
17ab9fa45b BBS: Some more functionality. 2019-03-31 18:01:16 +02:00
lain
c810fb81a4 Basic SSH daemon. 2019-03-31 14:55:09 +02:00
rinpatch
cd387f8693 Add a fake option to lazy_put_actvity_defaults 2019-03-30 13:57:54 +03:00
rinpatch
1bb4d5d65b Implement fake status submit 2019-03-29 21:59:04 +03:00
Egor
9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00
Haelwenn (lanodan) Monnier
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id 2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id 2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers 2019-03-28 17:18:59 +01:00
eugenijm
cd90695a34 Add PUT /api/pleroma/notification_settings endpoint 2019-03-28 18:55:16 +03:00
eugenijm
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
eugenijm
10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
Alex S
3ca6c4f443 password reset page labels align 2019-03-27 22:37:20 +06:30
Ivan Tashkinov
20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
Ivan Tashkinov
2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring. 2019-03-27 15:39:35 +03:00
lambda
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
rinpatch
ce6d64bbd8 Fix missing announces in MastoAPI home timeline 
Closes #762
 2019-03-27 12:28:53 +03:00
Maxim Filippov
3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
eugenijm
a4ab60ac54 Add vapid_key to the POST /api/v1/apps response 2019-03-26 23:27:37 +03:00
eugenijm
691d1208b5 Add GET /api/v1/apps/verify_credentials 2019-03-26 21:53:28 +03:00
lambda
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
lambda
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
lain
10a7a4a868 AP UserView: Refactor banner / avatar display code, add test. 2019-03-26 16:59:28 +01:00
lambda
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
lambda
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
rinpatch
406d19331f Remove ActivityRepresenter 2019-03-26 17:16:21 +03:00
Ivan Tashkinov
eef1042b16 Mastodon 2.7.2 instance attributes (registrations, languages). 2019-03-26 16:27:17 +03:00
eugenijm
568e348588 Increment replies_count on replies (MastoAPI) 2019-03-26 15:27:04 +03:00
Ivan Tashkinov
b0759f821b Comments split. 2019-03-26 15:24:29 +03:00
Ivan Tashkinov
263ca3dea2 Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true. 2019-03-26 15:09:06 +03:00
Mark Felder
c410296120 Try sending an empty map 2019-03-25 19:00:35 -05:00
Mark Felder
6f090f981b Attempt to fix incorrect federation of default instance avatars 2019-03-25 18:47:04 -05:00
rinpatch
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
William Pitcock
26b0c802c3 fix up missing announcements with preloads 2019-03-25 07:38:09 +00:00
kaniini
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
kaniini
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
rinpatch
a7f58b3c13 Serve non-public activities in /api/v1/favourites 
Fixes #648
 2019-03-25 02:15:45 +03:00
Austin Lanari
6c96d68f77 add overriding truncated_namespace condition for truncating paths for digital ocean 2019-03-24 11:32:09 -07:00
rinpatch
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
Haelwenn (lanodan) Monnier
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil 2019-03-24 15:47:50 +01:00
William Pitcock
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
William Pitcock
332dc1371b user: use preloads when deleting accounts 2019-03-23 03:06:00 +00:00
William Pitcock
debf7f016d ostatus: use preload objects with Object.normalize() when opportunistic 2019-03-23 03:05:57 +00:00
William Pitcock
3c2350cbee object: downgrade normalize warning to debug severity 2019-03-23 03:05:15 +00:00
William Pitcock
8c70156157 activitypub: object view: use preloaded object when possible 2019-03-23 03:05:14 +00:00
William Pitcock
f9d5c13b21 activity: add get_by_ap_id_with_object() 2019-03-23 03:05:13 +00:00
William Pitcock
ce47eb8b29 activitypub: when fetching objects, use the preloaded object from the synthesized activity 2019-03-23 03:05:10 +00:00
William Pitcock
aabcecb269 notification: formatting 2019-03-23 02:30:53 +00:00
William Pitcock
07cdd9ed02 streamer: use the preloaded object if possible 2019-03-23 02:29:01 +00:00
William Pitcock
c62220c500 rich media: helpers: only crawl Create activities 2019-03-23 02:28:59 +00:00
William Pitcock
9a06d9f6e8 notification: preload child objects 2019-03-23 02:28:57 +00:00
William Pitcock
4cedf45423 relay: use preloaded object since we always have it 2019-03-23 02:28:56 +00:00
William Pitcock
e430a71d37 ostatus: fetch preloaded object in note handler for testsuite 2019-03-23 01:17:26 +00:00
William Pitcock
73efe95368 activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious) 2019-03-23 01:09:12 +00:00
William Pitcock
ba7299fc87 activitypub: add missing with_preloaded_object() 2019-03-23 00:53:35 +00:00
William Pitcock
e4307cadc8 activitypub: splice in the child object if we have one 2019-03-23 00:40:08 +00:00
William Pitcock
a6973a668e formatting 2019-03-23 00:28:16 +00:00
William Pitcock
59518cbcd8 activity: fix credo nitpick 2019-03-23 00:26:12 +00:00
William Pitcock
b3bf523c09 rich media: use optimized Object.normalize() 2019-03-23 00:22:57 +00:00
William Pitcock
e75e43b949 common api: use the optimized Object.normalize whenever possible 2019-03-23 00:22:14 +00:00
William Pitcock
9aea7cc224 activitypub: preload child objects when fetching timelines 2019-03-23 00:10:17 +00:00
William Pitcock
092cedede5 activity: add with_preloaded_object() convenience 2019-03-23 00:09:56 +00:00
William Pitcock
62bccddde0 object: add support for preloading objects when walking an activity graph in normal form 2019-03-22 23:51:12 +00:00
rinpatch
1b33986bfa Fix text being nullable in TwitterAPI 2019-03-23 00:10:50 +03:00
lambda
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
lain
e2afce34b6 NodeInfo: Return safe_dm_mentions feature flag. 2019-03-22 11:57:20 +01:00
rinpatch
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
William Pitcock
27e03a2177 reports: fix up email generation for remote reports 2019-03-22 01:17:14 +00:00
kaniini
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
William Pitcock
3cc2554fa3 mastodon api: add conversation_id extension (ref #674) 2019-03-21 23:25:41 +00:00
William Pitcock
fea3696799 common api: move context functions from twitterapi 2019-03-21 23:24:04 +00:00
kaniini
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
rinpatch
88096c65a5 Move gluing search results from application to database and get mutuals 
a higher score multiplier
 2019-03-21 23:16:32 +03:00
Quentin Rameau
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
rinpatch
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
lain
bf27190f7f UtilController: Return state of safe dm mentions. 2019-03-21 16:20:58 +01:00
lain
8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01:00
Ivan Tashkinov
af68a42ef7 [#923] Support for multiple OAuth consumer strategies. 2019-03-20 20:25:48 +03:00
rinpatch
19a19bdd81 Fix migration timestamp type 2019-03-20 16:04:59 +03:00
rinpatch
9a7b817c9a Ecto 3.0.5 migration 
kms
 2019-03-20 15:59:54 +03:00
Ivan Tashkinov
e17a9a1f66 [#923] Nickname & email selection for external registrations, option to connect to existing account. 2019-03-20 10:35:31 +03:00
Maxim Filippov
7ac9fff437 Format 2019-03-20 01:40:50 +03:00
Maxim Filippov
ed8a2935f5 Use ILIKE to search users 2019-03-20 01:37:40 +03:00
William Pitcock
1685e4258f transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection 2019-03-19 18:39:33 +00:00
William Pitcock
67ff8d9311 user: properly cope with actors which do not declare a followers collection 2019-03-19 18:23:06 +00:00
William Pitcock
cd055983c3 transmogrifier: when determining followers collection URI, we may need to fetch the actor 2019-03-19 18:04:57 +00:00
William Pitcock
d487b753c3 activitypub: transmogrifier: do not allow missing lists to be interpreted as nil 2019-03-19 17:30:25 +00:00
William Pitcock
798da28812 activitypub: transmogrifier: ensure as:Public activities are delivered to followers 2019-03-19 17:27:42 +00:00