Add protocol handler. Handle follow intents (#4511)
* Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS
This commit is contained in:
parent
96e9ed13de
commit
3c6503038e
12 changed files with 167 additions and 3 deletions
18
app/controllers/intents_controller.rb
Normal file
18
app/controllers/intents_controller.rb
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class IntentsController < ApplicationController
|
||||||
|
def show
|
||||||
|
uri = Addressable::URI.parse(params[:uri])
|
||||||
|
|
||||||
|
if uri.scheme == 'web+mastodon'
|
||||||
|
case uri.host
|
||||||
|
when 'follow'
|
||||||
|
return redirect_to authorize_follow_path(acct: uri.query_values['uri'].gsub(/\Aacct:/, ''))
|
||||||
|
when 'share'
|
||||||
|
return redirect_to share_path(text: uri.query_values['text'])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
not_found
|
||||||
|
end
|
||||||
|
end
|
25
app/controllers/shares_controller.rb
Normal file
25
app/controllers/shares_controller.rb
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class SharesController < ApplicationController
|
||||||
|
layout 'public'
|
||||||
|
|
||||||
|
before_action :authenticate_user!
|
||||||
|
|
||||||
|
def show
|
||||||
|
serializable_resource = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(initial_state_params), serializer: InitialStateSerializer)
|
||||||
|
@initial_state_json = serializable_resource.to_json
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def initial_state_params
|
||||||
|
{
|
||||||
|
settings: Web::Setting.find_by(user: current_user)&.data || {},
|
||||||
|
push_subscription: current_account.user.web_push_subscription(current_session),
|
||||||
|
current_account: current_account,
|
||||||
|
token: current_session.token,
|
||||||
|
admin: Account.find_local(Setting.site_contact_username),
|
||||||
|
text: params[:text],
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
39
app/javascript/mastodon/containers/compose_container.js
Normal file
39
app/javascript/mastodon/containers/compose_container.js
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { Provider } from 'react-redux';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import configureStore from '../store/configureStore';
|
||||||
|
import { hydrateStore } from '../actions/store';
|
||||||
|
import { IntlProvider, addLocaleData } from 'react-intl';
|
||||||
|
import { getLocale } from '../locales';
|
||||||
|
import Compose from '../features/standalone/compose';
|
||||||
|
|
||||||
|
const { localeData, messages } = getLocale();
|
||||||
|
addLocaleData(localeData);
|
||||||
|
|
||||||
|
const store = configureStore();
|
||||||
|
const initialStateContainer = document.getElementById('initial-state');
|
||||||
|
|
||||||
|
if (initialStateContainer !== null) {
|
||||||
|
const initialState = JSON.parse(initialStateContainer.textContent);
|
||||||
|
store.dispatch(hydrateStore(initialState));
|
||||||
|
}
|
||||||
|
|
||||||
|
export default class TimelineContainer extends React.PureComponent {
|
||||||
|
|
||||||
|
static propTypes = {
|
||||||
|
locale: PropTypes.string.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
render () {
|
||||||
|
const { locale } = this.props;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<IntlProvider locale={locale} messages={messages}>
|
||||||
|
<Provider store={store}>
|
||||||
|
<Compose />
|
||||||
|
</Provider>
|
||||||
|
</IntlProvider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -89,6 +89,11 @@ export default class Mastodon extends React.PureComponent {
|
||||||
Notification.requestPermission();
|
Notification.requestPermission();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof navigator.registerProtocolHandler !== 'undefined') {
|
||||||
|
const handlerUrl = window.location.protocol + '//' + window.location.host + '/intent?uri=%s';
|
||||||
|
navigator.registerProtocolHandler('web+mastodon', handlerUrl, 'Mastodon');
|
||||||
|
}
|
||||||
|
|
||||||
store.dispatch(showOnboardingOnce());
|
store.dispatch(showOnboardingOnce());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
18
app/javascript/mastodon/features/standalone/compose/index.js
Normal file
18
app/javascript/mastodon/features/standalone/compose/index.js
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
import React from 'react';
|
||||||
|
import ComposeFormContainer from '../../compose/containers/compose_form_container';
|
||||||
|
import NotificationsContainer from '../../ui/containers/notifications_container';
|
||||||
|
import LoadingBarContainer from '../../ui/containers/loading_bar_container';
|
||||||
|
|
||||||
|
export default class Compose extends React.PureComponent {
|
||||||
|
|
||||||
|
render () {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<ComposeFormContainer />
|
||||||
|
<NotificationsContainer />
|
||||||
|
<LoadingBarContainer className='loading-bar' />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -141,10 +141,20 @@ const privacyPreference = (a, b) => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const hydrate = (state, hydratedState) => {
|
||||||
|
state = clearAll(state.merge(hydratedState));
|
||||||
|
|
||||||
|
if (hydratedState.has('text')) {
|
||||||
|
state = state.set('text', hydratedState.get('text'));
|
||||||
|
}
|
||||||
|
|
||||||
|
return state;
|
||||||
|
};
|
||||||
|
|
||||||
export default function compose(state = initialState, action) {
|
export default function compose(state = initialState, action) {
|
||||||
switch(action.type) {
|
switch(action.type) {
|
||||||
case STORE_HYDRATE:
|
case STORE_HYDRATE:
|
||||||
return clearAll(state.merge(action.state.get('compose')));
|
return hydrate(state, action.state.get('compose'));
|
||||||
case COMPOSE_MOUNT:
|
case COMPOSE_MOUNT:
|
||||||
return state.set('mounted', true);
|
return state.set('mounted', true);
|
||||||
case COMPOSE_UNMOUNT:
|
case COMPOSE_UNMOUNT:
|
||||||
|
|
24
app/javascript/packs/share.js
Normal file
24
app/javascript/packs/share.js
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
import loadPolyfills from '../mastodon/load_polyfills';
|
||||||
|
|
||||||
|
require.context('../images/', true);
|
||||||
|
|
||||||
|
function loaded() {
|
||||||
|
const ComposeContainer = require('../mastodon/containers/compose_container').default;
|
||||||
|
const React = require('react');
|
||||||
|
const ReactDOM = require('react-dom');
|
||||||
|
const mountNode = document.getElementById('mastodon-compose');
|
||||||
|
|
||||||
|
if (mountNode !== null) {
|
||||||
|
const props = JSON.parse(mountNode.getAttribute('data-props'));
|
||||||
|
ReactDOM.render(<ComposeContainer {...props} />, mountNode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function main() {
|
||||||
|
const ready = require('../mastodon/ready').default;
|
||||||
|
ready(loaded);
|
||||||
|
}
|
||||||
|
|
||||||
|
loadPolyfills().then(main).catch(error => {
|
||||||
|
console.error(error);
|
||||||
|
});
|
|
@ -44,6 +44,21 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.compose-standalone {
|
||||||
|
.compose-form {
|
||||||
|
width: 400px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 20px 0;
|
||||||
|
margin-top: 40px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
|
||||||
|
@media screen and (max-width: 400px) {
|
||||||
|
margin-top: 0;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.account-header {
|
.account-header {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class InitialStatePresenter < ActiveModelSerializers::Model
|
class InitialStatePresenter < ActiveModelSerializers::Model
|
||||||
attributes :settings, :push_subscription, :token, :current_account, :admin
|
attributes :settings, :push_subscription, :token,
|
||||||
|
:current_account, :admin, :text
|
||||||
end
|
end
|
||||||
|
|
|
@ -34,6 +34,8 @@ class InitialStateSerializer < ActiveModel::Serializer
|
||||||
store[:default_sensitive] = object.current_account.user.setting_default_sensitive
|
store[:default_sensitive] = object.current_account.user.setting_default_sensitive
|
||||||
end
|
end
|
||||||
|
|
||||||
|
store[:text] = object.text if object.text
|
||||||
|
|
||||||
store
|
store
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
5
app/views/shares/show.html.haml
Normal file
5
app/views/shares/show.html.haml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
- content_for :header_tags do
|
||||||
|
%script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
|
||||||
|
= javascript_pack_tag 'share', integrity: true, crossorigin: 'anonymous'
|
||||||
|
|
||||||
|
#mastodon-compose{ data: { props: Oj.dump(default_props) } }
|
|
@ -20,6 +20,7 @@ Rails.application.routes.draw do
|
||||||
get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' }
|
get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' }
|
||||||
get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger
|
get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger
|
||||||
get 'manifest', to: 'manifests#show', defaults: { format: 'json' }
|
get 'manifest', to: 'manifests#show', defaults: { format: 'json' }
|
||||||
|
get 'intent', to: 'intents#show'
|
||||||
|
|
||||||
devise_for :users, path: 'auth', controllers: {
|
devise_for :users, path: 'auth', controllers: {
|
||||||
sessions: 'auth/sessions',
|
sessions: 'auth/sessions',
|
||||||
|
@ -86,6 +87,7 @@ Rails.application.routes.draw do
|
||||||
|
|
||||||
# Remote follow
|
# Remote follow
|
||||||
resource :authorize_follow, only: [:show, :create]
|
resource :authorize_follow, only: [:show, :create]
|
||||||
|
resource :share, only: [:show, :create]
|
||||||
|
|
||||||
namespace :admin do
|
namespace :admin do
|
||||||
resources :subscriptions, only: [:index]
|
resources :subscriptions, only: [:index]
|
||||||
|
|
Loading…
Reference in a new issue