limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
7431 commits 27 branches 107 tags 315 MiB
Commit graph

7431 commits

This branch
This branch
All branches
Author SHA1 Message Date
shadowfacts
e5c6bf3673 Mastodon API: URI encode hashtag name in generated URLs 
Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.
 2019-09-07 19:50:45 +00:00
Maksim Pechnikov
8c6cdff3cc Merge branch 'develop' into issue/1218 2019-09-07 22:17:32 +03:00
Maksim Pechnikov
39f99dc6cd Merge branch 'develop' into support/tests 2019-09-07 22:13:43 +03:00
kaniini
c45013df8e Merge branch 'chore/query-optimization' into 'develop' 
chore: query optimization

Closes #1224

See merge request pleroma/pleroma!1640
 2019-09-06 23:25:30 +00:00
Ariadne Conill
40a61532ca activity: when restricting deactivated users, precalculate the user list 
the PostgreSQL query planner is easily confused due to the complexity of
certain queries we make.  while we plan to simplify these queries through
unification of activities and objects, we are not yet there.  it has been
discovered that using a precalculated list of deactivated users encourages
the query planner to prefer simpler indices instead of the
activity_visibility index.

accordingly, drop the subquery and precalc the user list instead.
 2019-09-06 23:14:29 +00:00
Ariadne Conill
5effb2cbca activitypub: help ecto build a better query for thread mute filtering 
using an indexed value in thread_mute table helps ecto build a better query.
 2019-09-06 23:11:26 +00:00
Maksim Pechnikov
ab2f21e470 tests for mastodon_api_controller.ex 2019-09-06 21:50:00 +03:00
Alex S
b3f6f6a409 generating remote users 2019-09-06 20:14:02 +03:00
rinpatch
130bc8e0d5 Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop' 
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog

See merge request pleroma/pleroma!1638
 2019-09-06 15:29:03 +00:00
rinpatch
f92dc82dda Prioritize the removal of TwitterAPI and :accept_blocks in the changelog 2019-09-06 18:28:01 +03:00
Alex S
252e5db45c docs fixes 2019-09-06 16:37:18 +03:00
Maksim Pechnikov
eb74c3d5c7 Merge branch 'develop' into issue/1218 2019-09-06 14:01:07 +03:00
Ivan Tashkinov
ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs
 2019-09-06 13:26:05 +03:00
Egor Kislitsyn
40b3289c26 Refactor add_link_headers/7 -> add_link_headers/3 2019-09-06 17:08:47 +07:00
rinpatch
896ffabe37 Merge branch 'so-long-twitterapi' into 'develop' 
Removing TwitterAPI

See merge request pleroma/pleroma!1605
 2019-09-06 08:43:38 +00:00
rinpatch
d0e0f2380d Merge branch 'update-frontend-e75ac9dd' into 'develop' 
Update frontend bundle to e75ac9dd

See merge request pleroma/pleroma!1635
 2019-09-06 08:41:30 +00:00
rinpatch
16e6be340d Update frontend bundle to e75ac9dd 2019-09-06 11:31:44 +03:00
rinpatch
592ce8a74f Merge branch 'hotifx/emoji-trailing' into 'develop' 
Call TrailingFormatPlug for /api/pleroma/emoji

See merge request pleroma/pleroma!1634
 2019-09-05 19:23:52 +00:00
rinpatch
3523bdcf26 Call TrailingFormatPlug for /api/pleroma/emoji 
Apparently Pleroma-FE still calls it with trailing '.json'
 2019-09-05 22:21:20 +03:00
Maxim Filippov
736165c082 Reverse reports list 2019-09-05 16:54:34 +03:00
Alex S
a1125bd564 generatoin and fetching 2019-09-05 16:02:20 +03:00
Alex S
79dde58044 one more temp commit 2019-09-05 16:02:20 +03:00
Alex S
db690bede9 temp commit 2019-09-05 16:02:20 +03:00
Haelwenn
fe7cf44c40 Merge branch 'feature/mastoapi-accounts-external' into 'develop' 
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`

See merge request pleroma/pleroma!1622
 2019-09-05 12:48:27 +00:00
rinpatch
26fe6f70c9 Move checking for restrict_local to User.get_cached_by_id_or_nickname 2019-09-05 15:39:10 +03:00
rinpatch
9d4fc9aa35 Merge branch 'fix/endless-poll-handling' into 'develop' 
Mastodon API Poll view: Fix handling of polls without an end date

See merge request pleroma/pleroma!1631
 2019-09-05 09:11:16 +00:00
rinpatch
b312ca3d52 Mastodon API Poll view: Fix handling of polls without an end date 2019-09-05 12:03:39 +03:00
Ivan Tashkinov
79cf629e1a Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-09-05 11:30:41 +03:00
rinpatch
3e30f6e198 Merge branch 'fix/safe-render-notifications' into 'develop' 
Do not crash if one notification failed to render

See merge request pleroma/pleroma!1630
 2019-09-05 05:47:06 +00:00
rinpatch
558969a0fd Do not crash if one notification failed to render 2019-09-05 08:32:49 +03:00
rinpatch
3b8d64ee24 Merge branch 'dockerfile-touchups' into 'develop' 
Update Dockerfile + some touchups to docker.exs

See merge request pleroma/pleroma!1624
 2019-09-04 20:22:41 +00:00
Ashlynn Anderson
053b17f57e Switch to alpine:3.9 to avoid dlsym errors 2019-09-04 14:56:26 -04:00
Maksim Pechnikov
ae506ca997 fix formatting 2019-09-04 21:40:53 +03:00
Maksim
e2011a667c Apply suggestion to lib/pleroma/web/activity_pub/utils.ex 2019-09-04 18:35:01 +00:00
Maksim
8306078de1 Apply suggestion to lib/pleroma/web/activity_pub/utils.ex 2019-09-04 17:31:14 +00:00
Maxim Filippov
af746fa4a8 Return total for reports 2019-09-04 20:08:13 +03:00
Maxim Filippov
3542ca6702 Merge branch 'develop' into feature/moderation-log-filters 2019-09-04 19:40:07 +03:00
Sadposter
cb99cfcc65 don't try to truncate non-strings 2019-09-04 15:57:42 +01:00
Sadposter
2975da284b truncate remote user bio/display name 2019-09-04 15:45:40 +01:00
Maksim Pechnikov
a890451187 fetch_announcements -> take_announcements 2019-09-04 17:42:27 +03:00
Maksim Pechnikov
8cbad5500c add tests for activity_pub/utils.ex 2019-09-04 15:25:12 +03:00
Haelwenn
e72531bfac Merge branch 'feat/mastoapi-status-threadmuted' into 'develop' 
Mastodon API: Add `pleroma.thread_muted` to Status entity

See merge request pleroma/pleroma!1626
 2019-09-04 11:26:34 +00:00
rinpatch
3face45467 Mastodon API: Add pleroma.thread_muted to Status entity 
Needed for pleroma-fe!941
 2019-09-04 14:17:23 +03:00
Haelwenn
e54694748b Merge branch 'feature/mastoapi-read-notifications' into 'develop' 
Extend `/api/pleroma/notifications/read` to mark multiple notifications as read and make it respond with Mastoapi entities

See merge request pleroma/pleroma!1625
 2019-09-04 10:46:49 +00:00
rinpatch
328b2612cd Clarify that read notifications are returned 2019-09-04 13:39:39 +03:00
rinpatch
377aa9fb90 Apply suggestion to docs/api/pleroma_api.md 2019-09-04 10:37:43 +00:00
rinpatch
7c3838090f Apply suggestion to lib/pleroma/notification.ex 2019-09-04 10:14:15 +00:00
rinpatch
c2b6c1b089 Extend /api/pleroma/notifications/read to mark multiple notifications 
as read and make it respond with Mastoapi entities
 2019-09-04 12:38:27 +03:00
rinpatch
cc1d1ee406 Mastdon API: Add ability to get a remote account by nickname to 
`/api/v1/accounts/:id`
 2019-09-03 19:26:10 +03:00
Ashlynn Anderson
4b422b5469 Switch to official elixir:1.9-alpine image for build 2019-09-03 11:44:57 -04:00