f41f017bbc
Implement muting, add it to the mastodon API
6 years ago
f4bfc628ca
Player: allow styles on CSP, loop videos
6 years ago
aa9af1d639
CSP: Allow iframes on embed player
6 years ago
2d21ea1a0e
Merge branch 'develop' into fix/twittercards
6 years ago
10a11f083c
Embed player suitable for Twitter Cards
6 years ago
25b9e7a8c3
Added admin API for changing user activation status
6 years ago
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
6 years ago
f25a3f4f78
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
...
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
6 years ago
96dcacade1
properly check for follower address in is_private?
6 years ago
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
a39a094cda
Merge branch 'patch-image-description' into 'develop'
...
Patch to support image descriptions for pleroma-fe
See merge request pleroma/pleroma!626
6 years ago
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
6 years ago
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
3f38a05571
Merge branch 'csv-export' into 'develop'
...
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
6 years ago
94708d6370
Render only "id", "valid_until" and "app_name" in TokenView
6 years ago
f26582aae9
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
...
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
6 years ago
d3fe2c8ec6
[ #468 ] Formatting fix.
6 years ago
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
8f98d970c1
Fix recipient count in hellthread policy
6 years ago
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
6 years ago
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
6 years ago
1ce1b7b58d
Merge branch 'bugfix/oauth-token-padding' into 'develop'
...
oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825
6 years ago
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
6 years ago
c2e0a0c8d4
Readd threshold is not 0 check, optmization?
6 years ago
dca6bee2f7
Rename test, add check for follower collection when delisting
6 years ago
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
6 years ago
d943c90249
Add tests, change default config values, fix a bug
6 years ago
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
6 years ago
56862f4ce1
activitypub: clean up logging statements a little
6 years ago
04b1c13554
Merge remote-tracking branch 'upstream/develop' into patch-image-description
6 years ago
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
6 years ago
3f32d7b937
Fix queue name
6 years ago
907306174b
fix S3 links encoding in Mediaproxy
6 years ago
72ba5b4ab7
activitypub: user view: formatting
6 years ago
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
6 years ago
6542b86292
activitypub: user view: remove totalItems from user outbox
...
(this is based on a counter in User.Info, but the counter is not reliable.)
6 years ago
ee2fa1a314
activitypub: user view: remove totalInbox from user inbox view
...
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
6 years ago
bc9e5e6b65
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
...
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
6 years ago
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
6 years ago
e9ef4b8da6
oauth: never use base64 padding when returning tokens to applications
...
The normal Base64 alphabet uses the equals sign (=) as a padding character. Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.
6 years ago
e05bf2940f
activitypub: transmogrifier: correctly handle nil inReplyTo value
6 years ago
94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
6 years ago
f62c1d6266
Improve login error for OAuth flow
6 years ago
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
6 years ago
29e946ace4
activitypub: user view: add oauthRegistrationEndpoint to user profiles
6 years ago
db8abd958d
activitypub: user view: fix up endpoints rendering
6 years ago
90facd3598
user view: add AP C2S oauth endpoints to local user profiles
6 years ago
bef9b9cb66
refactored code
6 years ago
adcdd21f16
Merge branch 'develop' into hellthread-filter-fix
6 years ago
760fec4cb8
Update token.ex
6 years ago
62a45bdc11
Add revoke token
6 years ago
61a4bc5095
Add OAuth tokens endpoint
6 years ago
1d727cd069
added checks for public url and follower collections
6 years ago
c984e8272a
Formatting
6 years ago
4956ab5ea3
Fix compile
6 years ago
ac7ef0999d
WIP: Fix Twitter Cards
...
Twitter cards were not passing any useful metadata. A few things were
being handled on Twitter's end by trying to match OpenGraph tags with
their own, but it wasn't working at all for media. This is an attempt to
fix that.
Common functions have been pulled out of opengraph and put into
utils. Twitter's functionality was entirely replaced with a direct copy
of Opengraph's and then modified as needed.
Profiles are now represented as Summary Cards
Posts with images are now represented as Summart with Large Image Cards
Posts with video and audio attachments are represented as Player Cards.
This now passes the Twitter Card Validator.
Validator and Docs are below
https://cards-dev.twitter.com/validator
https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards
6 years ago
379d04692c
Filter summary in keywordpolicy
6 years ago
39383a6b79
Merge branch 'feature/thread-muting' into 'develop'
...
Feature/thread muting
See merge request pleroma/pleroma!796
6 years ago
044616292b
Merge branch 'feature/rich-media-limits' into 'develop'
...
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
6 years ago
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
6 years ago
45e57dd187
rich media: tighten fetching timeouts and size limits
6 years ago
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
6 years ago
cc21fc5f53
refactor, status view updating, error handling
6 years ago
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
6 years ago
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
6 years ago
a0d732ec55
it works!!
6 years ago
d924dc73ba
de-group import/s
6 years ago
6a6a5b3251
de-group alias/es
6 years ago
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
6 years ago
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
6 years ago
2272934a5e
Stash
6 years ago
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
6 years ago
473095faf2
Web.Federator: Fix unused variable
6 years ago
60ea29dfe6
Credo fixes: alias grouping/ordering
6 years ago
106f4e7a0f
Credo fixes: parameter consistency
6 years ago
8bcfac93a8
Make credo happy
6 years ago
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
...
Add keyword policy
See merge request pleroma/pleroma!794
6 years ago
7e47a810a2
help i am not good with git
6 years ago
5c5b228f21
Added thread unmuting (still a bit buggy maybe)
6 years ago
a44e532fb1
Added thread unmuting (still a bit buggy maybe)
6 years ago
7356659273
wow
6 years ago
98ec578f4d
Merge branch 'develop' into feature/thread-muting
6 years ago
f88dec8b33
What idiot did that? (me)
6 years ago
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
2174f6eb4f
Add default config for keyword policy
6 years ago
46aa8c18a2
Add keyword policy
6 years ago
c43f414a79
Somehow fixed the repo insert [skip-ci]
6 years ago
7e3ec93ed0
made a silly oopsie
6 years ago
77448de492
ugghhhh
6 years ago
2c68cf7e9e
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
...
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
6 years ago
f4ff4ffba2
Migration and some boilerplate stuff
6 years ago
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
6 years ago
18e783bcb2
Merge branch 'add-admin-and-moderator-fields' into 'develop'
...
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
6 years ago
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
6 years ago
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
6 years ago
f753043ce0
Fix if clause in activity_pub user_view
6 years ago
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
6 years ago
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
6 years ago
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
6 years ago
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
6 years ago
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
6 years ago
ecdb0b7f57
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
...
mastodon api: fix rendering of cards without image URLs (closes #597 )
Closes #597
See merge request pleroma/pleroma!777
6 years ago
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
6 years ago
e71ab5a10f
activitypub: transmogrifier: fix bare tags
6 years ago
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
6 years ago
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
6 years ago
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
6 years ago
64a3993425
activitypub: mrf: tag policy: add support for subscription control
6 years ago
14d967f515
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
6 years ago
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
6 years ago
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
6 years ago
88e32a32ce
mrf: add initial MRF.TagPolicy engine
6 years ago
00835bf678
Merge branch 'fix/rich-media-relative-path' into 'develop'
...
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
6 years ago
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
6 years ago
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
58262a8b8a
removed a debug thingy
6 years ago
4430641349
squished a bug
6 years ago
3cf046babb
actually commited the changes
6 years ago
63a4f4b7be
fixed Map,put arguments, updated nomenclature
6 years ago
583c4e0f17
more tweaks, fixed silly mistakes...
6 years ago
e10cda7541
implemented tweaks
6 years ago
531507a635
fixed things
6 years ago
10130fa7d6
made toggleable, added docs
6 years ago
0ef0ae35ab
added optional delist feature
6 years ago
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
69a38644bc
Merge branch '589-fix-cache' into 'develop'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
6 years ago
505a084058
Still do caching in tests.
6 years ago
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
...
Added tests.
6 years ago
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
6 years ago
2c59eb3cfc
Add responsive features to layout
6 years ago
68d461b3a9
Check if rich media uri is relative
6 years ago
833404f0f5
Use with instead of if in the card
6 years ago
e4d18f328b
merge only if page_url is an absolute path
6 years ago
cbadf9d333
Fix rich media relative path
6 years ago
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
ffbf306c9a
Merge branch 'streaming-api-url-fix' into 'develop'
...
Fix WebSocket streaming API URL.
See merge request pleroma/pleroma!756
6 years ago
a184811a60
Use url() instead of static_url in Endpoint.websocket_url()
6 years ago
7e384a2425
Merge branch 'develop' into 'develop'
...
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
6 years ago
9cac8729af
update nodeinfo version when requesting 2.1
6 years ago
d747bd9870
Use String.replace_leading instead of String.replace for getting websocket streaming api url.
...
Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function.
6 years ago
1cdcee89da
mix format pass
6 years ago
23b1c64a19
downcase software name in nodeinfo
6 years ago
b17ce875cf
keep compatibility with nodeinfo 2.0
...
splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler
gives the same result, while the 2.1 handler inserts the
software.repository field. requested by @href
6 years ago
74c6119f28
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list
6 years ago
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
fc7644798d
Merge branch 'serve-sw-pleroma.js' into 'develop'
...
Serve sw-pleroma.js properly
See merge request pleroma/pleroma!754
6 years ago
fa5ec765d9
Serve sw-pleroma.js properly
6 years ago
01d483f9c7
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
6 years ago
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
b0c4c082c4
mix format pass
6 years ago
c05928dbda
use nodeinfo 2.1, add repository field
...
that is the only change from nodeinfo 2.0 to 2.1
also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
6 years ago
b19b4f8537
Remove default value for rich media.
...
Setting it to true will actually override a 'false' set before.
6 years ago
44913c1019
Merge branch 'bugfix/rich-media-non-unicode' into 'develop'
...
rich media non-unicode bugfix
See merge request pleroma/pleroma!749
6 years ago
46dba03098
rich media: parser: only try to validate strings, not numbers (OEmbed)
6 years ago
dafb6f0b5e
rich media: parser: reject OGP fields we cannot safely process
6 years ago
7057891db6
Make rich media support toggleable
6 years ago
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
5ea0397e2d
Fix 4aff4efa typos
6 years ago
4aff4efa8d
Use multiple hackney pools
...
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
6 years ago
7a2c4f984b
Merge branch 'bugfix/fix-rejects' into 'develop'
...
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
6 years ago
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
57549f6043
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
6 years ago
cbb2b709de
activitypub: transmogrifier: fix follow request rejections
6 years ago
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
6 years ago
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
6 years ago
61d6715714
rich media: oembed: return data in the same format as the other parsers
6 years ago
ddb5545202
rich media: kill some testsuite noise
6 years ago
0f11254a06
rich media: parser: add some basic sanity checks on the returned data with pattern matching
6 years ago
83b7062634
rich media: parser: cache negatives
6 years ago
8fb16e9f0f
rich media: parser: add copyright header
6 years ago
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
55affbca7f
add a job queue
6 years ago
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
8e8a1e1ba8
Return new-style config if old-style config is set to false.
...
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
6 years ago
de0fb88a9c
Merge branch 'safe-render-activities' into 'develop'
...
remove unnecessary filter (re !723 )
See merge request pleroma/pleroma!729
6 years ago
df2f7b39dd
re f83bae7c: remove unnecessary filter
6 years ago
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
6 years ago
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
6 years ago
ddc7ae2c1a
mastodon api: card: force OGP images through mediaproxy
6 years ago
ebeabdcc72
rich media: helpers: clean up unused aliases
6 years ago
91ef64a1ec
activitypub: prime OGP crawler cache when new messages are inserted into the database
6 years ago
8e42251e06
rich media: add helpers module, use instead of MastodonAPI module
6 years ago
24a103a1fe
mastodon api: formatting
6 years ago
6096846f5f
API: kill /api/rich_media/parse endpoint
6 years ago
07a9a891ad
twitter api: fix up activity representer
6 years ago
de42646634
rich media: add try/rescue to ensure we catch parsing and fetching failures
6 years ago
5d895093fd
twitter api: embed card in twitterapi posts
6 years ago
5a37ddc2dc
mastodon api: embed card in status object
6 years ago
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
872241d7c5
/web/index template: Modify for glitch-soc
6 years ago
71bb90073b
/notice/:id - send the FE index even if 404
...
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
6 years ago
16ab1437d6
Merge branch 'safe-render-activities' into 'develop'
...
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
6 years ago
ea12371a01
Merge branch 'discard-invalid-likes' into 'develop'
...
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
6 years ago
77f2137383
Transmogrifier: fix incoming objects with invalid likes
6 years ago
f83bae7c22
Views: wrap activity rendering in a rescue
...
this avoids complete timeline breakage when an activity fucks up
rendering.
6 years ago
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
6 years ago
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
6 years ago
8f2f471e94
rich media: gracefully handle fetching nil URIs
6 years ago
de956b9e04
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
6 years ago
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
6 years ago
86037e9c39
mastodon api: use HTML.extract_first_external_url()
6 years ago
78047d57bf
mastodon api: provider_name setting is required too on the card
6 years ago
39863236eb
Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x
...
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
6 years ago
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
6 years ago
5a84def6a6
Fix the logic in multi-hashtag TLs
6 years ago
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
6 years ago
1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
...
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
6 years ago
f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines
6 years ago
15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
6 years ago
060d280e64
[ #534 ] Made Salmon.send_to_user calls be handled through Federator.enqueue.
6 years ago
465adedb7c
[ #534 ] Websub fix: made SQL use UTC time zone when comparing with `valid_until` (instead of postgresql-server default time zone).
6 years ago
3a5b3c5a3a
Merge remote-tracking branch 'pl/develop' into oembed_provider
6 years ago
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
6 years ago
9274cabe01
Use correct logic to determine "attentions" list
6 years ago
3e9399ec0b
[ #534 ] Optimized bulk publish ops to filter on reachability early. `Instance` refactoring.
6 years ago
8654a591f0
[ #534 ] Updating external instances reachability on incoming federation.
6 years ago
54ec6d09b0
mrf: add anti-followbot policy
6 years ago
20b54366ee
[ #534 ] Federation publish requests status control (enforced 2xx response code check).
6 years ago
4333fea1dc
Send "hide_network" in user_view
6 years ago
f161a92cb1
[ #534 ] Initial implementation of unreachable federation targets retirement.
6 years ago
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
6 years ago
e221c681dc
New frontend configuration mechanism.
6 years ago
973c9eed18
Treat User.Info pinned ids as strings
6 years ago
cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param
6 years ago
28d77e373c
Flake Ids for Users and Activities
6 years ago
f9a3269099
Uploader callback controller
6 years ago
8cd853ce0c
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
...
[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
6 years ago
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
6 years ago
a4d3fec8a7
[ #502 ] Code comments update.
6 years ago
aa480f4a8b
[ #530 ] Prevents user `info` from being overwritten because of race conditions
...
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
6 years ago
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
2fdbd4d137
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
6 years ago
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
6 years ago
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
6 years ago
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
6 years ago
f3045a179e
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
6 years ago
aa37313416
activitypub: short-circuit is_public?() with directMessage flag check
6 years ago
7c9749f793
transmogrifier: slightly clean up fix_explicit_addressing pipeline
6 years ago
420651157b
transmogrifier: don't apply heuristics against messages which have `directMessage` set true
6 years ago
ddae43eb43
activitypub: add is_private?/is_direct? helpers
6 years ago
9adc80afff
common api: set directMessage flag on our own posts
6 years ago
75dfa1f0b0
mastodon api: get_visibility(): DMs never have a cc list.
6 years ago
681f40ee5c
activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs
6 years ago
8d06be35e0
activitypub: utils: add determine_explicit_mentions() and tests
6 years ago
42612b1c8d
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
6 years ago
44693fbf6e
Formating
6 years ago
afd83db0d7
Provide local og:url for remote activities
6 years ago
651ce1c97b
Merge branch '491_full_mentions_in_user_bio' into 'develop'
...
[#491 ] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
6 years ago
651a1d64b5
Add current user to mentioned
6 years ago
e116e55cab
Add actor to recipients
6 years ago
74346a7035
Fix merge conflict
6 years ago
997f4a5e09
Remove custom emojis and trailing whitespaces from previews
6 years ago
1b1af4798a
Use object instead of activity for metadata
6 years ago
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
6 years ago
75a9b2a851
activitypub: add a match clause for objects, not just activities
6 years ago
dbc4e92509
activitypub: transmogrifier: do not clobber the addressing on relayed announcements
6 years ago
33b473cc02
activitypub: allow is_public?() to work on any type of map representing an AS2 object
6 years ago
8e9f1d5587
activitypub: relay: chase selective public announce changes
6 years ago
2479e88815
activitypub: announce: add new public parameter
6 years ago
ae8a5942cf
Merge branch 'bad-copy-paste' into 'develop'
...
Fix bad link in likes collection
See merge request pleroma/pleroma!679
6 years ago
948fba6f76
Fix bad link in likes collection
...
Don't copy and paste, mkay
6 years ago
a95d5da607
Don't show content if empty or zero width space
6 years ago
849c83ed46
formatting
6 years ago
6bc9a641ba
Default to disabled in the code in case the setting is absent from config.exs
6 years ago
8c368d42a2
Make attachment links configurable
...
Thanks @href!
6 years ago
4d5f15cd42
Introduce optional unfurling of nsfw content
6 years ago
0256bd2f1d
Use object url instead of a hack
6 years ago
fd3a558230
Apply feld's patch
6 years ago
5fa508cc2b
Remove @providers and call Pleroma.config on runtime
6 years ago
bb43f4cee9
Remove useless with in opengraph.ex
6 years ago
293f6a8b71
join us now and share the software~. Also tests
6 years ago
943324b661
MastoAPI: Don't break on missing users.
6 years ago
b44995866b
Replace map with reduce to remove nils
6 years ago
ff01fd3c4f
Remove caching because it does not affect performance and may be even worse in some cases
6 years ago
bfe2a11a6b
Add config doc
6 years ago
a9c27e137d
Add a fallback function to handle generic params, just in case
6 years ago
a76793006b
Thanks you rinpatch, very cool
6 years ago
0039d45b5b
No need to use activity in the key
6 years ago
70b2bb6ede
add caching
6 years ago
dd1432d695
Disable previews for any activity, but create
6 years ago
565caff3f4
cache HTML in OGP
6 years ago
9aa69e12b8
Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
6 years ago
2e630bea0d
Add twitter card, filter nsfw
6 years ago
70f140681f
Add space between name and nickname
6 years ago
e8eecd61b4
Formating
6 years ago
410fd9d774
Attach attachments
6 years ago
17da432dbb
websub: improve error handling
6 years ago
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
6 years ago
850912b06b
refactor opengraph to a different module with a behaviour
6 years ago
8745c8c990
remove useless newlines after every tag. Make domain.com/username provide opengraph too
6 years ago
2858fd2da2
add a fallback function
6 years ago
ce15e0659e
Fix some edge cases [nervous laughter]
6 years ago
4656f433f9
Move metadata.ex out of ostatus
6 years ago
fd2f1258fb
Merge branch 'load-all-dms' into 'develop'
...
Remove recent activity restriction.
See merge request pleroma/pleroma!644
6 years ago
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
6 years ago
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
6 years ago
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
6 years ago
6e5b0406b9
mrf: add no placeholder-text policy, strips pointless "." content from posts with images
6 years ago
e4dc3f71ae
Resolve merge conflict
6 years ago
b8a77c5d70
Add OEmbed parser
6 years ago
868034375c
Add likes to activitypub object representation
...
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
6 years ago
581edd5a91
Add route to get object like activities
6 years ago
36711e1c83
Handle client submitted activitypub like activity
6 years ago
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
6 years ago
9daf162461
Honour parameters on MastoAPI /favourites
6 years ago
144b48da95
Add link headers to MastoAPI /favourites
...
As documented at https://docs.joinmastodon.org/api/rest/favourites/
6 years ago
b594a54d0c
unpin when deleting a status
6 years ago
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
6 years ago
1f851a0723
Add Twitter Card parser
6 years ago
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
6 years ago
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
6 years ago
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
6 years ago
2ecf81f10c
common api: fix newlines in markdown code blocks
6 years ago
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
6 years ago
b57db828c7
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
...
Rich media: Remove :commit since a tuple is already returned
See merge request pleroma/pleroma!649
6 years ago
a2d7f0e0e9
Remove :commit since a tuple is already returned
6 years ago
a99e156f2c
Add integer casts.
6 years ago
7ac152ed38
TwitterAPI: Add follower/following pagination.
6 years ago
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
6 years ago
5027f82cde
Add activity visibility index.
6 years ago
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
6 years ago
9854978b8b
Remove recent activity restriction.
...
This should be fine now, everything should be covered by indices.
6 years ago
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
6 years ago
20c0dd1e24
Support activity+json request for activity
6 years ago
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
e679da4c34
add `pinned` property to `StatusView`
6 years ago
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
6 years ago
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
6 years ago
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
380e9fba21
add pinned posts
6 years ago
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
6 years ago
36fa5e8802
Check visible_for_user when performing a search using a direct link.
6 years ago
52493467ac
Twitter API: Add a summary_html field.
...
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
6 years ago
576368237c
Merge branch 'activitypub-tombstone-fix' into 'develop'
...
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
6 years ago
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
6 years ago
6556be344d
Resolve some test failures.
6 years ago
3c86d907d4
add some brakets to the emoji list.
6 years ago
0787f0dfbe
Strip HTML in and allow emoji in summaries.
6 years ago
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
6 years ago
ba17518a0a
Merge branch 'feature/rich-media-cachex' into 'develop'
...
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
6 years ago
487c00d36d
rich media: disable cachex in test mode
6 years ago
bf5aaefbb5
Merge branch 'fix/html-cache-content-collision' into 'develop'
...
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
6 years ago
0964c207eb
rich media: use cachex to avoid flooding remote servers
6 years ago
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
6 years ago
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
6 years ago
ba93396649
Patch to support image descriptions in Pleroma FE
6 years ago
4c95545d19
Patch to support image descriptions in Pleroma FE
6 years ago
fe2dceb66d
Patch to support image descriptions in Pleroma FE
6 years ago
d9d62a110c
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
...
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
6 years ago
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
943211b035
rewrites List.foldl to Enum.each
6 years ago
48e81d3d40
Add RichMediaController and tests
6 years ago
4e1cc2bab6
Implement delete activity
6 years ago
551c3d9391
Split create activity specifics from update_outbox
6 years ago
917d48d09b
Better variable name
6 years ago
2aab4e03c3
Add OGP parser
6 years ago
32bed66471
Merge branch 'pool-usage' into 'develop'
...
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
6 years ago
34fa709015
Merge branch 'configurable-federator' into 'develop'
...
Make Federator options configurable.
See merge request pleroma/pleroma!615
6 years ago
32541172cd
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
...
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612
6 years ago
400337b0a7
Make Federator options configurable.
6 years ago
096a927805
Merge remote-tracking branch 'origin/develop' into pool-usage
6 years ago
d4799e0dc2
Remove default pool, it's used automatically anyway.
6 years ago
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
6 years ago
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
6 years ago
980b5288ed
update copyright years to 2019
6 years ago
33e3a7ba7d
Merge branch 'fix/scrubber-cache' into 'develop'
...
[#481 ] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
6 years ago
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
6 years ago
dec23500d8
Resolve merge conflict
6 years ago
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
6 years ago
bce152aba0
Tidy up the code. Rename key to signature
6 years ago
66d1c31461
Fix some stupid typos
6 years ago
f40562b4e1
Respond with full activity to outbox post
6 years ago
1e781715c8
Limit activity types accepted to outbox to only 'Create'
6 years ago
569bad8210
Create activity when client posts to outbox
6 years ago
26dc2dddab
Implement ActivityPub inbox view
...
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
6 years ago
a32e23905a
Use Object.change instead of Ecto.Changeset.change
6 years ago
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
9a0163db53
use Kernel.put_in instead of Map.merge
6 years ago
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
6 years ago
523848d1fd
Salmon# fixed publish an activity to remote accounts
6 years ago
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
49cf5f9ce0
Merge branch '471_invalid_accounts_rendering' into 'develop'
...
[#471 ] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
6 years ago
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
68f483ef4c
Merge branch 'fix/no-attachment-links' into 'develop'
...
Treat any present value in "no_attachment_links" as true
Closes pleroma-fe#175
See merge request pleroma/pleroma!597
6 years ago
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
6 years ago
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
be70272ab0
Treat only true and "true" as true
6 years ago
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
838c024231
Treat any present value in "no_attachment_links" as true
6 years ago
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
5811e65e67
Add some hard limits on inserted activities.
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
005b4194ff
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
...
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
6 years ago
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
a3e33fa177
Merge branch 'hotfix/activity-without-content' into 'develop'
...
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
6 years ago
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
6 years ago
a7f07bb6e5
Implement kaniini's tweaks
6 years ago
c76179419d
Renamed the things
6 years ago
409ff60bf8
Fix formatting
6 years ago
92362e1e22
Implement large thread filter
6 years ago
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
6 years ago
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
6 years ago
652f49d176
Remove extra bracket
6 years ago
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
b520d44b58
[ #114 ] `mix format`
6 years ago
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
3371a45884
[ #114 ] Formatting fix.
6 years ago
Ekaterina Vaartis