OpenSource/mastodon
OpenSource/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-22 12:55:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add streaming updates for profiles in web UI

Browse source
This commit is contained in:
Eugen Rochko 2024-12-10 11:49:15 +01:00
parent 801cd731be
commit ede37ed835
4 changed files with 42 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/actions/streaming.js
View file

@ -195,3 +195,10 @@ export const connectDirectStream = () =>
*/
export const connectListStream = listId =>
connectTimelineStream(`list:${listId}`, 'list', { list: listId }, { fillGaps: () => fillListTimelineGaps(listId) });
/**
* @param {string} accountId
* @returns {function(): void}
*/
export const connectProfileStream = accountId =>
connectTimelineStream(`account:${accountId}`, 'profile', { account_id: accountId });

35
app/javascript/mastodon/features/account_timeline/index.jsx
View file

@ -7,21 +7,20 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import { lookupAccount, fetchAccount } from 'mastodon/actions/accounts';
import { fetchFeaturedTags } from 'mastodon/actions/featured_tags';
import { connectProfileStream } from 'mastodon/actions/streaming';
import { expandAccountFeaturedTimeline, expandAccountTimeline } from 'mastodon/actions/timelines';
import { ColumnBackButton } from 'mastodon/components/column_back_button';
import { LoadingIndicator } from 'mastodon/components/loading_indicator';
import StatusList from 'mastodon/components/status_list';
import { TimelineHint } from 'mastodon/components/timeline_hint';
import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
import { me } from 'mastodon/initial_state';
import Column from 'mastodon/features/ui/components/column';
import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
import { getAccountHidden } from 'mastodon/selectors';
import { useAppSelector } from 'mastodon/store';
import { lookupAccount, fetchAccount } from '../../actions/accounts';
import { fetchFeaturedTags } from '../../actions/featured_tags';
import { expandAccountFeaturedTimeline, expandAccountTimeline, connectTimeline, disconnectTimeline } from '../../actions/timelines';
import { ColumnBackButton } from '../../components/column_back_button';
import { LoadingIndicator } from '../../components/loading_indicator';
import StatusList from '../../components/status_list';
import Column from '../ui/components/column';
import { LimitedAccountHint } from './components/limited_account_hint';
import HeaderContainer from './containers/header_container';
@ -114,9 +113,12 @@ class AccountTimeline extends ImmutablePureComponent {
dispatch(fetchFeaturedTags(accountId));
dispatch(expandAccountTimeline(accountId, { withReplies, tagged }));
if (accountId === me) {
dispatch(connectTimeline(`account:${me}`));
if (this.disconnect) {
this.disconnect();
this.disconnect = null;
}
this.disconnect = dispatch(connectProfileStream(accountId));
}
componentDidMount () {
@ -142,17 +144,12 @@ class AccountTimeline extends ImmutablePureComponent {
}
dispatch(expandAccountTimeline(accountId, { withReplies, tagged }));
}
if (prevProps.accountId === me && accountId !== me) {
dispatch(disconnectTimeline({ timeline: `account:${me}` }));
}
}
componentWillUnmount () {
const { dispatch, accountId } = this.props;
if (accountId === me) {
dispatch(disconnectTimeline({ timeline: `account:${me}` }));
if (this.disconnect) {
this.disconnect();
this.disconnect = null;
}
}

5
app/services/fan_out_on_write_service.rb
View file

@ -63,6 +63,7 @@ class FanOutOnWriteService < BaseService
def fan_out_to_public_streams!
broadcast_to_hashtag_streams!
broadcast_to_public_streams!
broadcast_to_profile_streams!
end
def deliver_to_self!
@ -145,6 +146,10 @@ class FanOutOnWriteService < BaseService
end
end
def broadcast_to_profile_streams!
redis.publish("timeline:profile:#{@status.account_id}:public", anonymous_payload)
end
def deliver_to_conversation!
AccountConversation.add_status(@account, @status) unless update?
end

14
streaming/index.js
View file

@ -420,6 +420,8 @@ const startServer = async () => {
return 'direct';
case '/api/v1/streaming/list':
return 'list';
case '/api/v1/streaming/profile':
return 'profile';
default:
return undefined;
}
@ -972,6 +974,7 @@ const startServer = async () => {
* @property {string} [tag]
* @property {string} [list]
* @property {string} [only_media]
* @property {string} [account_id]
*/
/**
@ -1096,6 +1099,17 @@ const startServer = async () => {
reject(new AuthenticationError('Not authorized to stream this list'));
});
break;
case 'profile':
if (!params.account_id) {
reject(new RequestError('Missing account id parameter'));
return;
}
resolve({
channelIds: [`timeline:profile:${params.account_id}:public`],
options: { needsFiltering: true },
});
break;
default:
reject(new RequestError('Unknown stream type'));