luna/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
14632 commits 4 branches 74 tags 294 MiB
Commit graph

407 commits

Author SHA1 Message Date
lain
e055b8d203 Pipeline: Always run common_pipeline in a transaction for now. 2020-04-29 13:45:50 +02:00
lain
dedffd100c Pipeline: Unify, refactor, DRY. 2020-04-28 17:29:54 +02:00
lain
6aa116eca7 Create activity handling: Flip it and reverse it 
Both objects and create activities will now go through the common
pipeline and will be validated. Objects are now created as a side
effect of the Create activity, rolling back a transaction if it's
not possible to insert the object.
 2020-04-28 16:26:19 +02:00
Egor Kislitsyn
560f2c1979
Add OpenAPI spec for ReportController 2020-04-28 16:50:37 +04:00
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration 2020-04-28 14:13:53 +04:00
lain
c86143ed73 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-27 12:07:08 +02:00
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration 2020-04-24 18:37:58 +04:00
Alexander
6e625a427c
reply filtering 2020-04-24 15:43:49 +03:00
lain
ec7335535d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-23 15:47:08 +02:00
lain
7d38197894 CommonAPI: Don't make repeating announces possible 2020-04-23 13:33:30 +02:00
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration 2020-04-20 20:37:56 +04:00
lain
970b74383b Credo fixes. 2020-04-20 12:29:19 +02:00
lain
5b6818b3e5 CommonAPI: Obey local limit for chat messages. 2020-04-20 12:08:47 +02:00
lain
8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-17 15:51:24 +02:00
rinpatch
942d7467ca Merge branch 'develop' into features/remove-user-source_data 2020-04-16 21:28:52 +03:00
lain
3d4eca5dd4 CommonAPI: Escape HTML for chat messages. 2020-04-16 12:56:29 +02:00
lain
6ace22b56a Chat: Add views, don't return them in timeline queries. 2020-04-15 18:23:16 +02:00
lain
44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-15 14:41:43 +02:00
Egor Kislitsyn
dc8fa04192
Merge branch 'develop' into global-status-expiration 2020-04-13 14:12:51 +04:00
Ivan Tashkinov
a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 2020-04-13 09:16:51 +03:00
rinpatch
5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop' 
FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332
 2020-04-11 19:46:04 +00:00
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration 2020-04-10 14:20:48 +04:00
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data 2020-04-10 06:20:02 +02:00
lain
8e637ae1a7 CommonAPI: Basic ChatMessage support. 2020-04-09 13:20:16 +02:00
lain
349b9d86dc Merge branch 'remake-remodel-2' into 'develop' 
Ingestion Pipeline Revamp

See merge request pleroma/pleroma!2315
 2020-04-06 11:59:01 +00:00
Ivan Tashkinov
2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. 
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
 2020-04-01 19:49:09 +03:00
lain
057438a657 CommonAPI: DRY up a bit. 2020-03-31 17:56:05 +02:00
Ivan Tashkinov
be9d18461a FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.). 2020-03-28 18:49:03 +03:00
Ivan Tashkinov
dfbc05d496 Misc refactoring / tweaks (ThreadMute.exists?/2). 2020-03-27 08:01:03 +03:00
lain
3c2c32b460 Merge branch 'remake-remodel' into develop 2020-03-19 18:00:55 +01:00
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration 2020-03-16 15:31:31 +04:00
Haelwenn (lanodan) Monnier
d1379c4de8
Formatting: Do not use \n and prefer <br> instead 
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
 2020-03-13 16:07:17 +01:00
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-03-12 16:02:24 +04:00
Mark Felder
5af798f246 Fix enforcement of character limits 2020-03-10 13:08:00 -05:00
lain
4bce13fa2f MastodonController: Return 404 errors correctly. 2020-03-04 18:09:06 +01:00
Mark Felder
05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-03-03 00:32:34 +04:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07 
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
 2020-03-02 06:08:45 +01:00
Egor Kislitsyn
4d459b0e99
Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4 2020-02-13 22:27:10 +04:00
Mark Felder
ff9fd4ca89 Fix the confusingly named and inverted logic of "no_attachment_links" 
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
 2020-02-11 15:39:19 -06:00
Lain Soykaf
d85bcc8627 Questions: Add timezone to closed property 2020-02-07 16:57:46 +01:00
rinpatch
50f5a92021 fix not being able to pin polls 2020-02-02 14:55:06 +03:00
lain
510776ba31 CommonAPI: Don't error out on double favs/repeats 2020-01-20 14:27:59 +01:00
Ivan Tashkinov
30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user.ex
 2019-12-04 18:56:31 +03:00
lain
e9993acdbb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel 2019-12-04 16:35:59 +01:00
lain
7722e5a67a Merge branch 'feature/move-activity' into 'develop' 
Support "Move" activity

Closes #1316

See merge request pleroma/pleroma!1883
 2019-12-02 16:26:19 +00:00
Ivan Tashkinov
de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality. 2019-11-20 15:46:11 +03:00
Ivan Tashkinov
ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring. 2019-11-19 23:22:10 +03:00
feld
1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' 
Admin API: Grouped reports, update multiple reports in one query

Closes admin-fe#43

See merge request pleroma/pleroma!1815
 2019-11-14 13:35:41 +00:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity 2019-11-14 16:39:45 +07:00
Egor Kislitsyn
768c1a5de1
Fix tests 2019-11-12 19:13:19 +07:00
Egor Kislitsyn
27cd1374e3
Add a notification for Move activities 2019-11-12 18:48:14 +07:00
lain
b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions 2019-11-08 13:27:11 +01:00
lain
1bd1f62af5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel 2019-11-05 15:21:00 +01:00
Maxim Filippov
43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-05 02:12:48 +03:00
Egor Kislitsyn
4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
lain
97d5c79aa0 Add Pipeline module, test for federation. 2019-10-23 11:52:27 +02:00
Ivan Tashkinov
e8843974cb [#1304] Moved remaining fields from User.Info to User. 
Misc. fixes / improvements.
 2019-10-20 13:42:42 +03:00
lain
66452f518f ObjectValidator: Rewrite LikeValidator with Ecto. 2019-10-17 18:36:52 +02:00
Ivan Tashkinov
10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
lain
6e4f52f8a2 Introduce new ingestion pipeline structure, implement internal Likes with it. 2019-10-16 16:16:39 +02:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship 2019-10-11 02:35:32 +07:00
Maxim Filippov
35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-10-07 15:41:41 +03:00
lain
61097ba6ab Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-10-06 08:11:47 +00:00
lain
276a520163 CommonAPI: Create profile updates as public. 
This saves us lots of sending out because we can use sharedInbox.
 2019-10-05 14:53:50 +02:00
Maxim Filippov
8dcc2f9f5e Admin API: Allow changing the state of multiple reports at once 2019-10-04 19:00:58 +03:00
lain
9cfe9a57c5 CommonAPI: Add unreactions. 2019-10-02 15:38:57 +02:00
lain
557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-02 13:27:55 +02:00
Thibaut Girka
3d61efa7c9 Rename misleading get_announce_visibility to public_announce? 2019-10-02 10:48:34 +02:00
Thibaut Girka
4c1f158f5d Allow users to announce privately, including own private notes 2019-10-01 20:00:59 +02:00
lain
b923842e96 Merge remote-tracking branch 'origin/develop' into reactions 2019-09-30 13:57:54 +02:00
Ariadne Conill
8b34b221cb common api: add some missing IR bits for listen activities' children 2019-09-30 10:39:48 +00:00
Ariadne Conill
71eff09e56 common api: make sure the generated IR is actually federatable 2019-09-30 10:39:48 +00:00
Ariadne Conill
2c82d8603b common api: implement scrobbling 2019-09-30 10:39:17 +00:00
rinpatch
374f83d29b Fix not being able to post empty statuses with attachments 
Attachment field was filled in after the empty status check
 2019-09-28 01:58:06 +03:00
Egor Kislitsyn
c57ad0a402 Cleanup CommonAPI 2019-09-26 10:33:13 +07:00
Egor Kislitsyn
de3e90e536 Add ActivityDraft.with_valid/2 2019-09-26 10:29:34 +07:00
Egor Kislitsyn
eed774d058 Add CommonAPI.ActivityDraft 2019-09-26 10:29:34 +07:00
kaniini
48a82c4609 Merge branch 'refactor/user' into 'develop' 
Simplify updating user's `info`

See merge request pleroma/pleroma!1712
 2019-09-26 03:00:38 +00:00
kaniini
3ff57f1fd3 Merge branch 'hex-flake-id' into 'develop' 
Replace `Pleroma.FlakeId` with `flake_id` hex package

See merge request pleroma/pleroma!1692
 2019-09-26 02:51:54 +00:00
Egor Kislitsyn
b5dfe83433 Replace Pleroma.FlakeId with flake_id hex package 2019-09-25 17:14:31 +07:00
Egor Kislitsyn
1bea67cb5e Cleanup Pleroma.User 2019-09-24 19:50:09 +07:00
Egor Kislitsyn
209395c7e6 Add User.change_info/2 and User.update_info/2 2019-09-24 19:50:07 +07:00
Maksim Pechnikov
6ef0103ca0 added Emoji struct 2019-08-31 10:14:53 +03:00
Maksim Pechnikov
d8098d142a added Emoji.Formatter 2019-08-30 22:04:17 +03:00
Maksim Pechnikov
d7808b5db4 added code\path fields without html tags in ets 2019-08-30 07:30:54 +03:00
lain
b770ed1d99 CommonAPI: Support emoji reactions. 2019-08-27 17:56:28 -05:00
Maxim Filippov
37dd3867bb Log admin/moderator actions 2019-08-25 19:39:37 +00:00
lain
efb8818e9e Activity Expiration: Switch to 'expires_in' system. 2019-08-24 17:22:48 +02:00
lain
cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration 2019-08-24 15:48:33 +02:00
lain
a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-08 16:04:20 +02:00
Maksim
bdc9a7222c tests for CommonApi/Utils 2019-08-05 15:37:05 +00:00
lain
b64b6fee2a CommonAPI: Replies to conversations also get the correct context id. 2019-08-05 15:33:22 +02:00
lain
56b1c3af13 CommonAPI: Extend api with conversation replies. 2019-08-02 15:05:27 +02:00
Maksim
6eb33e7303 test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id 2019-07-31 18:35:15 +00:00
kaniini
5835069215 Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" 
This reverts merge request !1504
 2019-07-29 19:42:26 +00:00
Ariadne Conill
5795a890e9 markdown: clean up html generated by earmark 2019-07-29 19:09:58 +00:00
Ariadne Conill
b93498eb52 constants: add as_public constant and use it everywhere 2019-07-29 02:43:19 +00:00
Mike Verdone
36012ef6c1 Require that ephemeral posts live for at least one hour 
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
 2019-07-24 14:46:08 +02:00
Mike Verdone
704960b3c1 Add support for activity expiration to common and Masto API 
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.

At this point the API will not give you any feedback about if your post
will expire or not.
 2019-07-24 14:45:14 +02:00
Mark Felder
6a79bb12c3 Fix function 2019-07-23 13:53:05 -05:00
Mark Felder
fd287387a0 Do not notify subscribers for messages from users which are replies to others 2019-07-23 13:14:26 -05:00
Sergey Suprunenko
b74300bc7a Add more tests for MastodonAPIController and CommonAPI 2019-07-15 19:47:23 +00:00
kaniini
ee5250ae56 Merge branch 'sha512-crypt' into 'develop' 
detect and use sha512-crypt for stored password hash.

See merge request pleroma/pleroma!1422
 2019-07-15 16:13:17 +00:00
Egor Kislitsyn
de13c9bb8f List messages must be visible for mentioned users 2019-07-15 14:54:40 +07:00
Egor Kislitsyn
64a946643e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-07-15 14:11:54 +07:00
Egor Kislitsyn
a87c313309 Support list visibility in StatusView 2019-07-15 14:00:29 +07:00
Sergey Suprunenko
dce8ebc9ea Unfollow should also unsubscribe 2019-07-14 19:25:03 +00:00
Moonman
f98f7ad1b9 detect and use sha512-crypt for stored password hash. 2019-07-14 09:48:42 -07:00
Egor Kislitsyn
958fb9aa80 Add "listMessage" 2019-07-11 16:36:08 +07:00
Egor Kislitsyn
182f7bbb11 Merge branch 'develop' into feature/addressable-lists 2019-07-11 13:26:59 +07:00
Egor Kislitsyn
5104f65b69 Wrap error messages into gettext helpers 2019-07-10 18:10:09 +07:00
rinpatch
4c60a562a7 Fix not being able to pin unlisted posts 
Closes #1038
 2019-06-29 22:27:42 +03:00
Sergey Suprunenko
d53fb55bb7 Return correct response when reply to a direct message is not direct itself 2019-06-26 10:59:27 +00:00
rinpatch
c4e4f7d0e4 Add proper error handling for when the post exceeds character limits 2019-06-18 05:05:05 +03:00
lain
e1370ba131 Utils: Use update_follow_state_for_all when appropriate. 2019-06-05 16:51:28 +02:00
lain
076c9ae40e User: Remove superfluous maybe_follow. 2019-06-05 14:24:31 +02:00
Egor Kislitsyn
ddd4a09b72 Fix merge conflict 2019-06-05 17:55:00 +07:00
Egor Kislitsyn
cfa5572d28 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-05 17:53:15 +07:00
kaniini
e4babb1c9f Merge branch 'explicit-addressing' into 'develop' 
Explicit addressing

See merge request pleroma/pleroma!1239
 2019-06-05 08:28:20 +00:00
Egor Kislitsyn
6ba9055b51 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-05 12:54:30 +07: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
Egor Kislitsyn
9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-04 16:28:23 +07:00
lain
80d4d83aac CommonAPI: Add explicit addressing. 2019-06-03 18:17:08 +02: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
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
Egor Kislitsyn
f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-24 21:05:57 +07:00
rinpatch
5f67c26baf Accept strings in expires_in because sasuga javascript 2019-05-21 17:30:51 +03:00
rinpatch
a53d062730 Fix posting non-polls from mastofe 2019-05-21 14:19:03 +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
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
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
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
Alexander Strizhakov
7ed682213f Fix/902 random compile failing 2019-05-17 07:25:20 +00:00
Sergey Suprunenko
e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
Egor Kislitsyn
fc7246d715 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-16 17:54:24 +07: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
Egor Kislitsyn
e82e73478e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-14 19:00:07 +07:00
Egor Kislitsyn
23276e8d68 Use pseudo ap id of a list in BCC 2019-05-13 16:15:14 +07:00
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1 2019-05-03 16:27:50 +02:00
Egor Kislitsyn
a3dc02d282 Add addressable lists 2019-05-01 16:11:17 +07: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
William Pitcock
501af917b5 add support for bbcode 2019-04-26 22:35:02 +00: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