sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,195 Commits 1 Branch 0 Tags 184 MiB
029ff65389
Commit Graph

254 Commits

Author SHA1 Message Date
Maksim Pechnikov
5ae56aafb2 added import mutes 2020-09-06 21:42:51 +03:00
lain
0b621a834a Chats: Add cascading delete on both referenced users. 
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
 2020-08-31 16:48:17 +02:00
lain
78939c1d16 ChatController: Don't die if the recipient is gone. 2020-08-27 12:13:18 +02:00
Maksim Pechnikov
0922791e4d updated errors on add emoji 2020-08-22 10:56:26 +03:00
Maksim Pechnikov
f5845ff033 upload emoji zip file 2020-08-22 10:42:02 +03:00
Maksim Pechnikov
7794d7c694 added Pleroma.Web.PleromaAPI.EmojiFileController 2020-08-19 06:50:20 +03:00
lain
781b270863 ChatMessageReferenceView: Display preview cards. 2020-07-30 19:57:26 +02:00
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden 2020-07-28 14:58:30 -05:00
Ivan Tashkinov
9ea51a6de5 [#2791] AccountView: renamed :force option to :skip_visibility_check. 2020-07-23 15:08:30 +03:00
Ivan Tashkinov
6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. 
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
 2020-07-22 19:06:00 +03:00
Mark Felder
341a8f3500 Skip the correct plug 2020-07-21 17:26:59 -05:00
KokaKiwi
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint. 2020-07-18 12:55:04 +02:00
lain
c8dd973af5 AccountController: Remove unused update_? routes. 
These were not documented and are also not used anymore.
 2020-07-07 16:53:20 +02:00
Alexander Strizhakov
3e3f9253e6
adding overall count for packs and files 2020-06-19 10:17:24 +03:00
Alexander Strizhakov
4975ed86bc
emoji pagination for pack show action 2020-06-18 18:50:03 +03:00
Alexander Strizhakov
3becdafd33
emoji packs pagination 2020-06-18 14:32:21 +03:00
href
39f7fc5b8e Update majic & call plug before OpenApiSpex 2020-06-16 19:00:54 +02:00
href
f124f68205 Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME 2020-06-16 15:27:27 +02:00
lain
3b5282bef2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-08 11:19:18 +02:00
lain
89b85f6529 ChatController: Remove nonsensical pagination. 2020-06-08 11:09:53 +02:00
lain
fe2a5d0614 ChatController: Make last_read_id mandatory. 2020-06-07 20:22:08 +02:00
lain
801e668a97 ChatController: Add last_read_id option to mark_as_read. 2020-06-07 15:38:33 +02:00
lain
2cdaac4330 SideEffects: Move streaming of chats to after the transaction. 2020-06-07 14:52:56 +02:00
lain
f4cf4ae16e ChatController: Use new oauth scope *:chats. 2020-06-06 16:48:02 +02:00
lain
ca0e6e702b ChatMessageReference -> Chat.MessageReference 2020-06-06 11:51:10 +02:00
lain
cc8a7dc205 SideEffects / ChatView: Add an unread cache. 
This is to prevent wrong values in the stream.
 2020-06-05 12:01:33 +02:00
Egor Kislitsyn
317e2b8d61
Use atoms as keys in ActivityPub.fetch_* functions options 2020-06-04 21:36:26 +04:00
lain
00748e9650 ChatMessageReferences: Change seen -> unread 2020-06-04 17:14:42 +02:00
lain
b3407344d3 ChatController: Add function to mark single message as read. 2020-06-03 19:21:23 +02:00
lain
c020fd4352 ChatMessageReferenceView: Return read status as unread. 2020-06-03 18:58:58 +02:00
lain
7f5c5b11a5 Chats: Remove unread from the db, calculate from unseen messages. 2020-06-03 14:26:50 +02:00
lain
73127cff75 Credo fixes. 2020-06-03 13:17:29 +02:00
lain
f3ccd50a33 ChatMessageReferences: Adjust views 2020-06-03 12:49:53 +02:00
lain
aa22fce8f4 ChatMessageReference: Introduce and switch in chat controller. 2020-06-03 12:30:12 +02:00
lain
767ce8b803 StreamerView: Actually send Chats, not ChatMessages. 2020-05-29 16:02:45 +02:00
lain
af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-29 12:36:17 +02:00
Mark Felder
95f6240889 Fix minor spelling error 2020-05-27 14:34:37 -05:00
lain
ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-25 13:57:27 +02:00
rinpatch
1fa7aa9fc5 Merge branch 'emoji-react-better-errors' into 'develop' 
EmojiReactionController: Return more appropriate error.

See merge request pleroma/pleroma!2569
 2020-05-22 14:36:08 +00:00
Egor Kislitsyn
ba106aa9c8
Fix notifications mark as read API 2020-05-22 18:15:36 +04:00
lain
bcb549531f EmojiReactionController: Return more appropriate error. 2020-05-22 14:38:28 +02:00
lain
578ed3a37f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-21 15:35:13 +02:00
lain
f166316f50 Merge branch 'openapi/pleroma-api/pleroma' into 'develop' 
Add OpenAPI spec for PleromaAPI.PleromaAPIController

See merge request pleroma/pleroma!2564
 2020-05-21 13:30:09 +00:00
lain
814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-21 15:00:05 +02:00
lain
265746b21f Merge branch 'openapi/pleroma-api/emojis' into 'develop' 
Add OpenAPI spec for EmojiPackController

See merge request pleroma/pleroma!2549
 2020-05-20 12:08:28 +00:00
Egor Kislitsyn
5ba6e1c322
Move notification actions to PleromaAPI.NotificationController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn
f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn
9a5de0f454
Move reaction actions to EmojiReactionController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn
6609714d66
Move Scrobble views to ScrobbleView 2020-05-19 16:26:06 +04:00
Egor Kislitsyn
524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController 2020-05-19 16:26:06 +04:00
Egor Kislitsyn
fe5d423b43
Add OpenAPI spec for MascotController 2020-05-18 22:01:18 +04:00
lain
0d417e005d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-18 18:38:32 +02:00
Egor Kislitsyn
aef31c69df
Rename EmojiAPIController to EmojiPackController 2020-05-18 19:43:25 +04:00
Egor Kislitsyn
8bde8dfec2
Cleanup Pleroma.Emoji.Pack 2020-05-18 19:43:23 +04:00
Egor Kislitsyn
6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController 2020-05-18 19:28:46 +04:00
Alexander Strizhakov
215daabdb4
copyright update 2020-05-18 15:15:51 +03:00
lain
9c17109765 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-17 12:14:49 +02:00
lain
4b28d812cf Merge branch 'restricted-relations-embedding' into 'develop' 
Restricted support for embedded relationships

See merge request pleroma/pleroma!2456
 2020-05-17 07:26:51 +00:00
lain
f012c3a202 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-15 13:33:04 +02:00
lain
3342846ac2 ChatView: Add update_at field. 2020-05-14 13:20:28 +02:00
Egor Kislitsyn
6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController 2020-05-13 19:06:46 +04:00
lain
0f0acc740d Chat: Allow posting without content if an attachment is present. 2020-05-13 15:31:28 +02:00
lain
c0ea5c60e4 ChatController: Don't return chats for user you've blocked. 2020-05-12 16:43:04 +02:00
lain
ec72cba43e Chat Controller: Add basic error handling. 2020-05-12 13:23:09 +02:00
lain
b5aa204eb8 ChatController: Support deletion of chat messages. 2020-05-12 13:13:03 +02:00
lain
8d5597ff68 ChatController: Add GET /chats/:id 2020-05-10 13:26:14 +02:00
lain
f335e1404a ChatView: Add the last message to the view. 2020-05-10 13:00:01 +02:00
Ivan Tashkinov
aee88d11be [#2456] Removed support for embedded relationships in account view. 2020-05-10 09:16:48 +03:00
Ivan Tashkinov
14a49a0483 [#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications. 2020-05-09 18:05:44 +03:00
Ivan Tashkinov
b2924ab1fb Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 2020-05-08 21:37:55 +03:00
lain
7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-08 13:13:37 +02:00
lain
ef55d24054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 18:53:34 +02:00
lain
fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-07 15:05:40 +02:00
lain
7ac0cffb34 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 15:03:12 +02:00
lain
f0c22df226 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced 2020-05-07 14:45:20 +02:00
Maksim
3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
lain
20baa2eaf0 ChatMessages: Add attachments. 2020-05-06 16:12:36 +02:00
lain
b34debe615 Undoing: Move undoing reactions to the pipeline everywhere. 2020-05-05 16:17:09 +02:00
lain
db55dc9445 ActivityPub: Remove react_with_emoji. 2020-05-05 12:28:28 +02:00
lain
b04328c3de ChatController: Add mark_as_read 2020-05-04 13:10:36 +02:00
lain
c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-04 10:43:20 +02:00
rinpatch
e55876409b Deactivate local users on deletion instead of deleting the record 
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.

Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.

Closes pleroma/pleroma#1687
 2020-05-02 19:05:13 +03:00
Ivan Tashkinov
d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering). 
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
 2020-05-01 18:45:24 +03:00
Alexander Strizhakov
4a487e4d0b
fix for auth check 2020-04-30 17:50:57 +03:00
Alexander Strizhakov
36abeedf9f
error rename 2020-04-30 16:09:22 +03:00
Alexander Strizhakov
ddb757f743
emoji api packs changes in routes with docs update 2020-04-30 16:09:18 +03:00
Alexander Strizhakov
342f55fb92
refactor emoji api with fixes 2020-04-30 15:45:52 +03:00
Alexander Strizhakov
5839e67eb8
return data only for updated emoji 2020-04-30 15:24:02 +03:00
lain
145d35ff70 Apply suggestion to lib/pleroma/web/pleroma_api/controllers/chat_controller.ex 2020-04-29 19:49:03 +00:00
lain
0c491b904d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-29 13:19:04 +02:00
lain
3d040b1a87 Credo fixes. 2020-04-27 17:55:29 +02:00
lain
ad82a216ff Chat API: Align more to Pleroma/Mastodon API. 2020-04-27 17:48:34 +02:00
lain
49e673dfea ChatView: Add actor_account_id 2020-04-27 16:08:03 +02:00
Ivan Tashkinov
b4139cc547 [#2409] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests. 2020-04-24 22:25:27 +03:00
Ivan Tashkinov
00e62161f6 [#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints. 2020-04-24 16:52:38 +03:00
Ivan Tashkinov
2958a7d246 Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped. 2020-04-22 18:50:25 +03:00
lain
66c2eb670b ChatController: Validate parameters. 2020-04-21 18:23:00 +02:00
Ivan Tashkinov
f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring. 2020-04-21 16:29:19 +03:00
lain
b5df4a98e4 ChatMessageView: Support emoji. 2020-04-20 14:38:53 +02:00