commit: 3c6503038ecad20f1b8fa0c9ea7e46087c6e3f22
parent: 96e9ed13ded6def1d96260178ee9d9e7ad3e5d23
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 14 Aug 2017 04:53:31 +0200
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
Diffstat:
12 files changed, 167 insertions(+), 3 deletions(-)
diff --git a/app/controllers/intents_controller.rb b/app/controllers/intents_controller.rb
@@ -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
diff --git a/app/controllers/shares_controller.rb b/app/controllers/shares_controller.rb
@@ -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
diff --git a/app/javascript/mastodon/containers/compose_container.js b/app/javascript/mastodon/containers/compose_container.js
@@ -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>
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
@@ -89,6 +89,11 @@ export default class Mastodon extends React.PureComponent {
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());
}
diff --git a/app/javascript/mastodon/features/standalone/compose/index.js b/app/javascript/mastodon/features/standalone/compose/index.js
@@ -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>
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
@@ -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) {
switch(action.type) {
case STORE_HYDRATE:
- return clearAll(state.merge(action.state.get('compose')));
+ return hydrate(state, action.state.get('compose'));
case COMPOSE_MOUNT:
return state.set('mounted', true);
case COMPOSE_UNMOUNT:
diff --git a/app/javascript/packs/share.js b/app/javascript/packs/share.js
@@ -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);
+});
diff --git a/app/javascript/styles/containers.scss b/app/javascript/styles/containers.scss
@@ -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 {
width: 400px;
margin: 0 auto;
diff --git a/app/presenters/initial_state_presenter.rb b/app/presenters/initial_state_presenter.rb
@@ -1,5 +1,6 @@
# frozen_string_literal: true
class InitialStatePresenter < ActiveModelSerializers::Model
- attributes :settings, :push_subscription, :token, :current_account, :admin
+ attributes :settings, :push_subscription, :token,
+ :current_account, :admin, :text
end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
@@ -34,6 +34,8 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:default_sensitive] = object.current_account.user.setting_default_sensitive
end
+ store[:text] = object.text if object.text
+
store
end
diff --git a/app/views/shares/show.html.haml b/app/views/shares/show.html.haml
@@ -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) } }
diff --git a/config/routes.rb b/config/routes.rb
@@ -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/webfinger', to: 'well_known/webfinger#show', as: :webfinger
get 'manifest', to: 'manifests#show', defaults: { format: 'json' }
+ get 'intent', to: 'intents#show'
devise_for :users, path: 'auth', controllers: {
sessions: 'auth/sessions',
@@ -86,12 +87,13 @@ Rails.application.routes.draw do
# Remote follow
resource :authorize_follow, only: [:show, :create]
+ resource :share, only: [:show, :create]
namespace :admin do
resources :subscriptions, only: [:index]
resources :domain_blocks, only: [:index, :new, :create, :show, :destroy]
resource :settings, only: [:edit, :update]
-
+
resources :instances, only: [:index] do
collection do
post :resubscribe
