Commit Graph

3314 Commits

Author SHA1 Message Date
Ekaterina Vaartis d51e5e447e Move emoji reloading to admin api 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 7680aec17d Move emoji api to pleroma api dir 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 36f2275dc9 A feature for shareable emoji packs, use it in download_from & tests 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 74fb6d8647 Move EmojiAPIController from EmojiAPI to PleromaAPI 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 6cd651a38b Make the emoji controller api more RESTy 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 3971bf9c5f Change :sha to :checksum 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 7c784128fd Change emoji api responses to JSON 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis f24731788e Move emoji pack list from /list to / 2019-09-19 00:16:33 +03:00
vaartis cb125ffaf7 Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 8f509e6d1e Use with w/ pack_info_res 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 8790365fef Remove unused variable 2019-09-19 00:16:33 +03:00
vaartis b8a214b0ab Split list_packs 2019-09-19 00:16:33 +03:00
vaartis f251225cae Apply suggestions to emoji_api_controller.ex 2019-09-19 00:16:33 +03:00
vaartis c049c32270 Fixed a typo in create_archive_and_cache 2019-09-19 00:16:33 +03:00
vaartis 163082de6f Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis f6d4acc871 Fix credo warnings 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 87057101b0 Add documentation for the emoji api endpoints 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 9eb2ee4df0 Allow importing old (emoji.txt / plain) packs from the filesystem 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 13cd93a0d3 Use && insted of "and" for checking shared-files for packs
share-files can be nil and "and" does not like that
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis f5131540dc Add a way to create emoji packs via an endpoint 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 8dbdd5c280 Allow uploading new emojis to packs from URLs 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 16edfef12e Handle empty shortcode/filename/new_shortcode/new_filename 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 9afe7258dd Implememt emoji pack file updating + write tests 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 261d92f9c2 Update the pack fallback-src sha generation condition
The old one would not regenerate sha when fallback src changed
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis bcc0bfd0c5 Add an endpoint for emoji pack metadata updating 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis b78973d27f fallback can't have pack.json, reflect that in code
having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 2a94eca096 Change YAML to JSON 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 2d4b8f3d20 Add an endpoint for deleting emoji packs 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 3a8669b487 Fix responses for emoji pack controlller 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 7a0c755d0a Send ok for emoji reloading as text, not as json 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis ee620ecbf1 Add caching for emoji pack sharing 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 7fb7dd9e0e Only find SHA256 for packs that are shared 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 54b8e683bc Swap TOML for YAML to get YAML generation for packs from fallbacks
If fallback url doesn't have a pack.yml file, one from the source will
be used
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis b791a08656 Implement API actions on packs
That incldues listing them and downloading them from other instances
or from the remote url
2019-09-19 00:16:33 +03:00
feld ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop'
Add a setting to hide follows/followers stats from the user profile

See merge request pleroma/pleroma!1663
2019-09-18 21:13:15 +00:00
feld 25b4365656 Merge branch 'admin_api_invite_tokens' into 'develop'
POST for creating invite tokens in admin api

See merge request pleroma/pleroma!1637
2019-09-18 21:11:37 +00:00
rinpatch d32894ae51 Move object internal fields to a constant 2019-09-18 19:24:20 +03:00
rinpatch 7ef575d11e Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
2019-09-18 18:13:21 +03:00
Alex S a18f1e7cd7 namings 2019-09-18 10:49:14 +03:00
Alex S 2263c8b6b9 little fixes 2019-09-18 10:49:14 +03:00
Alex S 4faf2b1555 post for creating invite tokens in admin api 2019-09-18 10:49:14 +03:00
rinpatch ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop'
Admin API: Return total for reports

See merge request pleroma/pleroma!1628
2019-09-17 19:09:56 +00:00
Haelwenn 2301de3d75 Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
Fix `Transmogrifier.upgrade_user_from_ap_id/1`

See merge request pleroma/pleroma!1677
2019-09-17 17:16:39 +00:00
rinpatch 95a4a19417 Merge branch 'support/tests' into 'develop'
add tests for activity_pub/utils.ex

See merge request pleroma/pleroma!1627
2019-09-17 14:47:26 +00:00
Steven Fuchs 80c5c3495b remove remaining errors from tests 2019-09-17 14:44:52 +00:00
eugenijm 450bf7a63c Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`) 2019-09-17 14:45:47 +03:00
Egor Kislitsyn 085d014f08 Fix `Transmogrifier.upgrade_user_from_ap_id/1` 2019-09-16 19:26:00 +07:00
Maxim Filippov 219dca1b00 Merge branch 'develop' into feature/return-total-for-reports 2019-09-16 14:40:17 +03:00
Egor Kislitsyn 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
2019-09-16 17:55:04 +07:00
kaniini c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
2019-09-16 09:09:21 +00:00