fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-27 08:16:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
5013 commits 26 branches 107 tags 316 MiB
Commit graph

3458 commits

Author SHA1 Message Date
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
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
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
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
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
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
Alexander Strizhakov ada384207b typo fix 
docs for RelMe provider
 2019-04-19 07:50:21 +00:00