Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for searching AP users #4599

Merged
merged 2 commits into from
Aug 14, 2017
Merged

Add support for searching AP users #4599

merged 2 commits into from
Aug 14, 2017

Conversation

ykzts
Copy link
Member

@ykzts ykzts commented Aug 14, 2017

No description provided.

@ykzts ykzts added the activitypub Protocol-related changes, federation label Aug 14, 2017
end

def json_data
@_json_data ||= Oj.load(body, mode: :strict)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

include JsonLdHelper

@_json_data ||= body_to_json(body)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for review! ef768ec

@Gargron Gargron merged commit 5f22c01 into mastodon:master Aug 14, 2017
@ykzts ykzts deleted the search-ap branch August 14, 2017 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
activitypub Protocol-related changes, federation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants