Merge pull request #935 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
This commit is contained in:
commit
772b4ba24c
99 changed files with 1912 additions and 454 deletions
14
CHANGELOG.md
14
CHANGELOG.md
|
@ -3,6 +3,20 @@ Changelog
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## [2.7.4] - 2019-03-05
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix web UI not cleaning up notifications after block ([Gargron](https://github.com/tootsuite/mastodon/pull/10108))
|
||||||
|
- Fix redundant HTTP requests when resolving private statuses ([ThibG](https://github.com/tootsuite/mastodon/pull/10115))
|
||||||
|
- Fix performance of account media query ([abcang](https://github.com/tootsuite/mastodon/pull/10121))
|
||||||
|
- Fix mention processing for unknown accounts ([ThibG](https://github.com/tootsuite/mastodon/pull/10125))
|
||||||
|
- Fix getting started column not scrolling on short screens ([trwnh](https://github.com/tootsuite/mastodon/pull/10075))
|
||||||
|
- Fix direct messages pagination in the web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10126))
|
||||||
|
- Fix serialization of Announce activities ([ThibG](https://github.com/tootsuite/mastodon/pull/10129))
|
||||||
|
- Fix home timeline perpetually reloading when empty in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10130))
|
||||||
|
- Fix lists export ([ThibG](https://github.com/tootsuite/mastodon/pull/10136))
|
||||||
|
- Fix edit profile page crash for suspended-then-unsuspended users ([ThibG](https://github.com/tootsuite/mastodon/pull/10178))
|
||||||
|
|
||||||
## [2.7.3] - 2019-02-23
|
## [2.7.3] - 2019-02-23
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
|
|
@ -567,7 +567,7 @@ GEM
|
||||||
rufus-scheduler (~> 3.2)
|
rufus-scheduler (~> 3.2)
|
||||||
sidekiq (>= 3)
|
sidekiq (>= 3)
|
||||||
tilt (>= 1.4.0)
|
tilt (>= 1.4.0)
|
||||||
sidekiq-unique-jobs (6.0.11)
|
sidekiq-unique-jobs (6.0.12)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.5)
|
concurrent-ruby (~> 1.0, >= 1.0.5)
|
||||||
sidekiq (>= 4.0, < 7.0)
|
sidekiq (>= 4.0, < 7.0)
|
||||||
thor (~> 0)
|
thor (~> 0)
|
||||||
|
|
29
app/controllers/api/v1/polls/votes_controller.rb
Normal file
29
app/controllers/api/v1/polls/votes_controller.rb
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class Api::V1::Polls::VotesController < Api::BaseController
|
||||||
|
include Authorization
|
||||||
|
|
||||||
|
before_action -> { doorkeeper_authorize! :write, :'write:statuses' }
|
||||||
|
before_action :require_user!
|
||||||
|
before_action :set_poll
|
||||||
|
|
||||||
|
respond_to :json
|
||||||
|
|
||||||
|
def create
|
||||||
|
VoteService.new.call(current_account, @poll, vote_params[:choices])
|
||||||
|
render json: @poll, serializer: REST::PollSerializer
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def set_poll
|
||||||
|
@poll = Poll.attached.find(params[:poll_id])
|
||||||
|
authorize @poll.status, :show?
|
||||||
|
rescue Mastodon::NotPermittedError
|
||||||
|
raise ActiveRecord::RecordNotFound
|
||||||
|
end
|
||||||
|
|
||||||
|
def vote_params
|
||||||
|
params.permit(choices: [])
|
||||||
|
end
|
||||||
|
end
|
13
app/controllers/api/v1/polls_controller.rb
Normal file
13
app/controllers/api/v1/polls_controller.rb
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class Api::V1::PollsController < Api::BaseController
|
||||||
|
before_action -> { authorize_if_got_token! :read, :'read:statuses' }, only: :show
|
||||||
|
|
||||||
|
respond_to :json
|
||||||
|
|
||||||
|
def show
|
||||||
|
@poll = Poll.attached.find(params[:id])
|
||||||
|
ActivityPub::FetchRemotePollService.new.call(@poll, current_account) if user_signed_in? && @poll.possibly_stale?
|
||||||
|
render json: @poll, serializer: REST::PollSerializer, include_results: true
|
||||||
|
end
|
||||||
|
end
|
|
@ -53,6 +53,7 @@ class Api::V1::StatusesController < Api::BaseController
|
||||||
visibility: status_params[:visibility],
|
visibility: status_params[:visibility],
|
||||||
scheduled_at: status_params[:scheduled_at],
|
scheduled_at: status_params[:scheduled_at],
|
||||||
application: doorkeeper_token.application,
|
application: doorkeeper_token.application,
|
||||||
|
poll: status_params[:poll],
|
||||||
idempotency: request.headers['Idempotency-Key'])
|
idempotency: request.headers['Idempotency-Key'])
|
||||||
|
|
||||||
render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
|
render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
|
||||||
|
@ -73,12 +74,25 @@ class Api::V1::StatusesController < Api::BaseController
|
||||||
@status = Status.find(params[:id])
|
@status = Status.find(params[:id])
|
||||||
authorize @status, :show?
|
authorize @status, :show?
|
||||||
rescue Mastodon::NotPermittedError
|
rescue Mastodon::NotPermittedError
|
||||||
# Reraise in order to get a 404 instead of a 403 error code
|
|
||||||
raise ActiveRecord::RecordNotFound
|
raise ActiveRecord::RecordNotFound
|
||||||
end
|
end
|
||||||
|
|
||||||
def status_params
|
def status_params
|
||||||
params.permit(:status, :in_reply_to_id, :sensitive, :spoiler_text, :visibility, :scheduled_at, media_ids: [])
|
params.permit(
|
||||||
|
:status,
|
||||||
|
:in_reply_to_id,
|
||||||
|
:sensitive,
|
||||||
|
:spoiler_text,
|
||||||
|
:visibility,
|
||||||
|
:scheduled_at,
|
||||||
|
media_ids: [],
|
||||||
|
poll: [
|
||||||
|
:multiple,
|
||||||
|
:hide_totals,
|
||||||
|
:expires_in,
|
||||||
|
options: [],
|
||||||
|
]
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
def pagination_params(core_params)
|
def pagination_params(core_params)
|
||||||
|
|
|
@ -63,13 +63,19 @@ module JsonLdHelper
|
||||||
json.present? && json['id'] == uri ? json : nil
|
json.present? && json['id'] == uri ? json : nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def fetch_resource_without_id_validation(uri, on_behalf_of = nil)
|
def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_temporary_error = false)
|
||||||
build_request(uri, on_behalf_of).perform do |response|
|
build_request(uri, on_behalf_of).perform do |response|
|
||||||
|
unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error
|
||||||
|
raise Mastodon::UnexpectedResponseError, response
|
||||||
|
end
|
||||||
return body_to_json(response.body_with_limit) if response.code == 200
|
return body_to_json(response.body_with_limit) if response.code == 200
|
||||||
end
|
end
|
||||||
# If request failed, retry without doing it on behalf of a user
|
# If request failed, retry without doing it on behalf of a user
|
||||||
return if on_behalf_of.nil?
|
return if on_behalf_of.nil?
|
||||||
build_request(uri).perform do |response|
|
build_request(uri).perform do |response|
|
||||||
|
unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error
|
||||||
|
raise Mastodon::UnexpectedResponseError, response
|
||||||
|
end
|
||||||
response.code == 200 ? body_to_json(response.body_with_limit) : nil
|
response.code == 200 ? body_to_json(response.body_with_limit) : nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -92,6 +98,14 @@ module JsonLdHelper
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def response_successful?(response)
|
||||||
|
(200...300).cover?(response.code)
|
||||||
|
end
|
||||||
|
|
||||||
|
def response_error_unsalvageable?(response)
|
||||||
|
(400...500).cover?(response.code) && response.code != 429
|
||||||
|
end
|
||||||
|
|
||||||
def build_request(uri, on_behalf_of = nil)
|
def build_request(uri, on_behalf_of = nil)
|
||||||
request = Request.new(:get, uri)
|
request = Request.new(:get, uri)
|
||||||
request.on_behalf_of(on_behalf_of) if on_behalf_of
|
request.on_behalf_of(on_behalf_of) if on_behalf_of
|
||||||
|
|
|
@ -110,9 +110,19 @@ module StreamEntriesHelper
|
||||||
I18n.t('statuses.content_warning', warning: status.spoiler_text)
|
I18n.t('statuses.content_warning', warning: status.spoiler_text)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def poll_summary(status)
|
||||||
|
return unless status.poll
|
||||||
|
status.poll.options.map { |o| "[ ] #{o}" }.join("\n")
|
||||||
|
end
|
||||||
|
|
||||||
def status_description(status)
|
def status_description(status)
|
||||||
components = [[media_summary(status), status_text_summary(status)].reject(&:blank?).join(' · ')]
|
components = [[media_summary(status), status_text_summary(status)].reject(&:blank?).join(' · ')]
|
||||||
components << status.text if status.spoiler_text.blank?
|
|
||||||
|
if status.spoiler_text.blank?
|
||||||
|
components << status.text
|
||||||
|
components << poll_summary(status)
|
||||||
|
end
|
||||||
|
|
||||||
components.reject(&:blank?).join("\n\n")
|
components.reject(&:blank?).join("\n\n")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import api, { getLinks } from 'flavours/glitch/util/api';
|
import api, { getLinks } from 'flavours/glitch/util/api';
|
||||||
|
import { importAccount, importFetchedAccount, importFetchedAccounts } from './importer';
|
||||||
|
|
||||||
export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
|
export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
|
||||||
export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
|
export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
|
||||||
|
@ -94,7 +95,9 @@ export function fetchAccount(id) {
|
||||||
dispatch(fetchAccountRequest(id));
|
dispatch(fetchAccountRequest(id));
|
||||||
|
|
||||||
api(getState).get(`/api/v1/accounts/${id}`).then(response => {
|
api(getState).get(`/api/v1/accounts/${id}`).then(response => {
|
||||||
dispatch(fetchAccountSuccess(response.data));
|
dispatch(importFetchedAccount(response.data));
|
||||||
|
}).then(() => {
|
||||||
|
dispatch(fetchAccountSuccess());
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(fetchAccountFail(id, error));
|
dispatch(fetchAccountFail(id, error));
|
||||||
});
|
});
|
||||||
|
@ -108,10 +111,9 @@ export function fetchAccountRequest(id) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function fetchAccountSuccess(account) {
|
export function fetchAccountSuccess() {
|
||||||
return {
|
return {
|
||||||
type: ACCOUNT_FETCH_SUCCESS,
|
type: ACCOUNT_FETCH_SUCCESS,
|
||||||
account,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -338,6 +340,7 @@ export function fetchFollowers(id) {
|
||||||
api(getState).get(`/api/v1/accounts/${id}/followers`).then(response => {
|
api(getState).get(`/api/v1/accounts/${id}/followers`).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(fetchFollowersSuccess(id, response.data, next ? next.uri : null));
|
dispatch(fetchFollowersSuccess(id, response.data, next ? next.uri : null));
|
||||||
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
@ -383,6 +386,7 @@ export function expandFollowers(id) {
|
||||||
api(getState).get(url).then(response => {
|
api(getState).get(url).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(expandFollowersSuccess(id, response.data, next ? next.uri : null));
|
dispatch(expandFollowersSuccess(id, response.data, next ? next.uri : null));
|
||||||
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
@ -422,6 +426,7 @@ export function fetchFollowing(id) {
|
||||||
api(getState).get(`/api/v1/accounts/${id}/following`).then(response => {
|
api(getState).get(`/api/v1/accounts/${id}/following`).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(fetchFollowingSuccess(id, response.data, next ? next.uri : null));
|
dispatch(fetchFollowingSuccess(id, response.data, next ? next.uri : null));
|
||||||
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
@ -467,6 +472,7 @@ export function expandFollowing(id) {
|
||||||
api(getState).get(url).then(response => {
|
api(getState).get(url).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(expandFollowingSuccess(id, response.data, next ? next.uri : null));
|
dispatch(expandFollowingSuccess(id, response.data, next ? next.uri : null));
|
||||||
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
@ -548,6 +554,7 @@ export function fetchFollowRequests() {
|
||||||
|
|
||||||
api(getState).get('/api/v1/follow_requests').then(response => {
|
api(getState).get('/api/v1/follow_requests').then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(fetchFollowRequestsSuccess(response.data, next ? next.uri : null));
|
dispatch(fetchFollowRequestsSuccess(response.data, next ? next.uri : null));
|
||||||
}).catch(error => dispatch(fetchFollowRequestsFail(error)));
|
}).catch(error => dispatch(fetchFollowRequestsFail(error)));
|
||||||
};
|
};
|
||||||
|
@ -586,6 +593,7 @@ export function expandFollowRequests() {
|
||||||
|
|
||||||
api(getState).get(url).then(response => {
|
api(getState).get(url).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(expandFollowRequestsSuccess(response.data, next ? next.uri : null));
|
dispatch(expandFollowRequestsSuccess(response.data, next ? next.uri : null));
|
||||||
}).catch(error => dispatch(expandFollowRequestsFail(error)));
|
}).catch(error => dispatch(expandFollowRequestsFail(error)));
|
||||||
};
|
};
|
||||||
|
@ -749,9 +757,10 @@ export function fetchPinnedAccounts() {
|
||||||
return (dispatch, getState) => {
|
return (dispatch, getState) => {
|
||||||
dispatch(fetchPinnedAccountsRequest());
|
dispatch(fetchPinnedAccountsRequest());
|
||||||
|
|
||||||
api(getState).get(`/api/v1/endorsements`, { params: { limit: 0 } })
|
api(getState).get(`/api/v1/endorsements`, { params: { limit: 0 } }).then(response => {
|
||||||
.then(({ data }) => dispatch(fetchPinnedAccountsSuccess(data)))
|
dispatch(importFetchedAccounts(response.data));
|
||||||
.catch(err => dispatch(fetchPinnedAccountsFail(err)));
|
dispatch(fetchPinnedAccountsSuccess(response.data));
|
||||||
|
}).catch(err => dispatch(fetchPinnedAccountsFail(err)));
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -785,8 +794,10 @@ export function fetchPinnedAccountsSuggestions(q) {
|
||||||
following: true,
|
following: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
api(getState).get('/api/v1/accounts/search', { params })
|
api(getState).get('/api/v1/accounts/search', { params }).then(response => {
|
||||||
.then(({ data }) => dispatch(fetchPinnedAccountsSuggestionsReady(q, data)));
|
dispatch(importFetchedAccounts(response.data));
|
||||||
|
dispatch(fetchPinnedAccountsSuggestionsReady(q, response.data));
|
||||||
|
});
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import api, { getLinks } from 'flavours/glitch/util/api';
|
import api, { getLinks } from 'flavours/glitch/util/api';
|
||||||
import { fetchRelationships } from './accounts';
|
import { fetchRelationships } from './accounts';
|
||||||
|
import { importFetchedAccounts } from './importer';
|
||||||
|
|
||||||
export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
|
export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
|
||||||
export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
|
export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
|
||||||
|
@ -15,6 +16,7 @@ export function fetchBlocks() {
|
||||||
|
|
||||||
api(getState).get('/api/v1/blocks').then(response => {
|
api(getState).get('/api/v1/blocks').then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(fetchBlocksSuccess(response.data, next ? next.uri : null));
|
dispatch(fetchBlocksSuccess(response.data, next ? next.uri : null));
|
||||||
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
||||||
}).catch(error => dispatch(fetchBlocksFail(error)));
|
}).catch(error => dispatch(fetchBlocksFail(error)));
|
||||||
|
@ -54,6 +56,7 @@ export function expandBlocks() {
|
||||||
|
|
||||||
api(getState).get(url).then(response => {
|
api(getState).get(url).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(expandBlocksSuccess(response.data, next ? next.uri : null));
|
dispatch(expandBlocksSuccess(response.data, next ? next.uri : null));
|
||||||
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
||||||
}).catch(error => dispatch(expandBlocksFail(error)));
|
}).catch(error => dispatch(expandBlocksFail(error)));
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import api, { getLinks } from 'flavours/glitch/util/api';
|
import api, { getLinks } from 'flavours/glitch/util/api';
|
||||||
|
import { importFetchedStatuses } from './importer';
|
||||||
|
|
||||||
export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST';
|
export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST';
|
||||||
export const BOOKMARKED_STATUSES_FETCH_SUCCESS = 'BOOKMARKED_STATUSES_FETCH_SUCCESS';
|
export const BOOKMARKED_STATUSES_FETCH_SUCCESS = 'BOOKMARKED_STATUSES_FETCH_SUCCESS';
|
||||||
|
@ -18,6 +19,7 @@ export function fetchBookmarkedStatuses() {
|
||||||
|
|
||||||
api(getState).get('/api/v1/bookmarks').then(response => {
|
api(getState).get('/api/v1/bookmarks').then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedStatuses(response.data));
|
||||||
dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
|
dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(fetchBookmarkedStatusesFail(error));
|
dispatch(fetchBookmarkedStatusesFail(error));
|
||||||
|
@ -58,6 +60,7 @@ export function expandBookmarkedStatuses() {
|
||||||
|
|
||||||
api(getState).get(url).then(response => {
|
api(getState).get(url).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedStatuses(response.data));
|
||||||
dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
|
dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(expandBookmarkedStatusesFail(error));
|
dispatch(expandBookmarkedStatusesFail(error));
|
||||||
|
|
|
@ -6,7 +6,7 @@ import { useEmoji } from './emojis';
|
||||||
import { tagHistory } from 'flavours/glitch/util/settings';
|
import { tagHistory } from 'flavours/glitch/util/settings';
|
||||||
import { recoverHashtags } from 'flavours/glitch/util/hashtag';
|
import { recoverHashtags } from 'flavours/glitch/util/hashtag';
|
||||||
import resizeImage from 'flavours/glitch/util/resize_image';
|
import resizeImage from 'flavours/glitch/util/resize_image';
|
||||||
|
import { importFetchedAccounts } from './importer';
|
||||||
import { updateTimeline } from './timelines';
|
import { updateTimeline } from './timelines';
|
||||||
import { showAlertForError } from './alerts';
|
import { showAlertForError } from './alerts';
|
||||||
import { showAlert } from './alerts';
|
import { showAlert } from './alerts';
|
||||||
|
@ -338,6 +338,7 @@ const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, token) =>
|
||||||
limit: 4,
|
limit: 4,
|
||||||
},
|
},
|
||||||
}).then(response => {
|
}).then(response => {
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(readyComposeSuggestionsAccounts(token, response.data));
|
dispatch(readyComposeSuggestionsAccounts(token, response.data));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
if (!isCancel(error)) {
|
if (!isCancel(error)) {
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import api, { getLinks } from 'flavours/glitch/util/api';
|
import api, { getLinks } from 'flavours/glitch/util/api';
|
||||||
|
import { importFetchedStatuses } from './importer';
|
||||||
|
|
||||||
export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
|
export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
|
||||||
export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
|
export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
|
||||||
|
@ -18,6 +19,7 @@ export function fetchFavouritedStatuses() {
|
||||||
|
|
||||||
api(getState).get('/api/v1/favourites').then(response => {
|
api(getState).get('/api/v1/favourites').then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedStatuses(response.data));
|
||||||
dispatch(fetchFavouritedStatusesSuccess(response.data, next ? next.uri : null));
|
dispatch(fetchFavouritedStatusesSuccess(response.data, next ? next.uri : null));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(fetchFavouritedStatusesFail(error));
|
dispatch(fetchFavouritedStatusesFail(error));
|
||||||
|
@ -61,6 +63,7 @@ export function expandFavouritedStatuses() {
|
||||||
|
|
||||||
api(getState).get(url).then(response => {
|
api(getState).get(url).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedStatuses(response.data));
|
||||||
dispatch(expandFavouritedStatusesSuccess(response.data, next ? next.uri : null));
|
dispatch(expandFavouritedStatusesSuccess(response.data, next ? next.uri : null));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(expandFavouritedStatusesFail(error));
|
dispatch(expandFavouritedStatusesFail(error));
|
||||||
|
|
84
app/javascript/flavours/glitch/actions/importer/index.js
Normal file
84
app/javascript/flavours/glitch/actions/importer/index.js
Normal file
|
@ -0,0 +1,84 @@
|
||||||
|
import { normalizeAccount, normalizeStatus } from './normalizer';
|
||||||
|
|
||||||
|
export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT';
|
||||||
|
export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT';
|
||||||
|
export const STATUS_IMPORT = 'STATUS_IMPORT';
|
||||||
|
export const STATUSES_IMPORT = 'STATUSES_IMPORT';
|
||||||
|
export const POLLS_IMPORT = 'POLLS_IMPORT';
|
||||||
|
|
||||||
|
function pushUnique(array, object) {
|
||||||
|
if (array.every(element => element.id !== object.id)) {
|
||||||
|
array.push(object);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function importAccount(account) {
|
||||||
|
return { type: ACCOUNT_IMPORT, account };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function importAccounts(accounts) {
|
||||||
|
return { type: ACCOUNTS_IMPORT, accounts };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function importStatus(status) {
|
||||||
|
return { type: STATUS_IMPORT, status };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function importStatuses(statuses) {
|
||||||
|
return { type: STATUSES_IMPORT, statuses };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function importPolls(polls) {
|
||||||
|
return { type: POLLS_IMPORT, polls };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function importFetchedAccount(account) {
|
||||||
|
return importFetchedAccounts([account]);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function importFetchedAccounts(accounts) {
|
||||||
|
const normalAccounts = [];
|
||||||
|
|
||||||
|
function processAccount(account) {
|
||||||
|
pushUnique(normalAccounts, normalizeAccount(account));
|
||||||
|
|
||||||
|
if (account.moved) {
|
||||||
|
processAccount(account.moved);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
accounts.forEach(processAccount);
|
||||||
|
|
||||||
|
return importAccounts(normalAccounts);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function importFetchedStatus(status) {
|
||||||
|
return importFetchedStatuses([status]);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function importFetchedStatuses(statuses) {
|
||||||
|
return (dispatch, getState) => {
|
||||||
|
const accounts = [];
|
||||||
|
const normalStatuses = [];
|
||||||
|
const polls = [];
|
||||||
|
|
||||||
|
function processStatus(status) {
|
||||||
|
pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id])));
|
||||||
|
pushUnique(accounts, status.account);
|
||||||
|
|
||||||
|
if (status.reblog && status.reblog.id) {
|
||||||
|
processStatus(status.reblog);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status.poll && status.poll.id) {
|
||||||
|
pushUnique(polls, status.poll);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
statuses.forEach(processStatus);
|
||||||
|
|
||||||
|
dispatch(importPolls(polls));
|
||||||
|
dispatch(importFetchedAccounts(accounts));
|
||||||
|
dispatch(importStatuses(normalStatuses));
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,67 @@
|
||||||
|
import escapeTextContentForBrowser from 'escape-html';
|
||||||
|
import emojify from 'flavours/glitch/util/emoji';
|
||||||
|
import { unescapeHTML } from 'flavours/glitch/util/html';
|
||||||
|
import { expandSpoilers } from 'flavours/glitch/util/initial_state';
|
||||||
|
|
||||||
|
const domParser = new DOMParser();
|
||||||
|
|
||||||
|
const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => {
|
||||||
|
obj[`:${emoji.shortcode}:`] = emoji;
|
||||||
|
return obj;
|
||||||
|
}, {});
|
||||||
|
|
||||||
|
export function normalizeAccount(account) {
|
||||||
|
account = { ...account };
|
||||||
|
|
||||||
|
const emojiMap = makeEmojiMap(account);
|
||||||
|
const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
|
||||||
|
|
||||||
|
account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
|
||||||
|
account.note_emojified = emojify(account.note, emojiMap);
|
||||||
|
|
||||||
|
if (account.fields) {
|
||||||
|
account.fields = account.fields.map(pair => ({
|
||||||
|
...pair,
|
||||||
|
name_emojified: emojify(escapeTextContentForBrowser(pair.name)),
|
||||||
|
value_emojified: emojify(pair.value, emojiMap),
|
||||||
|
value_plain: unescapeHTML(pair.value),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (account.moved) {
|
||||||
|
account.moved = account.moved.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
return account;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function normalizeStatus(status, normalOldStatus) {
|
||||||
|
const normalStatus = { ...status };
|
||||||
|
normalStatus.account = status.account.id;
|
||||||
|
|
||||||
|
if (status.reblog && status.reblog.id) {
|
||||||
|
normalStatus.reblog = status.reblog.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status.poll && status.poll.id) {
|
||||||
|
normalStatus.poll = status.poll.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only calculate these values when status first encountered
|
||||||
|
// Otherwise keep the ones already in the reducer
|
||||||
|
if (normalOldStatus) {
|
||||||
|
normalStatus.search_index = normalOldStatus.get('search_index');
|
||||||
|
normalStatus.contentHtml = normalOldStatus.get('contentHtml');
|
||||||
|
normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
|
||||||
|
} else {
|
||||||
|
const spoilerText = normalStatus.spoiler_text || '';
|
||||||
|
const searchContent = [spoilerText, status.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
|
||||||
|
const emojiMap = makeEmojiMap(normalStatus);
|
||||||
|
|
||||||
|
normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
|
||||||
|
normalStatus.contentHtml = emojify(normalStatus.content, emojiMap);
|
||||||
|
normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
|
||||||
|
}
|
||||||
|
|
||||||
|
return normalStatus;
|
||||||
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
import api from 'flavours/glitch/util/api';
|
import api from 'flavours/glitch/util/api';
|
||||||
|
import { importFetchedAccounts, importFetchedStatus } from './importer';
|
||||||
|
|
||||||
export const REBLOG_REQUEST = 'REBLOG_REQUEST';
|
export const REBLOG_REQUEST = 'REBLOG_REQUEST';
|
||||||
export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
|
export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
|
||||||
|
@ -47,7 +48,8 @@ export function reblog(status) {
|
||||||
api(getState).post(`/api/v1/statuses/${status.get('id')}/reblog`).then(function (response) {
|
api(getState).post(`/api/v1/statuses/${status.get('id')}/reblog`).then(function (response) {
|
||||||
// The reblog API method returns a new status wrapped around the original. In this case we are only
|
// The reblog API method returns a new status wrapped around the original. In this case we are only
|
||||||
// interested in how the original is modified, hence passing it skipping the wrapper
|
// interested in how the original is modified, hence passing it skipping the wrapper
|
||||||
dispatch(reblogSuccess(status, response.data.reblog));
|
dispatch(importFetchedStatus(response.data.reblog));
|
||||||
|
dispatch(reblogSuccess(status));
|
||||||
}).catch(function (error) {
|
}).catch(function (error) {
|
||||||
dispatch(reblogFail(status, error));
|
dispatch(reblogFail(status, error));
|
||||||
});
|
});
|
||||||
|
@ -59,7 +61,8 @@ export function unreblog(status) {
|
||||||
dispatch(unreblogRequest(status));
|
dispatch(unreblogRequest(status));
|
||||||
|
|
||||||
api(getState).post(`/api/v1/statuses/${status.get('id')}/unreblog`).then(response => {
|
api(getState).post(`/api/v1/statuses/${status.get('id')}/unreblog`).then(response => {
|
||||||
dispatch(unreblogSuccess(status, response.data));
|
dispatch(importFetchedStatus(response.data));
|
||||||
|
dispatch(unreblogSuccess(status));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(unreblogFail(status, error));
|
dispatch(unreblogFail(status, error));
|
||||||
});
|
});
|
||||||
|
@ -73,11 +76,10 @@ export function reblogRequest(status) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function reblogSuccess(status, response) {
|
export function reblogSuccess(status) {
|
||||||
return {
|
return {
|
||||||
type: REBLOG_SUCCESS,
|
type: REBLOG_SUCCESS,
|
||||||
status: status,
|
status: status,
|
||||||
response: response,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -96,11 +98,10 @@ export function unreblogRequest(status) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function unreblogSuccess(status, response) {
|
export function unreblogSuccess(status) {
|
||||||
return {
|
return {
|
||||||
type: UNREBLOG_SUCCESS,
|
type: UNREBLOG_SUCCESS,
|
||||||
status: status,
|
status: status,
|
||||||
response: response,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -117,7 +118,8 @@ export function favourite(status) {
|
||||||
dispatch(favouriteRequest(status));
|
dispatch(favouriteRequest(status));
|
||||||
|
|
||||||
api(getState).post(`/api/v1/statuses/${status.get('id')}/favourite`).then(function (response) {
|
api(getState).post(`/api/v1/statuses/${status.get('id')}/favourite`).then(function (response) {
|
||||||
dispatch(favouriteSuccess(status, response.data));
|
dispatch(importFetchedStatus(response.data));
|
||||||
|
dispatch(favouriteSuccess(status));
|
||||||
}).catch(function (error) {
|
}).catch(function (error) {
|
||||||
dispatch(favouriteFail(status, error));
|
dispatch(favouriteFail(status, error));
|
||||||
});
|
});
|
||||||
|
@ -129,7 +131,8 @@ export function unfavourite(status) {
|
||||||
dispatch(unfavouriteRequest(status));
|
dispatch(unfavouriteRequest(status));
|
||||||
|
|
||||||
api(getState).post(`/api/v1/statuses/${status.get('id')}/unfavourite`).then(response => {
|
api(getState).post(`/api/v1/statuses/${status.get('id')}/unfavourite`).then(response => {
|
||||||
dispatch(unfavouriteSuccess(status, response.data));
|
dispatch(importFetchedStatus(response.data));
|
||||||
|
dispatch(unfavouriteSuccess(status));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(unfavouriteFail(status, error));
|
dispatch(unfavouriteFail(status, error));
|
||||||
});
|
});
|
||||||
|
@ -143,11 +146,10 @@ export function favouriteRequest(status) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function favouriteSuccess(status, response) {
|
export function favouriteSuccess(status) {
|
||||||
return {
|
return {
|
||||||
type: FAVOURITE_SUCCESS,
|
type: FAVOURITE_SUCCESS,
|
||||||
status: status,
|
status: status,
|
||||||
response: response,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -166,11 +168,10 @@ export function unfavouriteRequest(status) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function unfavouriteSuccess(status, response) {
|
export function unfavouriteSuccess(status) {
|
||||||
return {
|
return {
|
||||||
type: UNFAVOURITE_SUCCESS,
|
type: UNFAVOURITE_SUCCESS,
|
||||||
status: status,
|
status: status,
|
||||||
response: response,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -187,7 +188,8 @@ export function bookmark(status) {
|
||||||
dispatch(bookmarkRequest(status));
|
dispatch(bookmarkRequest(status));
|
||||||
|
|
||||||
api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function (response) {
|
api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function (response) {
|
||||||
dispatch(bookmarkSuccess(status, response.data));
|
dispatch(importFetchedStatus(response.data));
|
||||||
|
dispatch(bookmarkSuccess(status));
|
||||||
}).catch(function (error) {
|
}).catch(function (error) {
|
||||||
dispatch(bookmarkFail(status, error));
|
dispatch(bookmarkFail(status, error));
|
||||||
});
|
});
|
||||||
|
@ -199,7 +201,8 @@ export function unbookmark(status) {
|
||||||
dispatch(unbookmarkRequest(status));
|
dispatch(unbookmarkRequest(status));
|
||||||
|
|
||||||
api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
|
api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
|
||||||
dispatch(unbookmarkSuccess(status, response.data));
|
dispatch(importFetchedStatus(response.data));
|
||||||
|
dispatch(unbookmarkSuccess(status));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(unbookmarkFail(status, error));
|
dispatch(unbookmarkFail(status, error));
|
||||||
});
|
});
|
||||||
|
@ -213,11 +216,10 @@ export function bookmarkRequest(status) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function bookmarkSuccess(status, response) {
|
export function bookmarkSuccess(status) {
|
||||||
return {
|
return {
|
||||||
type: BOOKMARK_SUCCESS,
|
type: BOOKMARK_SUCCESS,
|
||||||
status: status,
|
status: status,
|
||||||
response: response,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -236,11 +238,10 @@ export function unbookmarkRequest(status) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function unbookmarkSuccess(status, response) {
|
export function unbookmarkSuccess(status) {
|
||||||
return {
|
return {
|
||||||
type: UNBOOKMARK_SUCCESS,
|
type: UNBOOKMARK_SUCCESS,
|
||||||
status: status,
|
status: status,
|
||||||
response: response,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -257,6 +258,7 @@ export function fetchReblogs(id) {
|
||||||
dispatch(fetchReblogsRequest(id));
|
dispatch(fetchReblogsRequest(id));
|
||||||
|
|
||||||
api(getState).get(`/api/v1/statuses/${id}/reblogged_by`).then(response => {
|
api(getState).get(`/api/v1/statuses/${id}/reblogged_by`).then(response => {
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(fetchReblogsSuccess(id, response.data));
|
dispatch(fetchReblogsSuccess(id, response.data));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(fetchReblogsFail(id, error));
|
dispatch(fetchReblogsFail(id, error));
|
||||||
|
@ -291,6 +293,7 @@ export function fetchFavourites(id) {
|
||||||
dispatch(fetchFavouritesRequest(id));
|
dispatch(fetchFavouritesRequest(id));
|
||||||
|
|
||||||
api(getState).get(`/api/v1/statuses/${id}/favourited_by`).then(response => {
|
api(getState).get(`/api/v1/statuses/${id}/favourited_by`).then(response => {
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(fetchFavouritesSuccess(id, response.data));
|
dispatch(fetchFavouritesSuccess(id, response.data));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(fetchFavouritesFail(id, error));
|
dispatch(fetchFavouritesFail(id, error));
|
||||||
|
@ -325,7 +328,8 @@ export function pin(status) {
|
||||||
dispatch(pinRequest(status));
|
dispatch(pinRequest(status));
|
||||||
|
|
||||||
api(getState).post(`/api/v1/statuses/${status.get('id')}/pin`).then(response => {
|
api(getState).post(`/api/v1/statuses/${status.get('id')}/pin`).then(response => {
|
||||||
dispatch(pinSuccess(status, response.data));
|
dispatch(importFetchedStatus(response.data));
|
||||||
|
dispatch(pinSuccess(status));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(pinFail(status, error));
|
dispatch(pinFail(status, error));
|
||||||
});
|
});
|
||||||
|
@ -339,11 +343,10 @@ export function pinRequest(status) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function pinSuccess(status, response) {
|
export function pinSuccess(status) {
|
||||||
return {
|
return {
|
||||||
type: PIN_SUCCESS,
|
type: PIN_SUCCESS,
|
||||||
status,
|
status,
|
||||||
response,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -360,7 +363,8 @@ export function unpin (status) {
|
||||||
dispatch(unpinRequest(status));
|
dispatch(unpinRequest(status));
|
||||||
|
|
||||||
api(getState).post(`/api/v1/statuses/${status.get('id')}/unpin`).then(response => {
|
api(getState).post(`/api/v1/statuses/${status.get('id')}/unpin`).then(response => {
|
||||||
dispatch(unpinSuccess(status, response.data));
|
dispatch(importFetchedStatus(response.data));
|
||||||
|
dispatch(unpinSuccess(status));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(unpinFail(status, error));
|
dispatch(unpinFail(status, error));
|
||||||
});
|
});
|
||||||
|
@ -374,11 +378,10 @@ export function unpinRequest(status) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function unpinSuccess(status, response) {
|
export function unpinSuccess(status) {
|
||||||
return {
|
return {
|
||||||
type: UNPIN_SUCCESS,
|
type: UNPIN_SUCCESS,
|
||||||
status,
|
status,
|
||||||
response,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import api from 'flavours/glitch/util/api';
|
import api from 'flavours/glitch/util/api';
|
||||||
|
import { importFetchedAccounts } from './importer';
|
||||||
import { showAlertForError } from './alerts';
|
import { showAlertForError } from './alerts';
|
||||||
|
|
||||||
export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST';
|
export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST';
|
||||||
|
@ -208,9 +209,10 @@ export const deleteListFail = (id, error) => ({
|
||||||
export const fetchListAccounts = listId => (dispatch, getState) => {
|
export const fetchListAccounts = listId => (dispatch, getState) => {
|
||||||
dispatch(fetchListAccountsRequest(listId));
|
dispatch(fetchListAccountsRequest(listId));
|
||||||
|
|
||||||
api(getState).get(`/api/v1/lists/${listId}/accounts`, { params: { limit: 0 } })
|
api(getState).get(`/api/v1/lists/${listId}/accounts`, { params: { limit: 0 } }).then(({ data }) => {
|
||||||
.then(({ data }) => dispatch(fetchListAccountsSuccess(listId, data)))
|
dispatch(importFetchedAccounts(data));
|
||||||
.catch(err => dispatch(fetchListAccountsFail(listId, err)));
|
dispatch(fetchListAccountsSuccess(listId, data));
|
||||||
|
}).catch(err => dispatch(fetchListAccountsFail(listId, err)));
|
||||||
};
|
};
|
||||||
|
|
||||||
export const fetchListAccountsRequest = id => ({
|
export const fetchListAccountsRequest = id => ({
|
||||||
|
@ -239,9 +241,10 @@ export const fetchListSuggestions = q => (dispatch, getState) => {
|
||||||
following: true,
|
following: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
api(getState).get('/api/v1/accounts/search', { params })
|
api(getState).get('/api/v1/accounts/search', { params }).then(({ data }) => {
|
||||||
.then(({ data }) => dispatch(fetchListSuggestionsReady(q, data)))
|
dispatch(importFetchedAccounts(data));
|
||||||
.catch(error => dispatch(showAlertForError(error)));
|
dispatch(fetchListSuggestionsReady(q, data));
|
||||||
|
}).catch(error => dispatch(showAlertForError(error)));
|
||||||
};
|
};
|
||||||
|
|
||||||
export const fetchListSuggestionsReady = (query, accounts) => ({
|
export const fetchListSuggestionsReady = (query, accounts) => ({
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import api, { getLinks } from 'flavours/glitch/util/api';
|
import api, { getLinks } from 'flavours/glitch/util/api';
|
||||||
import { fetchRelationships } from './accounts';
|
import { fetchRelationships } from './accounts';
|
||||||
|
import { importFetchedAccounts } from './importer';
|
||||||
import { openModal } from 'flavours/glitch/actions/modal';
|
import { openModal } from 'flavours/glitch/actions/modal';
|
||||||
|
|
||||||
export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
|
export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
|
||||||
|
@ -19,6 +20,7 @@ export function fetchMutes() {
|
||||||
|
|
||||||
api(getState).get('/api/v1/mutes').then(response => {
|
api(getState).get('/api/v1/mutes').then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(fetchMutesSuccess(response.data, next ? next.uri : null));
|
dispatch(fetchMutesSuccess(response.data, next ? next.uri : null));
|
||||||
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
||||||
}).catch(error => dispatch(fetchMutesFail(error)));
|
}).catch(error => dispatch(fetchMutesFail(error)));
|
||||||
|
@ -58,6 +60,7 @@ export function expandMutes() {
|
||||||
|
|
||||||
api(getState).get(url).then(response => {
|
api(getState).get(url).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedAccounts(response.data));
|
||||||
dispatch(expandMutesSuccess(response.data, next ? next.uri : null));
|
dispatch(expandMutesSuccess(response.data, next ? next.uri : null));
|
||||||
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
dispatch(fetchRelationships(response.data.map(item => item.id)));
|
||||||
}).catch(error => dispatch(expandMutesFail(error)));
|
}).catch(error => dispatch(expandMutesFail(error)));
|
||||||
|
|
|
@ -1,6 +1,12 @@
|
||||||
import api, { getLinks } from 'flavours/glitch/util/api';
|
import api, { getLinks } from 'flavours/glitch/util/api';
|
||||||
import IntlMessageFormat from 'intl-messageformat';
|
import IntlMessageFormat from 'intl-messageformat';
|
||||||
import { fetchRelationships } from './accounts';
|
import { fetchRelationships } from './accounts';
|
||||||
|
import {
|
||||||
|
importFetchedAccount,
|
||||||
|
importFetchedAccounts,
|
||||||
|
importFetchedStatus,
|
||||||
|
importFetchedStatuses,
|
||||||
|
} from './importer';
|
||||||
import { defineMessages } from 'react-intl';
|
import { defineMessages } from 'react-intl';
|
||||||
import { List as ImmutableList } from 'immutable';
|
import { List as ImmutableList } from 'immutable';
|
||||||
import { unescapeHTML } from 'flavours/glitch/util/html';
|
import { unescapeHTML } from 'flavours/glitch/util/html';
|
||||||
|
@ -47,6 +53,7 @@ const fetchRelatedRelationships = (dispatch, notifications) => {
|
||||||
|
|
||||||
export function updateNotifications(notification, intlMessages, intlLocale) {
|
export function updateNotifications(notification, intlMessages, intlLocale) {
|
||||||
return (dispatch, getState) => {
|
return (dispatch, getState) => {
|
||||||
|
const showInColumn = getState().getIn(['settings', 'notifications', 'shows', notification.type], true);
|
||||||
const showAlert = getState().getIn(['settings', 'notifications', 'alerts', notification.type], true);
|
const showAlert = getState().getIn(['settings', 'notifications', 'alerts', notification.type], true);
|
||||||
const playSound = getState().getIn(['settings', 'notifications', 'sounds', notification.type], true);
|
const playSound = getState().getIn(['settings', 'notifications', 'sounds', notification.type], true);
|
||||||
const filters = getFilters(getState(), { contextType: 'notifications' });
|
const filters = getFilters(getState(), { contextType: 'notifications' });
|
||||||
|
@ -60,15 +67,26 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
|
||||||
filtered = regex && regex.test(searchIndex);
|
filtered = regex && regex.test(searchIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (showInColumn) {
|
||||||
|
dispatch(importFetchedAccount(notification.account));
|
||||||
|
|
||||||
|
if (notification.status) {
|
||||||
|
dispatch(importFetchedStatus(notification.status));
|
||||||
|
}
|
||||||
|
|
||||||
dispatch({
|
dispatch({
|
||||||
type: NOTIFICATIONS_UPDATE,
|
type: NOTIFICATIONS_UPDATE,
|
||||||
notification,
|
notification,
|
||||||
account: notification.account,
|
|
||||||
status: notification.status,
|
|
||||||
meta: (playSound && !filtered) ? { sound: 'boop' } : undefined,
|
meta: (playSound && !filtered) ? { sound: 'boop' } : undefined,
|
||||||
});
|
});
|
||||||
|
|
||||||
fetchRelatedRelationships(dispatch, [notification]);
|
fetchRelatedRelationships(dispatch, [notification]);
|
||||||
|
} else if (playSound && !filtered) {
|
||||||
|
dispatch({
|
||||||
|
type: NOTIFICATIONS_UPDATE_NOOP,
|
||||||
|
meta: { sound: 'boop' },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// Desktop notifications
|
// Desktop notifications
|
||||||
if (typeof window.Notification !== 'undefined' && showAlert && !filtered) {
|
if (typeof window.Notification !== 'undefined' && showAlert && !filtered) {
|
||||||
|
@ -120,6 +138,10 @@ export function expandNotifications({ maxId } = {}, done = noOp) {
|
||||||
|
|
||||||
api(getState).get('/api/v1/notifications', { params }).then(response => {
|
api(getState).get('/api/v1/notifications', { params }).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
|
||||||
|
dispatch(importFetchedAccounts(response.data.map(item => item.account)));
|
||||||
|
dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
|
||||||
|
|
||||||
dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore));
|
dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore));
|
||||||
fetchRelatedRelationships(dispatch, response.data);
|
fetchRelatedRelationships(dispatch, response.data);
|
||||||
done();
|
done();
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import api from 'flavours/glitch/util/api';
|
import api from 'flavours/glitch/util/api';
|
||||||
|
import { importFetchedStatuses } from './importer';
|
||||||
|
|
||||||
export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';
|
export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';
|
||||||
export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
|
export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
|
||||||
|
@ -11,6 +12,7 @@ export function fetchPinnedStatuses() {
|
||||||
dispatch(fetchPinnedStatusesRequest());
|
dispatch(fetchPinnedStatusesRequest());
|
||||||
|
|
||||||
api(getState).get(`/api/v1/accounts/${me}/statuses`, { params: { pinned: true } }).then(response => {
|
api(getState).get(`/api/v1/accounts/${me}/statuses`, { params: { pinned: true } }).then(response => {
|
||||||
|
dispatch(importFetchedStatuses(response.data));
|
||||||
dispatch(fetchPinnedStatusesSuccess(response.data, null));
|
dispatch(fetchPinnedStatusesSuccess(response.data, null));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(fetchPinnedStatusesFail(error));
|
dispatch(fetchPinnedStatusesFail(error));
|
||||||
|
|
53
app/javascript/flavours/glitch/actions/polls.js
Normal file
53
app/javascript/flavours/glitch/actions/polls.js
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
import api from '../api';
|
||||||
|
|
||||||
|
export const POLL_VOTE_REQUEST = 'POLL_VOTE_REQUEST';
|
||||||
|
export const POLL_VOTE_SUCCESS = 'POLL_VOTE_SUCCESS';
|
||||||
|
export const POLL_VOTE_FAIL = 'POLL_VOTE_FAIL';
|
||||||
|
|
||||||
|
export const POLL_FETCH_REQUEST = 'POLL_FETCH_REQUEST';
|
||||||
|
export const POLL_FETCH_SUCCESS = 'POLL_FETCH_SUCCESS';
|
||||||
|
export const POLL_FETCH_FAIL = 'POLL_FETCH_FAIL';
|
||||||
|
|
||||||
|
export const vote = (pollId, choices) => (dispatch, getState) => {
|
||||||
|
dispatch(voteRequest());
|
||||||
|
|
||||||
|
api(getState).post(`/api/v1/polls/${pollId}/votes`, { choices })
|
||||||
|
.then(({ data }) => dispatch(voteSuccess(data)))
|
||||||
|
.catch(err => dispatch(voteFail(err)));
|
||||||
|
};
|
||||||
|
|
||||||
|
export const fetchPoll = pollId => (dispatch, getState) => {
|
||||||
|
dispatch(fetchPollRequest());
|
||||||
|
|
||||||
|
api(getState).get(`/api/v1/polls/${pollId}`)
|
||||||
|
.then(({ data }) => dispatch(fetchPollSuccess(data)))
|
||||||
|
.catch(err => dispatch(fetchPollFail(err)));
|
||||||
|
};
|
||||||
|
|
||||||
|
export const voteRequest = () => ({
|
||||||
|
type: POLL_VOTE_REQUEST,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const voteSuccess = poll => ({
|
||||||
|
type: POLL_VOTE_SUCCESS,
|
||||||
|
poll,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const voteFail = error => ({
|
||||||
|
type: POLL_VOTE_FAIL,
|
||||||
|
error,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const fetchPollRequest = () => ({
|
||||||
|
type: POLL_FETCH_REQUEST,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const fetchPollSuccess = poll => ({
|
||||||
|
type: POLL_FETCH_SUCCESS,
|
||||||
|
poll,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const fetchPollFail = error => ({
|
||||||
|
type: POLL_FETCH_FAIL,
|
||||||
|
error,
|
||||||
|
});
|
|
@ -1,5 +1,6 @@
|
||||||
import api from 'flavours/glitch/util/api';
|
import api from 'flavours/glitch/util/api';
|
||||||
import { fetchRelationships } from './accounts';
|
import { fetchRelationships } from './accounts';
|
||||||
|
import { importFetchedAccounts, importFetchedStatuses } from './importer';
|
||||||
|
|
||||||
export const SEARCH_CHANGE = 'SEARCH_CHANGE';
|
export const SEARCH_CHANGE = 'SEARCH_CHANGE';
|
||||||
export const SEARCH_CLEAR = 'SEARCH_CLEAR';
|
export const SEARCH_CLEAR = 'SEARCH_CLEAR';
|
||||||
|
@ -38,6 +39,14 @@ export function submitSearch() {
|
||||||
resolve: true,
|
resolve: true,
|
||||||
},
|
},
|
||||||
}).then(response => {
|
}).then(response => {
|
||||||
|
if (response.data.accounts) {
|
||||||
|
dispatch(importFetchedAccounts(response.data.accounts));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response.data.statuses) {
|
||||||
|
dispatch(importFetchedStatuses(response.data.statuses));
|
||||||
|
}
|
||||||
|
|
||||||
dispatch(fetchSearchSuccess(response.data));
|
dispatch(fetchSearchSuccess(response.data));
|
||||||
dispatch(fetchRelationships(response.data.accounts.map(item => item.id)));
|
dispatch(fetchRelationships(response.data.accounts.map(item => item.id)));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import api from 'flavours/glitch/util/api';
|
import api from 'flavours/glitch/util/api';
|
||||||
|
|
||||||
import { deleteFromTimelines } from './timelines';
|
import { deleteFromTimelines } from './timelines';
|
||||||
|
import { importFetchedStatus, importFetchedStatuses } from './importer';
|
||||||
|
|
||||||
export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
|
export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
|
||||||
export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';
|
export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';
|
||||||
|
@ -45,17 +46,17 @@ export function fetchStatus(id) {
|
||||||
dispatch(fetchStatusRequest(id, skipLoading));
|
dispatch(fetchStatusRequest(id, skipLoading));
|
||||||
|
|
||||||
api(getState).get(`/api/v1/statuses/${id}`).then(response => {
|
api(getState).get(`/api/v1/statuses/${id}`).then(response => {
|
||||||
dispatch(fetchStatusSuccess(response.data, skipLoading));
|
dispatch(importFetchedStatus(response.data));
|
||||||
|
dispatch(fetchStatusSuccess(skipLoading));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(fetchStatusFail(id, error, skipLoading));
|
dispatch(fetchStatusFail(id, error, skipLoading));
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function fetchStatusSuccess(status, skipLoading) {
|
export function fetchStatusSuccess(skipLoading) {
|
||||||
return {
|
return {
|
||||||
type: STATUS_FETCH_SUCCESS,
|
type: STATUS_FETCH_SUCCESS,
|
||||||
status,
|
|
||||||
skipLoading,
|
skipLoading,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -127,6 +128,7 @@ export function fetchContext(id) {
|
||||||
dispatch(fetchContextRequest(id));
|
dispatch(fetchContextRequest(id));
|
||||||
|
|
||||||
api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
|
api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
|
||||||
|
dispatch(importFetchedStatuses(response.data.ancestors.concat(response.data.descendants)));
|
||||||
dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
|
dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
|
||||||
|
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { Iterable, fromJS } from 'immutable';
|
import { Iterable, fromJS } from 'immutable';
|
||||||
import { hydrateCompose } from './compose';
|
import { hydrateCompose } from './compose';
|
||||||
|
import { importFetchedAccounts } from './importer';
|
||||||
|
|
||||||
export const STORE_HYDRATE = 'STORE_HYDRATE';
|
export const STORE_HYDRATE = 'STORE_HYDRATE';
|
||||||
export const STORE_HYDRATE_LAZY = 'STORE_HYDRATE_LAZY';
|
export const STORE_HYDRATE_LAZY = 'STORE_HYDRATE_LAZY';
|
||||||
|
@ -18,5 +19,6 @@ export function hydrateStore(rawState) {
|
||||||
});
|
});
|
||||||
|
|
||||||
dispatch(hydrateCompose());
|
dispatch(hydrateCompose());
|
||||||
|
dispatch(importFetchedAccounts(Object.values(rawState.accounts)));
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { importFetchedStatus, importFetchedStatuses } from './importer';
|
||||||
import api, { getLinks } from 'flavours/glitch/util/api';
|
import api, { getLinks } from 'flavours/glitch/util/api';
|
||||||
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
||||||
|
|
||||||
|
@ -14,11 +15,13 @@ export const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP';
|
||||||
export const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT';
|
export const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT';
|
||||||
|
|
||||||
export function updateTimeline(timeline, status, accept) {
|
export function updateTimeline(timeline, status, accept) {
|
||||||
return (dispatch, getState) => {
|
return dispatch => {
|
||||||
if (typeof accept === 'function' && !accept(status)) {
|
if (typeof accept === 'function' && !accept(status)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dispatch(importFetchedStatus(status));
|
||||||
|
|
||||||
dispatch({
|
dispatch({
|
||||||
type: TIMELINE_UPDATE,
|
type: TIMELINE_UPDATE,
|
||||||
timeline,
|
timeline,
|
||||||
|
@ -77,6 +80,7 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
|
||||||
|
|
||||||
api(getState).get(path, { params }).then(response => {
|
api(getState).get(path, { params }).then(response => {
|
||||||
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
||||||
|
dispatch(importFetchedStatuses(response.data));
|
||||||
dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.code === 206, isLoadingRecent, isLoadingMore));
|
dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.code === 206, isLoadingRecent, isLoadingMore));
|
||||||
done();
|
done();
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
|
156
app/javascript/flavours/glitch/components/poll.js
Normal file
156
app/javascript/flavours/glitch/components/poll.js
Normal file
|
@ -0,0 +1,156 @@
|
||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||||
|
import classNames from 'classnames';
|
||||||
|
import { vote, fetchPoll } from 'mastodon/actions/polls';
|
||||||
|
import Motion from 'mastodon/features/ui/util/optional_motion';
|
||||||
|
import spring from 'react-motion/lib/spring';
|
||||||
|
|
||||||
|
const messages = defineMessages({
|
||||||
|
moments: { id: 'time_remaining.moments', defaultMessage: 'Moments remaining' },
|
||||||
|
seconds: { id: 'time_remaining.seconds', defaultMessage: '{number, plural, one {# second} other {# seconds}} left' },
|
||||||
|
minutes: { id: 'time_remaining.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}} left' },
|
||||||
|
hours: { id: 'time_remaining.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}} left' },
|
||||||
|
days: { id: 'time_remaining.days', defaultMessage: '{number, plural, one {# day} other {# days}} left' },
|
||||||
|
closed: { id: 'poll.closed', defaultMessage: 'Closed' },
|
||||||
|
});
|
||||||
|
|
||||||
|
const SECOND = 1000;
|
||||||
|
const MINUTE = 1000 * 60;
|
||||||
|
const HOUR = 1000 * 60 * 60;
|
||||||
|
const DAY = 1000 * 60 * 60 * 24;
|
||||||
|
|
||||||
|
const timeRemainingString = (intl, date, now) => {
|
||||||
|
const delta = date.getTime() - now;
|
||||||
|
|
||||||
|
let relativeTime;
|
||||||
|
|
||||||
|
if (delta < 10 * SECOND) {
|
||||||
|
relativeTime = intl.formatMessage(messages.moments);
|
||||||
|
} else if (delta < MINUTE) {
|
||||||
|
relativeTime = intl.formatMessage(messages.seconds, { number: Math.floor(delta / SECOND) });
|
||||||
|
} else if (delta < HOUR) {
|
||||||
|
relativeTime = intl.formatMessage(messages.minutes, { number: Math.floor(delta / MINUTE) });
|
||||||
|
} else if (delta < DAY) {
|
||||||
|
relativeTime = intl.formatMessage(messages.hours, { number: Math.floor(delta / HOUR) });
|
||||||
|
} else {
|
||||||
|
relativeTime = intl.formatMessage(messages.days, { number: Math.floor(delta / DAY) });
|
||||||
|
}
|
||||||
|
|
||||||
|
return relativeTime;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default @injectIntl
|
||||||
|
class Poll extends ImmutablePureComponent {
|
||||||
|
|
||||||
|
static propTypes = {
|
||||||
|
poll: ImmutablePropTypes.map,
|
||||||
|
intl: PropTypes.object.isRequired,
|
||||||
|
dispatch: PropTypes.func,
|
||||||
|
disabled: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
state = {
|
||||||
|
selected: {},
|
||||||
|
};
|
||||||
|
|
||||||
|
handleOptionChange = e => {
|
||||||
|
const { target: { value } } = e;
|
||||||
|
|
||||||
|
if (this.props.poll.get('multiple')) {
|
||||||
|
const tmp = { ...this.state.selected };
|
||||||
|
if (tmp[value]) {
|
||||||
|
delete tmp[value];
|
||||||
|
} else {
|
||||||
|
tmp[value] = true;
|
||||||
|
}
|
||||||
|
this.setState({ selected: tmp });
|
||||||
|
} else {
|
||||||
|
const tmp = {};
|
||||||
|
tmp[value] = true;
|
||||||
|
this.setState({ selected: tmp });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
handleVote = () => {
|
||||||
|
if (this.props.disabled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.props.dispatch(vote(this.props.poll.get('id'), Object.keys(this.state.selected)));
|
||||||
|
};
|
||||||
|
|
||||||
|
handleRefresh = () => {
|
||||||
|
if (this.props.disabled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.props.dispatch(fetchPoll(this.props.poll.get('id')));
|
||||||
|
};
|
||||||
|
|
||||||
|
renderOption (option, optionIndex) {
|
||||||
|
const { poll, disabled } = this.props;
|
||||||
|
const percent = (option.get('votes_count') / poll.get('votes_count')) * 100;
|
||||||
|
const leading = poll.get('options').filterNot(other => other.get('title') === option.get('title')).every(other => option.get('votes_count') > other.get('votes_count'));
|
||||||
|
const active = !!this.state.selected[`${optionIndex}`];
|
||||||
|
const showResults = poll.get('voted') || poll.get('expired');
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li key={option.get('title')}>
|
||||||
|
{showResults && (
|
||||||
|
<Motion defaultStyle={{ width: 0 }} style={{ width: spring(percent, { stiffness: 180, damping: 12 }) }}>
|
||||||
|
{({ width }) =>
|
||||||
|
<span className={classNames('poll__chart', { leading })} style={{ width: `${width}%` }} />
|
||||||
|
}
|
||||||
|
</Motion>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<label className={classNames('poll__text', { selectable: !showResults })}>
|
||||||
|
<input
|
||||||
|
name='vote-options'
|
||||||
|
type={poll.get('multiple') ? 'checkbox' : 'radio'}
|
||||||
|
value={optionIndex}
|
||||||
|
checked={active}
|
||||||
|
onChange={this.handleOptionChange}
|
||||||
|
disabled={disabled}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{!showResults && <span className={classNames('poll__input', { checkbox: poll.get('multiple'), active })} />}
|
||||||
|
{showResults && <span className='poll__number'>{Math.round(percent)}%</span>}
|
||||||
|
|
||||||
|
{option.get('title')}
|
||||||
|
</label>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
render () {
|
||||||
|
const { poll, intl } = this.props;
|
||||||
|
|
||||||
|
if (!poll) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const timeRemaining = poll.get('expired') ? intl.formatMessage(messages.closed) : timeRemainingString(intl, new Date(poll.get('expires_at')), intl.now());
|
||||||
|
const showResults = poll.get('voted') || poll.get('expired');
|
||||||
|
const disabled = this.props.disabled || Object.entries(this.state.selected).every(item => !item);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className='poll'>
|
||||||
|
<ul>
|
||||||
|
{poll.get('options').map((option, i) => this.renderOption(option, i))}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div className='poll__footer'>
|
||||||
|
{!showResults && <button className='button button-secondary' disabled={disabled} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
|
||||||
|
{showResults && !this.props.disabled && <span><button className='poll__link' onClick={this.handleRefresh}><FormattedMessage id='poll.refresh' defaultMessage='Refresh' /></button> · </span>}
|
||||||
|
<FormattedMessage id='poll.total_votes' defaultMessage='{count, plural, one {# vote} other {# votes}}' values={{ count: poll.get('votes_count') }} />
|
||||||
|
{poll.get('expires_at') && <span> · {timeRemaining}</span>}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -15,6 +15,7 @@ import { HotKeys } from 'react-hotkeys';
|
||||||
import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';
|
import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { autoUnfoldCW } from 'flavours/glitch/util/content_warning';
|
import { autoUnfoldCW } from 'flavours/glitch/util/content_warning';
|
||||||
|
import PollContainer from 'flavours/glitch/containers/poll_container';
|
||||||
|
|
||||||
// We use the component (and not the container) since we do not want
|
// We use the component (and not the container) since we do not want
|
||||||
// to use the progress bar to show download progress
|
// to use the progress bar to show download progress
|
||||||
|
@ -437,7 +438,9 @@ export default class Status extends ImmutablePureComponent {
|
||||||
// `media`, we snatch the thumbnail to use as our `background` if media
|
// `media`, we snatch the thumbnail to use as our `background` if media
|
||||||
// backgrounds for collapsed statuses are enabled.
|
// backgrounds for collapsed statuses are enabled.
|
||||||
attachments = status.get('media_attachments');
|
attachments = status.get('media_attachments');
|
||||||
if (attachments.size > 0) {
|
if (status.get('poll')) {
|
||||||
|
media = <PollContainer pollId={status.get('poll')} />;
|
||||||
|
} else if (attachments.size > 0) {
|
||||||
if (muted || attachments.some(item => item.get('type') === 'unknown')) {
|
if (muted || attachments.some(item => item.get('type') === 'unknown')) {
|
||||||
media = (
|
media = (
|
||||||
<AttachmentList
|
<AttachmentList
|
||||||
|
|
|
@ -6,6 +6,7 @@ import { getLocale } from 'mastodon/locales';
|
||||||
import MediaGallery from 'flavours/glitch/components/media_gallery';
|
import MediaGallery from 'flavours/glitch/components/media_gallery';
|
||||||
import Video from 'flavours/glitch/features/video';
|
import Video from 'flavours/glitch/features/video';
|
||||||
import Card from 'flavours/glitch/features/status/components/card';
|
import Card from 'flavours/glitch/features/status/components/card';
|
||||||
|
import Poll from 'flavours/glitch/components/poll';
|
||||||
import ModalRoot from 'flavours/glitch/components/modal_root';
|
import ModalRoot from 'flavours/glitch/components/modal_root';
|
||||||
import MediaModal from 'flavours/glitch/features/ui/components/media_modal';
|
import MediaModal from 'flavours/glitch/features/ui/components/media_modal';
|
||||||
import { List as ImmutableList, fromJS } from 'immutable';
|
import { List as ImmutableList, fromJS } from 'immutable';
|
||||||
|
@ -13,7 +14,7 @@ import { List as ImmutableList, fromJS } from 'immutable';
|
||||||
const { localeData, messages } = getLocale();
|
const { localeData, messages } = getLocale();
|
||||||
addLocaleData(localeData);
|
addLocaleData(localeData);
|
||||||
|
|
||||||
const MEDIA_COMPONENTS = { MediaGallery, Video, Card };
|
const MEDIA_COMPONENTS = { MediaGallery, Video, Card, Poll };
|
||||||
|
|
||||||
export default class MediaContainer extends PureComponent {
|
export default class MediaContainer extends PureComponent {
|
||||||
|
|
||||||
|
@ -54,11 +55,12 @@ export default class MediaContainer extends PureComponent {
|
||||||
{[].map.call(components, (component, i) => {
|
{[].map.call(components, (component, i) => {
|
||||||
const componentName = component.getAttribute('data-component');
|
const componentName = component.getAttribute('data-component');
|
||||||
const Component = MEDIA_COMPONENTS[componentName];
|
const Component = MEDIA_COMPONENTS[componentName];
|
||||||
const { media, card, ...props } = JSON.parse(component.getAttribute('data-props'));
|
const { media, card, poll, ...props } = JSON.parse(component.getAttribute('data-props'));
|
||||||
|
|
||||||
Object.assign(props, {
|
Object.assign(props, {
|
||||||
...(media ? { media: fromJS(media) } : {}),
|
...(media ? { media: fromJS(media) } : {}),
|
||||||
...(card ? { card: fromJS(card) } : {}),
|
...(card ? { card: fromJS(card) } : {}),
|
||||||
|
...(poll ? { poll: fromJS(poll) } : {}),
|
||||||
|
|
||||||
...(componentName === 'Video' ? {
|
...(componentName === 'Video' ? {
|
||||||
onOpenVideo: this.handleOpenVideo,
|
onOpenVideo: this.handleOpenVideo,
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
import Poll from 'mastodon/components/poll';
|
||||||
|
|
||||||
|
const mapStateToProps = (state, { pollId }) => ({
|
||||||
|
poll: state.getIn(['polls', pollId]),
|
||||||
|
});
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(Poll);
|
|
@ -16,7 +16,7 @@ const messages = defineMessages({
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
|
hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
|
||||||
isPartial: state.getIn(['timelines', 'home', 'items', 0], null) === null,
|
isPartial: state.getIn(['timelines', 'home', 'isPartial']),
|
||||||
});
|
});
|
||||||
|
|
||||||
@connect(mapStateToProps)
|
@connect(mapStateToProps)
|
||||||
|
|
|
@ -14,6 +14,7 @@ import Video from 'flavours/glitch/features/video';
|
||||||
import VisibilityIcon from 'flavours/glitch/components/status_visibility_icon';
|
import VisibilityIcon from 'flavours/glitch/components/status_visibility_icon';
|
||||||
import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task';
|
import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
|
import PollContainer from 'flavours/glitch/containers/poll_container';
|
||||||
|
|
||||||
export default class DetailedStatus extends ImmutablePureComponent {
|
export default class DetailedStatus extends ImmutablePureComponent {
|
||||||
|
|
||||||
|
@ -118,7 +119,9 @@ export default class DetailedStatus extends ImmutablePureComponent {
|
||||||
outerStyle.height = `${this.state.height}px`;
|
outerStyle.height = `${this.state.height}px`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status.get('media_attachments').size > 0) {
|
if (status.get('poll')) {
|
||||||
|
media = <PollContainer pollId={status.get('poll')} />;
|
||||||
|
} else if (status.get('media_attachments').size > 0) {
|
||||||
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
|
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
|
||||||
media = <AttachmentList media={status.get('media_attachments')} />;
|
media = <AttachmentList media={status.get('media_attachments')} />;
|
||||||
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
|
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
|
||||||
|
|
|
@ -1,68 +1,7 @@
|
||||||
import {
|
import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from '../actions/importer';
|
||||||
ACCOUNT_FETCH_SUCCESS,
|
|
||||||
FOLLOWERS_FETCH_SUCCESS,
|
|
||||||
FOLLOWERS_EXPAND_SUCCESS,
|
|
||||||
FOLLOWING_FETCH_SUCCESS,
|
|
||||||
FOLLOWING_EXPAND_SUCCESS,
|
|
||||||
FOLLOW_REQUESTS_FETCH_SUCCESS,
|
|
||||||
FOLLOW_REQUESTS_EXPAND_SUCCESS,
|
|
||||||
PINNED_ACCOUNTS_FETCH_SUCCESS,
|
|
||||||
PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_READY,
|
|
||||||
} from 'flavours/glitch/actions/accounts';
|
|
||||||
import {
|
|
||||||
BLOCKS_FETCH_SUCCESS,
|
|
||||||
BLOCKS_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/blocks';
|
|
||||||
import {
|
|
||||||
MUTES_FETCH_SUCCESS,
|
|
||||||
MUTES_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/mutes';
|
|
||||||
import { COMPOSE_SUGGESTIONS_READY } from 'flavours/glitch/actions/compose';
|
|
||||||
import {
|
|
||||||
REBLOG_SUCCESS,
|
|
||||||
UNREBLOG_SUCCESS,
|
|
||||||
FAVOURITE_SUCCESS,
|
|
||||||
UNFAVOURITE_SUCCESS,
|
|
||||||
BOOKMARK_SUCCESS,
|
|
||||||
UNBOOKMARK_SUCCESS,
|
|
||||||
REBLOGS_FETCH_SUCCESS,
|
|
||||||
FAVOURITES_FETCH_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/interactions';
|
|
||||||
import {
|
|
||||||
TIMELINE_UPDATE,
|
|
||||||
TIMELINE_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/timelines';
|
|
||||||
import {
|
|
||||||
STATUS_FETCH_SUCCESS,
|
|
||||||
CONTEXT_FETCH_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/statuses';
|
|
||||||
import { SEARCH_FETCH_SUCCESS } from 'flavours/glitch/actions/search';
|
|
||||||
import {
|
|
||||||
NOTIFICATIONS_UPDATE,
|
|
||||||
NOTIFICATIONS_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/notifications';
|
|
||||||
import {
|
|
||||||
FAVOURITED_STATUSES_FETCH_SUCCESS,
|
|
||||||
FAVOURITED_STATUSES_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/favourites';
|
|
||||||
import {
|
|
||||||
BOOKMARKED_STATUSES_FETCH_SUCCESS,
|
|
||||||
BOOKMARKED_STATUSES_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/bookmarks';
|
|
||||||
import {
|
|
||||||
LIST_ACCOUNTS_FETCH_SUCCESS,
|
|
||||||
LIST_EDITOR_SUGGESTIONS_READY,
|
|
||||||
} from 'flavours/glitch/actions/lists';
|
|
||||||
import { STORE_HYDRATE } from 'flavours/glitch/actions/store';
|
|
||||||
import emojify from 'flavours/glitch/util/emoji';
|
|
||||||
import { Map as ImmutableMap, fromJS } from 'immutable';
|
import { Map as ImmutableMap, fromJS } from 'immutable';
|
||||||
import escapeTextContentForBrowser from 'escape-html';
|
|
||||||
import { unescapeHTML } from 'flavours/glitch/util/html';
|
|
||||||
|
|
||||||
const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => {
|
const initialState = ImmutableMap();
|
||||||
obj[`:${emoji.shortcode}:`] = emoji;
|
|
||||||
return obj;
|
|
||||||
}, {});
|
|
||||||
|
|
||||||
const normalizeAccount = (state, account) => {
|
const normalizeAccount = (state, account) => {
|
||||||
account = { ...account };
|
account = { ...account };
|
||||||
|
@ -71,25 +10,6 @@ const normalizeAccount = (state, account) => {
|
||||||
delete account.following_count;
|
delete account.following_count;
|
||||||
delete account.statuses_count;
|
delete account.statuses_count;
|
||||||
|
|
||||||
const emojiMap = makeEmojiMap(account);
|
|
||||||
const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
|
|
||||||
account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
|
|
||||||
account.note_emojified = emojify(account.note, emojiMap);
|
|
||||||
|
|
||||||
if (account.fields) {
|
|
||||||
account.fields = account.fields.map(pair => ({
|
|
||||||
...pair,
|
|
||||||
name_emojified: emojify(escapeTextContentForBrowser(pair.name)),
|
|
||||||
value_emojified: emojify(pair.value, emojiMap),
|
|
||||||
value_plain: unescapeHTML(pair.value),
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (account.moved) {
|
|
||||||
state = normalizeAccount(state, account.moved);
|
|
||||||
account.moved = account.moved.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
return state.set(account.id, fromJS(account));
|
return state.set(account.id, fromJS(account));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -101,71 +21,12 @@ const normalizeAccounts = (state, accounts) => {
|
||||||
return state;
|
return state;
|
||||||
};
|
};
|
||||||
|
|
||||||
const normalizeAccountFromStatus = (state, status) => {
|
|
||||||
state = normalizeAccount(state, status.account);
|
|
||||||
|
|
||||||
if (status.reblog && status.reblog.account) {
|
|
||||||
state = normalizeAccount(state, status.reblog.account);
|
|
||||||
}
|
|
||||||
|
|
||||||
return state;
|
|
||||||
};
|
|
||||||
|
|
||||||
const normalizeAccountsFromStatuses = (state, statuses) => {
|
|
||||||
statuses.forEach(status => {
|
|
||||||
state = normalizeAccountFromStatus(state, status);
|
|
||||||
});
|
|
||||||
|
|
||||||
return state;
|
|
||||||
};
|
|
||||||
|
|
||||||
const initialState = ImmutableMap();
|
|
||||||
|
|
||||||
export default function accounts(state = initialState, action) {
|
export default function accounts(state = initialState, action) {
|
||||||
switch(action.type) {
|
switch(action.type) {
|
||||||
case STORE_HYDRATE:
|
case ACCOUNT_IMPORT:
|
||||||
return normalizeAccounts(state, Object.values(action.state.get('accounts').toJS()));
|
|
||||||
case ACCOUNT_FETCH_SUCCESS:
|
|
||||||
case NOTIFICATIONS_UPDATE:
|
|
||||||
return normalizeAccount(state, action.account);
|
return normalizeAccount(state, action.account);
|
||||||
case FOLLOWERS_FETCH_SUCCESS:
|
case ACCOUNTS_IMPORT:
|
||||||
case FOLLOWERS_EXPAND_SUCCESS:
|
return normalizeAccounts(state, action.accounts);
|
||||||
case FOLLOWING_FETCH_SUCCESS:
|
|
||||||
case FOLLOWING_EXPAND_SUCCESS:
|
|
||||||
case REBLOGS_FETCH_SUCCESS:
|
|
||||||
case FAVOURITES_FETCH_SUCCESS:
|
|
||||||
case COMPOSE_SUGGESTIONS_READY:
|
|
||||||
case FOLLOW_REQUESTS_FETCH_SUCCESS:
|
|
||||||
case FOLLOW_REQUESTS_EXPAND_SUCCESS:
|
|
||||||
case BLOCKS_FETCH_SUCCESS:
|
|
||||||
case BLOCKS_EXPAND_SUCCESS:
|
|
||||||
case MUTES_FETCH_SUCCESS:
|
|
||||||
case MUTES_EXPAND_SUCCESS:
|
|
||||||
case LIST_ACCOUNTS_FETCH_SUCCESS:
|
|
||||||
case LIST_EDITOR_SUGGESTIONS_READY:
|
|
||||||
case PINNED_ACCOUNTS_FETCH_SUCCESS:
|
|
||||||
case PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_READY:
|
|
||||||
return action.accounts ? normalizeAccounts(state, action.accounts) : state;
|
|
||||||
case NOTIFICATIONS_EXPAND_SUCCESS:
|
|
||||||
case SEARCH_FETCH_SUCCESS:
|
|
||||||
return normalizeAccountsFromStatuses(normalizeAccounts(state, action.accounts), action.statuses);
|
|
||||||
case TIMELINE_EXPAND_SUCCESS:
|
|
||||||
case CONTEXT_FETCH_SUCCESS:
|
|
||||||
case FAVOURITED_STATUSES_FETCH_SUCCESS:
|
|
||||||
case FAVOURITED_STATUSES_EXPAND_SUCCESS:
|
|
||||||
case BOOKMARKED_STATUSES_FETCH_SUCCESS:
|
|
||||||
case BOOKMARKED_STATUSES_EXPAND_SUCCESS:
|
|
||||||
return normalizeAccountsFromStatuses(state, action.statuses);
|
|
||||||
case REBLOG_SUCCESS:
|
|
||||||
case FAVOURITE_SUCCESS:
|
|
||||||
case UNREBLOG_SUCCESS:
|
|
||||||
case UNFAVOURITE_SUCCESS:
|
|
||||||
case BOOKMARK_SUCCESS:
|
|
||||||
case UNBOOKMARK_SUCCESS:
|
|
||||||
return normalizeAccountFromStatus(state, action.response);
|
|
||||||
case TIMELINE_UPDATE:
|
|
||||||
case STATUS_FETCH_SUCCESS:
|
|
||||||
return normalizeAccountFromStatus(state, action.status);
|
|
||||||
default:
|
default:
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,59 +1,8 @@
|
||||||
import {
|
import {
|
||||||
ACCOUNT_FETCH_SUCCESS,
|
|
||||||
FOLLOWERS_FETCH_SUCCESS,
|
|
||||||
FOLLOWERS_EXPAND_SUCCESS,
|
|
||||||
FOLLOWING_FETCH_SUCCESS,
|
|
||||||
FOLLOWING_EXPAND_SUCCESS,
|
|
||||||
FOLLOW_REQUESTS_FETCH_SUCCESS,
|
|
||||||
FOLLOW_REQUESTS_EXPAND_SUCCESS,
|
|
||||||
ACCOUNT_FOLLOW_SUCCESS,
|
ACCOUNT_FOLLOW_SUCCESS,
|
||||||
ACCOUNT_UNFOLLOW_SUCCESS,
|
ACCOUNT_UNFOLLOW_SUCCESS,
|
||||||
} from 'flavours/glitch/actions/accounts';
|
} from '../actions/accounts';
|
||||||
import {
|
import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from '../actions/importer';
|
||||||
BLOCKS_FETCH_SUCCESS,
|
|
||||||
BLOCKS_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/blocks';
|
|
||||||
import {
|
|
||||||
MUTES_FETCH_SUCCESS,
|
|
||||||
MUTES_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/mutes';
|
|
||||||
import { COMPOSE_SUGGESTIONS_READY } from 'flavours/glitch/actions/compose';
|
|
||||||
import {
|
|
||||||
REBLOG_SUCCESS,
|
|
||||||
UNREBLOG_SUCCESS,
|
|
||||||
FAVOURITE_SUCCESS,
|
|
||||||
UNFAVOURITE_SUCCESS,
|
|
||||||
BOOKMARK_SUCCESS,
|
|
||||||
UNBOOKMARK_SUCCESS,
|
|
||||||
REBLOGS_FETCH_SUCCESS,
|
|
||||||
FAVOURITES_FETCH_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/interactions';
|
|
||||||
import {
|
|
||||||
TIMELINE_UPDATE,
|
|
||||||
TIMELINE_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/timelines';
|
|
||||||
import {
|
|
||||||
STATUS_FETCH_SUCCESS,
|
|
||||||
CONTEXT_FETCH_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/statuses';
|
|
||||||
import { SEARCH_FETCH_SUCCESS } from 'flavours/glitch/actions/search';
|
|
||||||
import {
|
|
||||||
NOTIFICATIONS_UPDATE,
|
|
||||||
NOTIFICATIONS_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/notifications';
|
|
||||||
import {
|
|
||||||
FAVOURITED_STATUSES_FETCH_SUCCESS,
|
|
||||||
FAVOURITED_STATUSES_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/favourites';
|
|
||||||
import {
|
|
||||||
BOOKMARKED_STATUSES_FETCH_SUCCESS,
|
|
||||||
BOOKMARKED_STATUSES_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/bookmarks';
|
|
||||||
import {
|
|
||||||
LIST_ACCOUNTS_FETCH_SUCCESS,
|
|
||||||
LIST_EDITOR_SUGGESTIONS_READY,
|
|
||||||
} from 'flavours/glitch/actions/lists';
|
|
||||||
import { STORE_HYDRATE } from 'flavours/glitch/actions/store';
|
|
||||||
import { Map as ImmutableMap, fromJS } from 'immutable';
|
import { Map as ImmutableMap, fromJS } from 'immutable';
|
||||||
|
|
||||||
const normalizeAccount = (state, account) => state.set(account.id, fromJS({
|
const normalizeAccount = (state, account) => state.set(account.id, fromJS({
|
||||||
|
@ -70,80 +19,19 @@ const normalizeAccounts = (state, accounts) => {
|
||||||
return state;
|
return state;
|
||||||
};
|
};
|
||||||
|
|
||||||
const normalizeAccountFromStatus = (state, status) => {
|
|
||||||
state = normalizeAccount(state, status.account);
|
|
||||||
|
|
||||||
if (status.reblog && status.reblog.account) {
|
|
||||||
state = normalizeAccount(state, status.reblog.account);
|
|
||||||
}
|
|
||||||
|
|
||||||
return state;
|
|
||||||
};
|
|
||||||
|
|
||||||
const normalizeAccountsFromStatuses = (state, statuses) => {
|
|
||||||
statuses.forEach(status => {
|
|
||||||
state = normalizeAccountFromStatus(state, status);
|
|
||||||
});
|
|
||||||
|
|
||||||
return state;
|
|
||||||
};
|
|
||||||
|
|
||||||
const initialState = ImmutableMap();
|
const initialState = ImmutableMap();
|
||||||
|
|
||||||
export default function accountsCounters(state = initialState, action) {
|
export default function accountsCounters(state = initialState, action) {
|
||||||
switch(action.type) {
|
switch(action.type) {
|
||||||
case STORE_HYDRATE:
|
case ACCOUNT_IMPORT:
|
||||||
return state.merge(action.state.get('accounts').map(item => fromJS({
|
|
||||||
followers_count: item.get('followers_count'),
|
|
||||||
following_count: item.get('following_count'),
|
|
||||||
statuses_count: item.get('statuses_count'),
|
|
||||||
})));
|
|
||||||
case ACCOUNT_FETCH_SUCCESS:
|
|
||||||
case NOTIFICATIONS_UPDATE:
|
|
||||||
return normalizeAccount(state, action.account);
|
return normalizeAccount(state, action.account);
|
||||||
case FOLLOWERS_FETCH_SUCCESS:
|
case ACCOUNTS_IMPORT:
|
||||||
case FOLLOWERS_EXPAND_SUCCESS:
|
return normalizeAccounts(state, action.accounts);
|
||||||
case FOLLOWING_FETCH_SUCCESS:
|
|
||||||
case FOLLOWING_EXPAND_SUCCESS:
|
|
||||||
case REBLOGS_FETCH_SUCCESS:
|
|
||||||
case FAVOURITES_FETCH_SUCCESS:
|
|
||||||
case COMPOSE_SUGGESTIONS_READY:
|
|
||||||
case FOLLOW_REQUESTS_FETCH_SUCCESS:
|
|
||||||
case FOLLOW_REQUESTS_EXPAND_SUCCESS:
|
|
||||||
case BLOCKS_FETCH_SUCCESS:
|
|
||||||
case BLOCKS_EXPAND_SUCCESS:
|
|
||||||
case MUTES_FETCH_SUCCESS:
|
|
||||||
case MUTES_EXPAND_SUCCESS:
|
|
||||||
case LIST_ACCOUNTS_FETCH_SUCCESS:
|
|
||||||
case LIST_EDITOR_SUGGESTIONS_READY:
|
|
||||||
return action.accounts ? normalizeAccounts(state, action.accounts) : state;
|
|
||||||
case NOTIFICATIONS_EXPAND_SUCCESS:
|
|
||||||
case SEARCH_FETCH_SUCCESS:
|
|
||||||
return normalizeAccountsFromStatuses(normalizeAccounts(state, action.accounts), action.statuses);
|
|
||||||
case TIMELINE_EXPAND_SUCCESS:
|
|
||||||
case CONTEXT_FETCH_SUCCESS:
|
|
||||||
case FAVOURITED_STATUSES_FETCH_SUCCESS:
|
|
||||||
case FAVOURITED_STATUSES_EXPAND_SUCCESS:
|
|
||||||
case BOOKMARKED_STATUSES_FETCH_SUCCESS:
|
|
||||||
case BOOKMARKED_STATUSES_EXPAND_SUCCESS:
|
|
||||||
return normalizeAccountsFromStatuses(state, action.statuses);
|
|
||||||
case REBLOG_SUCCESS:
|
|
||||||
case FAVOURITE_SUCCESS:
|
|
||||||
case UNREBLOG_SUCCESS:
|
|
||||||
case UNFAVOURITE_SUCCESS:
|
|
||||||
case BOOKMARK_SUCCESS:
|
|
||||||
case UNBOOKMARK_SUCCESS:
|
|
||||||
return normalizeAccountFromStatus(state, action.response);
|
|
||||||
case TIMELINE_UPDATE:
|
|
||||||
case STATUS_FETCH_SUCCESS:
|
|
||||||
return normalizeAccountFromStatus(state, action.status);
|
|
||||||
case ACCOUNT_FOLLOW_SUCCESS:
|
case ACCOUNT_FOLLOW_SUCCESS:
|
||||||
if (action.alreadyFollowing) {
|
return action.alreadyFollowing ? state :
|
||||||
return state;
|
state.updateIn([action.relationship.id, 'followers_count'], num => num + 1);
|
||||||
}
|
|
||||||
return state.updateIn([action.relationship.id, 'followers_count'], num => num < 0 ? num : num + 1);
|
|
||||||
case ACCOUNT_UNFOLLOW_SUCCESS:
|
case ACCOUNT_UNFOLLOW_SUCCESS:
|
||||||
return state.updateIn([action.relationship.id, 'followers_count'], num => num < 0 ? num : Math.max(0, num - 1));
|
return state.updateIn([action.relationship.id, 'followers_count'], num => Math.max(0, num - 1));
|
||||||
default:
|
default:
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,7 @@ import listEditor from './list_editor';
|
||||||
import listAdder from './list_adder';
|
import listAdder from './list_adder';
|
||||||
import filters from './filters';
|
import filters from './filters';
|
||||||
import pinnedAccountsEditor from './pinned_accounts_editor';
|
import pinnedAccountsEditor from './pinned_accounts_editor';
|
||||||
|
import polls from './polls';
|
||||||
|
|
||||||
const reducers = {
|
const reducers = {
|
||||||
dropdown_menu,
|
dropdown_menu,
|
||||||
|
@ -61,6 +62,7 @@ const reducers = {
|
||||||
listAdder,
|
listAdder,
|
||||||
filters,
|
filters,
|
||||||
pinnedAccountsEditor,
|
pinnedAccountsEditor,
|
||||||
|
polls,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default combineReducers(reducers);
|
export default combineReducers(reducers);
|
||||||
|
|
19
app/javascript/flavours/glitch/reducers/polls.js
Normal file
19
app/javascript/flavours/glitch/reducers/polls.js
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
import { POLL_VOTE_SUCCESS, POLL_FETCH_SUCCESS } from 'mastodon/actions/polls';
|
||||||
|
import { POLLS_IMPORT } from 'mastodon/actions/importer';
|
||||||
|
import { Map as ImmutableMap, fromJS } from 'immutable';
|
||||||
|
|
||||||
|
const importPolls = (state, polls) => state.withMutations(map => polls.forEach(poll => map.set(poll.id, fromJS(poll))));
|
||||||
|
|
||||||
|
const initialState = ImmutableMap();
|
||||||
|
|
||||||
|
export default function polls(state = initialState, action) {
|
||||||
|
switch(action.type) {
|
||||||
|
case POLLS_IMPORT:
|
||||||
|
return importPolls(state, action.polls);
|
||||||
|
case POLL_VOTE_SUCCESS:
|
||||||
|
case POLL_FETCH_SUCCESS:
|
||||||
|
return importPolls(state, [action.poll]);
|
||||||
|
default:
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,93 +1,25 @@
|
||||||
import {
|
import {
|
||||||
REBLOG_REQUEST,
|
REBLOG_REQUEST,
|
||||||
REBLOG_SUCCESS,
|
|
||||||
REBLOG_FAIL,
|
REBLOG_FAIL,
|
||||||
UNREBLOG_SUCCESS,
|
|
||||||
FAVOURITE_REQUEST,
|
FAVOURITE_REQUEST,
|
||||||
FAVOURITE_SUCCESS,
|
|
||||||
FAVOURITE_FAIL,
|
FAVOURITE_FAIL,
|
||||||
UNFAVOURITE_SUCCESS,
|
|
||||||
BOOKMARK_REQUEST,
|
BOOKMARK_REQUEST,
|
||||||
BOOKMARK_SUCCESS,
|
|
||||||
BOOKMARK_FAIL,
|
BOOKMARK_FAIL,
|
||||||
UNBOOKMARK_SUCCESS,
|
|
||||||
PIN_SUCCESS,
|
|
||||||
UNPIN_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/interactions';
|
} from 'flavours/glitch/actions/interactions';
|
||||||
import {
|
import {
|
||||||
COMPOSE_SUBMIT_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/compose';
|
|
||||||
import {
|
|
||||||
STATUS_FETCH_SUCCESS,
|
|
||||||
CONTEXT_FETCH_SUCCESS,
|
|
||||||
STATUS_MUTE_SUCCESS,
|
STATUS_MUTE_SUCCESS,
|
||||||
STATUS_UNMUTE_SUCCESS,
|
STATUS_UNMUTE_SUCCESS,
|
||||||
} from 'flavours/glitch/actions/statuses';
|
} from 'flavours/glitch/actions/statuses';
|
||||||
import {
|
import {
|
||||||
TIMELINE_UPDATE,
|
|
||||||
TIMELINE_DELETE,
|
TIMELINE_DELETE,
|
||||||
TIMELINE_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/timelines';
|
} from 'flavours/glitch/actions/timelines';
|
||||||
import {
|
import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
|
||||||
NOTIFICATIONS_UPDATE,
|
|
||||||
NOTIFICATIONS_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/notifications';
|
|
||||||
import {
|
|
||||||
FAVOURITED_STATUSES_FETCH_SUCCESS,
|
|
||||||
FAVOURITED_STATUSES_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/favourites';
|
|
||||||
import {
|
|
||||||
BOOKMARKED_STATUSES_FETCH_SUCCESS,
|
|
||||||
BOOKMARKED_STATUSES_EXPAND_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/bookmarks';
|
|
||||||
import {
|
|
||||||
PINNED_STATUSES_FETCH_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/pin_statuses';
|
|
||||||
import { SEARCH_FETCH_SUCCESS } from 'flavours/glitch/actions/search';
|
|
||||||
import emojify from 'flavours/glitch/util/emoji';
|
|
||||||
import { Map as ImmutableMap, fromJS } from 'immutable';
|
import { Map as ImmutableMap, fromJS } from 'immutable';
|
||||||
import escapeTextContentForBrowser from 'escape-html';
|
|
||||||
|
|
||||||
const domParser = new DOMParser();
|
const importStatus = (state, status) => state.set(status.id, fromJS(status));
|
||||||
|
|
||||||
const normalizeStatus = (state, status) => {
|
const importStatuses = (state, statuses) =>
|
||||||
if (!status) {
|
state.withMutations(mutable => statuses.forEach(status => importStatus(mutable, status)));
|
||||||
return state;
|
|
||||||
}
|
|
||||||
|
|
||||||
const normalStatus = { ...status };
|
|
||||||
normalStatus.account = status.account.id;
|
|
||||||
|
|
||||||
if (status.reblog && status.reblog.id) {
|
|
||||||
state = normalizeStatus(state, status.reblog);
|
|
||||||
normalStatus.reblog = status.reblog.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only calculate these values when status first encountered
|
|
||||||
// Otherwise keep the ones already in the reducer
|
|
||||||
if (!state.has(status.id)) {
|
|
||||||
const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(/<br \/>/g, '\n').replace(/<\/p><p>/g, '\n\n');
|
|
||||||
|
|
||||||
const emojiMap = normalStatus.emojis.reduce((obj, emoji) => {
|
|
||||||
obj[`:${emoji.shortcode}:`] = emoji;
|
|
||||||
return obj;
|
|
||||||
}, {});
|
|
||||||
|
|
||||||
normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
|
|
||||||
normalStatus.contentHtml = emojify(normalStatus.content, emojiMap);
|
|
||||||
normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(normalStatus.spoiler_text || ''), emojiMap);
|
|
||||||
}
|
|
||||||
|
|
||||||
return state.update(status.id, ImmutableMap(), map => map.mergeDeep(fromJS(normalStatus)));
|
|
||||||
};
|
|
||||||
|
|
||||||
const normalizeStatuses = (state, statuses) => {
|
|
||||||
statuses.forEach(status => {
|
|
||||||
state = normalizeStatus(state, status);
|
|
||||||
});
|
|
||||||
|
|
||||||
return state;
|
|
||||||
};
|
|
||||||
|
|
||||||
const deleteStatus = (state, id, references) => {
|
const deleteStatus = (state, id, references) => {
|
||||||
references.forEach(ref => {
|
references.forEach(ref => {
|
||||||
|
@ -101,20 +33,10 @@ const initialState = ImmutableMap();
|
||||||
|
|
||||||
export default function statuses(state = initialState, action) {
|
export default function statuses(state = initialState, action) {
|
||||||
switch(action.type) {
|
switch(action.type) {
|
||||||
case TIMELINE_UPDATE:
|
case STATUS_IMPORT:
|
||||||
case STATUS_FETCH_SUCCESS:
|
return importStatus(state, action.status);
|
||||||
case NOTIFICATIONS_UPDATE:
|
case STATUSES_IMPORT:
|
||||||
case COMPOSE_SUBMIT_SUCCESS:
|
return importStatuses(state, action.statuses);
|
||||||
return normalizeStatus(state, action.status);
|
|
||||||
case REBLOG_SUCCESS:
|
|
||||||
case UNREBLOG_SUCCESS:
|
|
||||||
case FAVOURITE_SUCCESS:
|
|
||||||
case UNFAVOURITE_SUCCESS:
|
|
||||||
case BOOKMARK_SUCCESS:
|
|
||||||
case UNBOOKMARK_SUCCESS:
|
|
||||||
case PIN_SUCCESS:
|
|
||||||
case UNPIN_SUCCESS:
|
|
||||||
return normalizeStatus(state, action.response);
|
|
||||||
case FAVOURITE_REQUEST:
|
case FAVOURITE_REQUEST:
|
||||||
return state.setIn([action.status.get('id'), 'favourited'], true);
|
return state.setIn([action.status.get('id'), 'favourited'], true);
|
||||||
case FAVOURITE_FAIL:
|
case FAVOURITE_FAIL:
|
||||||
|
@ -131,16 +53,6 @@ export default function statuses(state = initialState, action) {
|
||||||
return state.setIn([action.id, 'muted'], true);
|
return state.setIn([action.id, 'muted'], true);
|
||||||
case STATUS_UNMUTE_SUCCESS:
|
case STATUS_UNMUTE_SUCCESS:
|
||||||
return state.setIn([action.id, 'muted'], false);
|
return state.setIn([action.id, 'muted'], false);
|
||||||
case TIMELINE_EXPAND_SUCCESS:
|
|
||||||
case CONTEXT_FETCH_SUCCESS:
|
|
||||||
case NOTIFICATIONS_EXPAND_SUCCESS:
|
|
||||||
case FAVOURITED_STATUSES_FETCH_SUCCESS:
|
|
||||||
case FAVOURITED_STATUSES_EXPAND_SUCCESS:
|
|
||||||
case BOOKMARKED_STATUSES_FETCH_SUCCESS:
|
|
||||||
case BOOKMARKED_STATUSES_EXPAND_SUCCESS:
|
|
||||||
case PINNED_STATUSES_FETCH_SUCCESS:
|
|
||||||
case SEARCH_FETCH_SUCCESS:
|
|
||||||
return normalizeStatuses(state, action.statuses);
|
|
||||||
case TIMELINE_DELETE:
|
case TIMELINE_DELETE:
|
||||||
return deleteStatus(state, action.id, action.references);
|
return deleteStatus(state, action.id, action.references);
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -29,6 +29,8 @@ const initialTimeline = ImmutableMap({
|
||||||
const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => {
|
const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => {
|
||||||
return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
|
return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
|
||||||
mMap.set('isLoading', false);
|
mMap.set('isLoading', false);
|
||||||
|
mMap.set('isPartial', isPartial);
|
||||||
|
|
||||||
if (!next && !isLoadingRecent) mMap.set('hasMore', false);
|
if (!next && !isLoadingRecent) mMap.set('hasMore', false);
|
||||||
|
|
||||||
if (!statuses.isEmpty()) {
|
if (!statuses.isEmpty()) {
|
||||||
|
|
|
@ -89,6 +89,10 @@
|
||||||
border-color: lighten($ui-primary-color, 4%);
|
border-color: lighten($ui-primary-color, 4%);
|
||||||
color: lighten($darker-text-color, 4%);
|
color: lighten($darker-text-color, 4%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&:disabled {
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.button--block {
|
&.button--block {
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
@import 'accounts';
|
@import 'accounts';
|
||||||
@import 'stream_entries';
|
@import 'stream_entries';
|
||||||
@import 'components/index';
|
@import 'components/index';
|
||||||
|
@import 'polls';
|
||||||
@import 'about';
|
@import 'about';
|
||||||
@import 'tables';
|
@import 'tables';
|
||||||
@import 'admin';
|
@import 'admin';
|
||||||
|
|
100
app/javascript/flavours/glitch/styles/polls.scss
Normal file
100
app/javascript/flavours/glitch/styles/polls.scss
Normal file
|
@ -0,0 +1,100 @@
|
||||||
|
.poll {
|
||||||
|
margin-top: 16px;
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
li {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__chart {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
height: 100%;
|
||||||
|
display: inline-block;
|
||||||
|
border-radius: 4px;
|
||||||
|
background: darken($ui-primary-color, 14%);
|
||||||
|
|
||||||
|
&.leading {
|
||||||
|
background: $ui-highlight-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__text {
|
||||||
|
position: relative;
|
||||||
|
display: inline-block;
|
||||||
|
padding: 6px 0;
|
||||||
|
line-height: 18px;
|
||||||
|
cursor: default;
|
||||||
|
|
||||||
|
input[type=radio],
|
||||||
|
input[type=checkbox] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.selectable {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__input {
|
||||||
|
display: inline-block;
|
||||||
|
position: relative;
|
||||||
|
border: 1px solid $ui-primary-color;
|
||||||
|
box-sizing: border-box;
|
||||||
|
width: 18px;
|
||||||
|
height: 18px;
|
||||||
|
margin-right: 10px;
|
||||||
|
top: -1px;
|
||||||
|
border-radius: 50%;
|
||||||
|
vertical-align: middle;
|
||||||
|
|
||||||
|
&.checkbox {
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.active {
|
||||||
|
border-color: $valid-value-color;
|
||||||
|
background: $valid-value-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__number {
|
||||||
|
display: inline-block;
|
||||||
|
width: 36px;
|
||||||
|
font-weight: 700;
|
||||||
|
padding: 0 10px;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__footer {
|
||||||
|
padding-top: 6px;
|
||||||
|
padding-bottom: 5px;
|
||||||
|
color: $dark-text-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__link {
|
||||||
|
display: inline;
|
||||||
|
background: transparent;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
border: 0;
|
||||||
|
color: $dark-text-color;
|
||||||
|
text-decoration: underline;
|
||||||
|
font-size: inherit;
|
||||||
|
|
||||||
|
&:hover,
|
||||||
|
&:focus,
|
||||||
|
&:active {
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.button {
|
||||||
|
height: 36px;
|
||||||
|
padding: 0 16px;
|
||||||
|
margin-right: 10px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,11 +1,10 @@
|
||||||
// import { autoPlayGif } from '../../initial_state';
|
|
||||||
// import { putAccounts, putStatuses } from '../../storage/modifier';
|
|
||||||
import { normalizeAccount, normalizeStatus } from './normalizer';
|
import { normalizeAccount, normalizeStatus } from './normalizer';
|
||||||
|
|
||||||
export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT';
|
export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT';
|
||||||
export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT';
|
export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT';
|
||||||
export const STATUS_IMPORT = 'STATUS_IMPORT';
|
export const STATUS_IMPORT = 'STATUS_IMPORT';
|
||||||
export const STATUSES_IMPORT = 'STATUSES_IMPORT';
|
export const STATUSES_IMPORT = 'STATUSES_IMPORT';
|
||||||
|
export const POLLS_IMPORT = 'POLLS_IMPORT';
|
||||||
|
|
||||||
function pushUnique(array, object) {
|
function pushUnique(array, object) {
|
||||||
if (array.every(element => element.id !== object.id)) {
|
if (array.every(element => element.id !== object.id)) {
|
||||||
|
@ -29,6 +28,10 @@ export function importStatuses(statuses) {
|
||||||
return { type: STATUSES_IMPORT, statuses };
|
return { type: STATUSES_IMPORT, statuses };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function importPolls(polls) {
|
||||||
|
return { type: POLLS_IMPORT, polls };
|
||||||
|
}
|
||||||
|
|
||||||
export function importFetchedAccount(account) {
|
export function importFetchedAccount(account) {
|
||||||
return importFetchedAccounts([account]);
|
return importFetchedAccounts([account]);
|
||||||
}
|
}
|
||||||
|
@ -45,7 +48,6 @@ export function importFetchedAccounts(accounts) {
|
||||||
}
|
}
|
||||||
|
|
||||||
accounts.forEach(processAccount);
|
accounts.forEach(processAccount);
|
||||||
//putAccounts(normalAccounts, !autoPlayGif);
|
|
||||||
|
|
||||||
return importAccounts(normalAccounts);
|
return importAccounts(normalAccounts);
|
||||||
}
|
}
|
||||||
|
@ -58,6 +60,7 @@ export function importFetchedStatuses(statuses) {
|
||||||
return (dispatch, getState) => {
|
return (dispatch, getState) => {
|
||||||
const accounts = [];
|
const accounts = [];
|
||||||
const normalStatuses = [];
|
const normalStatuses = [];
|
||||||
|
const polls = [];
|
||||||
|
|
||||||
function processStatus(status) {
|
function processStatus(status) {
|
||||||
pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id])));
|
pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id])));
|
||||||
|
@ -66,11 +69,15 @@ export function importFetchedStatuses(statuses) {
|
||||||
if (status.reblog && status.reblog.id) {
|
if (status.reblog && status.reblog.id) {
|
||||||
processStatus(status.reblog);
|
processStatus(status.reblog);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (status.poll && status.poll.id) {
|
||||||
|
pushUnique(polls, status.poll);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
statuses.forEach(processStatus);
|
statuses.forEach(processStatus);
|
||||||
//putStatuses(normalStatuses);
|
|
||||||
|
|
||||||
|
dispatch(importPolls(polls));
|
||||||
dispatch(importFetchedAccounts(accounts));
|
dispatch(importFetchedAccounts(accounts));
|
||||||
dispatch(importStatuses(normalStatuses));
|
dispatch(importStatuses(normalStatuses));
|
||||||
};
|
};
|
||||||
|
|
|
@ -43,6 +43,10 @@ export function normalizeStatus(status, normalOldStatus) {
|
||||||
normalStatus.reblog = status.reblog.id;
|
normalStatus.reblog = status.reblog.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (status.poll && status.poll.id) {
|
||||||
|
normalStatus.poll = status.poll.id;
|
||||||
|
}
|
||||||
|
|
||||||
// Only calculate these values when status first encountered
|
// Only calculate these values when status first encountered
|
||||||
// Otherwise keep the ones already in the reducer
|
// Otherwise keep the ones already in the reducer
|
||||||
if (normalOldStatus) {
|
if (normalOldStatus) {
|
||||||
|
|
53
app/javascript/mastodon/actions/polls.js
Normal file
53
app/javascript/mastodon/actions/polls.js
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
import api from '../api';
|
||||||
|
|
||||||
|
export const POLL_VOTE_REQUEST = 'POLL_VOTE_REQUEST';
|
||||||
|
export const POLL_VOTE_SUCCESS = 'POLL_VOTE_SUCCESS';
|
||||||
|
export const POLL_VOTE_FAIL = 'POLL_VOTE_FAIL';
|
||||||
|
|
||||||
|
export const POLL_FETCH_REQUEST = 'POLL_FETCH_REQUEST';
|
||||||
|
export const POLL_FETCH_SUCCESS = 'POLL_FETCH_SUCCESS';
|
||||||
|
export const POLL_FETCH_FAIL = 'POLL_FETCH_FAIL';
|
||||||
|
|
||||||
|
export const vote = (pollId, choices) => (dispatch, getState) => {
|
||||||
|
dispatch(voteRequest());
|
||||||
|
|
||||||
|
api(getState).post(`/api/v1/polls/${pollId}/votes`, { choices })
|
||||||
|
.then(({ data }) => dispatch(voteSuccess(data)))
|
||||||
|
.catch(err => dispatch(voteFail(err)));
|
||||||
|
};
|
||||||
|
|
||||||
|
export const fetchPoll = pollId => (dispatch, getState) => {
|
||||||
|
dispatch(fetchPollRequest());
|
||||||
|
|
||||||
|
api(getState).get(`/api/v1/polls/${pollId}`)
|
||||||
|
.then(({ data }) => dispatch(fetchPollSuccess(data)))
|
||||||
|
.catch(err => dispatch(fetchPollFail(err)));
|
||||||
|
};
|
||||||
|
|
||||||
|
export const voteRequest = () => ({
|
||||||
|
type: POLL_VOTE_REQUEST,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const voteSuccess = poll => ({
|
||||||
|
type: POLL_VOTE_SUCCESS,
|
||||||
|
poll,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const voteFail = error => ({
|
||||||
|
type: POLL_VOTE_FAIL,
|
||||||
|
error,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const fetchPollRequest = () => ({
|
||||||
|
type: POLL_FETCH_REQUEST,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const fetchPollSuccess = poll => ({
|
||||||
|
type: POLL_FETCH_SUCCESS,
|
||||||
|
poll,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const fetchPollFail = error => ({
|
||||||
|
type: POLL_FETCH_FAIL,
|
||||||
|
error,
|
||||||
|
});
|
156
app/javascript/mastodon/components/poll.js
Normal file
156
app/javascript/mastodon/components/poll.js
Normal file
|
@ -0,0 +1,156 @@
|
||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||||
|
import classNames from 'classnames';
|
||||||
|
import { vote, fetchPoll } from 'mastodon/actions/polls';
|
||||||
|
import Motion from 'mastodon/features/ui/util/optional_motion';
|
||||||
|
import spring from 'react-motion/lib/spring';
|
||||||
|
|
||||||
|
const messages = defineMessages({
|
||||||
|
moments: { id: 'time_remaining.moments', defaultMessage: 'Moments remaining' },
|
||||||
|
seconds: { id: 'time_remaining.seconds', defaultMessage: '{number, plural, one {# second} other {# seconds}} left' },
|
||||||
|
minutes: { id: 'time_remaining.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}} left' },
|
||||||
|
hours: { id: 'time_remaining.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}} left' },
|
||||||
|
days: { id: 'time_remaining.days', defaultMessage: '{number, plural, one {# day} other {# days}} left' },
|
||||||
|
closed: { id: 'poll.closed', defaultMessage: 'Closed' },
|
||||||
|
});
|
||||||
|
|
||||||
|
const SECOND = 1000;
|
||||||
|
const MINUTE = 1000 * 60;
|
||||||
|
const HOUR = 1000 * 60 * 60;
|
||||||
|
const DAY = 1000 * 60 * 60 * 24;
|
||||||
|
|
||||||
|
const timeRemainingString = (intl, date, now) => {
|
||||||
|
const delta = date.getTime() - now;
|
||||||
|
|
||||||
|
let relativeTime;
|
||||||
|
|
||||||
|
if (delta < 10 * SECOND) {
|
||||||
|
relativeTime = intl.formatMessage(messages.moments);
|
||||||
|
} else if (delta < MINUTE) {
|
||||||
|
relativeTime = intl.formatMessage(messages.seconds, { number: Math.floor(delta / SECOND) });
|
||||||
|
} else if (delta < HOUR) {
|
||||||
|
relativeTime = intl.formatMessage(messages.minutes, { number: Math.floor(delta / MINUTE) });
|
||||||
|
} else if (delta < DAY) {
|
||||||
|
relativeTime = intl.formatMessage(messages.hours, { number: Math.floor(delta / HOUR) });
|
||||||
|
} else {
|
||||||
|
relativeTime = intl.formatMessage(messages.days, { number: Math.floor(delta / DAY) });
|
||||||
|
}
|
||||||
|
|
||||||
|
return relativeTime;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default @injectIntl
|
||||||
|
class Poll extends ImmutablePureComponent {
|
||||||
|
|
||||||
|
static propTypes = {
|
||||||
|
poll: ImmutablePropTypes.map,
|
||||||
|
intl: PropTypes.object.isRequired,
|
||||||
|
dispatch: PropTypes.func,
|
||||||
|
disabled: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
state = {
|
||||||
|
selected: {},
|
||||||
|
};
|
||||||
|
|
||||||
|
handleOptionChange = e => {
|
||||||
|
const { target: { value } } = e;
|
||||||
|
|
||||||
|
if (this.props.poll.get('multiple')) {
|
||||||
|
const tmp = { ...this.state.selected };
|
||||||
|
if (tmp[value]) {
|
||||||
|
delete tmp[value];
|
||||||
|
} else {
|
||||||
|
tmp[value] = true;
|
||||||
|
}
|
||||||
|
this.setState({ selected: tmp });
|
||||||
|
} else {
|
||||||
|
const tmp = {};
|
||||||
|
tmp[value] = true;
|
||||||
|
this.setState({ selected: tmp });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
handleVote = () => {
|
||||||
|
if (this.props.disabled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.props.dispatch(vote(this.props.poll.get('id'), Object.keys(this.state.selected)));
|
||||||
|
};
|
||||||
|
|
||||||
|
handleRefresh = () => {
|
||||||
|
if (this.props.disabled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.props.dispatch(fetchPoll(this.props.poll.get('id')));
|
||||||
|
};
|
||||||
|
|
||||||
|
renderOption (option, optionIndex) {
|
||||||
|
const { poll, disabled } = this.props;
|
||||||
|
const percent = (option.get('votes_count') / poll.get('votes_count')) * 100;
|
||||||
|
const leading = poll.get('options').filterNot(other => other.get('title') === option.get('title')).every(other => option.get('votes_count') > other.get('votes_count'));
|
||||||
|
const active = !!this.state.selected[`${optionIndex}`];
|
||||||
|
const showResults = poll.get('voted') || poll.get('expired');
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li key={option.get('title')}>
|
||||||
|
{showResults && (
|
||||||
|
<Motion defaultStyle={{ width: 0 }} style={{ width: spring(percent, { stiffness: 180, damping: 12 }) }}>
|
||||||
|
{({ width }) =>
|
||||||
|
<span className={classNames('poll__chart', { leading })} style={{ width: `${width}%` }} />
|
||||||
|
}
|
||||||
|
</Motion>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<label className={classNames('poll__text', { selectable: !showResults })}>
|
||||||
|
<input
|
||||||
|
name='vote-options'
|
||||||
|
type={poll.get('multiple') ? 'checkbox' : 'radio'}
|
||||||
|
value={optionIndex}
|
||||||
|
checked={active}
|
||||||
|
onChange={this.handleOptionChange}
|
||||||
|
disabled={disabled}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{!showResults && <span className={classNames('poll__input', { checkbox: poll.get('multiple'), active })} />}
|
||||||
|
{showResults && <span className='poll__number'>{Math.round(percent)}%</span>}
|
||||||
|
|
||||||
|
{option.get('title')}
|
||||||
|
</label>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
render () {
|
||||||
|
const { poll, intl } = this.props;
|
||||||
|
|
||||||
|
if (!poll) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const timeRemaining = poll.get('expired') ? intl.formatMessage(messages.closed) : timeRemainingString(intl, new Date(poll.get('expires_at')), intl.now());
|
||||||
|
const showResults = poll.get('voted') || poll.get('expired');
|
||||||
|
const disabled = this.props.disabled || Object.entries(this.state.selected).every(item => !item);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className='poll'>
|
||||||
|
<ul>
|
||||||
|
{poll.get('options').map((option, i) => this.renderOption(option, i))}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div className='poll__footer'>
|
||||||
|
{!showResults && <button className='button button-secondary' disabled={disabled} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
|
||||||
|
{showResults && !this.props.disabled && <span><button className='poll__link' onClick={this.handleRefresh}><FormattedMessage id='poll.refresh' defaultMessage='Refresh' /></button> · </span>}
|
||||||
|
<FormattedMessage id='poll.total_votes' defaultMessage='{count, plural, one {# vote} other {# votes}}' values={{ count: poll.get('votes_count') }} />
|
||||||
|
{poll.get('expires_at') && <span> · {timeRemaining}</span>}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -16,6 +16,7 @@ import { MediaGallery, Video } from '../features/ui/util/async-components';
|
||||||
import { HotKeys } from 'react-hotkeys';
|
import { HotKeys } from 'react-hotkeys';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import Icon from 'mastodon/components/icon';
|
import Icon from 'mastodon/components/icon';
|
||||||
|
import PollContainer from 'mastodon/containers/poll_container';
|
||||||
|
|
||||||
// We use the component (and not the container) since we do not want
|
// We use the component (and not the container) since we do not want
|
||||||
// to use the progress bar to show download progress
|
// to use the progress bar to show download progress
|
||||||
|
@ -270,7 +271,9 @@ class Status extends ImmutablePureComponent {
|
||||||
status = status.get('reblog');
|
status = status.get('reblog');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status.get('media_attachments').size > 0) {
|
if (status.get('poll')) {
|
||||||
|
media = <PollContainer pollId={status.get('poll')} />;
|
||||||
|
} else if (status.get('media_attachments').size > 0) {
|
||||||
if (this.props.muted || status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
|
if (this.props.muted || status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
|
||||||
media = (
|
media = (
|
||||||
<AttachmentList
|
<AttachmentList
|
||||||
|
|
|
@ -6,6 +6,7 @@ import { getLocale } from '../locales';
|
||||||
import MediaGallery from '../components/media_gallery';
|
import MediaGallery from '../components/media_gallery';
|
||||||
import Video from '../features/video';
|
import Video from '../features/video';
|
||||||
import Card from '../features/status/components/card';
|
import Card from '../features/status/components/card';
|
||||||
|
import Poll from 'mastodon/components/poll';
|
||||||
import ModalRoot from '../components/modal_root';
|
import ModalRoot from '../components/modal_root';
|
||||||
import MediaModal from '../features/ui/components/media_modal';
|
import MediaModal from '../features/ui/components/media_modal';
|
||||||
import { List as ImmutableList, fromJS } from 'immutable';
|
import { List as ImmutableList, fromJS } from 'immutable';
|
||||||
|
@ -13,7 +14,7 @@ import { List as ImmutableList, fromJS } from 'immutable';
|
||||||
const { localeData, messages } = getLocale();
|
const { localeData, messages } = getLocale();
|
||||||
addLocaleData(localeData);
|
addLocaleData(localeData);
|
||||||
|
|
||||||
const MEDIA_COMPONENTS = { MediaGallery, Video, Card };
|
const MEDIA_COMPONENTS = { MediaGallery, Video, Card, Poll };
|
||||||
|
|
||||||
export default class MediaContainer extends PureComponent {
|
export default class MediaContainer extends PureComponent {
|
||||||
|
|
||||||
|
@ -54,11 +55,12 @@ export default class MediaContainer extends PureComponent {
|
||||||
{[].map.call(components, (component, i) => {
|
{[].map.call(components, (component, i) => {
|
||||||
const componentName = component.getAttribute('data-component');
|
const componentName = component.getAttribute('data-component');
|
||||||
const Component = MEDIA_COMPONENTS[componentName];
|
const Component = MEDIA_COMPONENTS[componentName];
|
||||||
const { media, card, ...props } = JSON.parse(component.getAttribute('data-props'));
|
const { media, card, poll, ...props } = JSON.parse(component.getAttribute('data-props'));
|
||||||
|
|
||||||
Object.assign(props, {
|
Object.assign(props, {
|
||||||
...(media ? { media: fromJS(media) } : {}),
|
...(media ? { media: fromJS(media) } : {}),
|
||||||
...(card ? { card: fromJS(card) } : {}),
|
...(card ? { card: fromJS(card) } : {}),
|
||||||
|
...(poll ? { poll: fromJS(poll) } : {}),
|
||||||
|
|
||||||
...(componentName === 'Video' ? {
|
...(componentName === 'Video' ? {
|
||||||
onOpenVideo: this.handleOpenVideo,
|
onOpenVideo: this.handleOpenVideo,
|
||||||
|
|
8
app/javascript/mastodon/containers/poll_container.js
Normal file
8
app/javascript/mastodon/containers/poll_container.js
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
import Poll from 'mastodon/components/poll';
|
||||||
|
|
||||||
|
const mapStateToProps = (state, { pollId }) => ({
|
||||||
|
poll: state.getIn(['polls', pollId]),
|
||||||
|
});
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(Poll);
|
|
@ -16,7 +16,7 @@ const messages = defineMessages({
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
|
hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
|
||||||
isPartial: state.getIn(['timelines', 'home', 'items', 0], null) === null,
|
isPartial: state.getIn(['timelines', 'home', 'isPartial']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
export default @connect(mapStateToProps)
|
||||||
|
|
|
@ -14,6 +14,7 @@ import Video from '../../video';
|
||||||
import scheduleIdleTask from '../../ui/util/schedule_idle_task';
|
import scheduleIdleTask from '../../ui/util/schedule_idle_task';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import Icon from 'mastodon/components/icon';
|
import Icon from 'mastodon/components/icon';
|
||||||
|
import PollContainer from 'mastodon/containers/poll_container';
|
||||||
|
|
||||||
export default class DetailedStatus extends ImmutablePureComponent {
|
export default class DetailedStatus extends ImmutablePureComponent {
|
||||||
|
|
||||||
|
@ -105,7 +106,9 @@ export default class DetailedStatus extends ImmutablePureComponent {
|
||||||
outerStyle.height = `${this.state.height}px`;
|
outerStyle.height = `${this.state.height}px`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status.get('media_attachments').size > 0) {
|
if (status.get('poll')) {
|
||||||
|
media = <PollContainer pollId={status.get('poll')} />;
|
||||||
|
} else if (status.get('media_attachments').size > 0) {
|
||||||
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
|
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
|
||||||
media = <AttachmentList media={status.get('media_attachments')} />;
|
media = <AttachmentList media={status.get('media_attachments')} />;
|
||||||
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
|
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
|
||||||
|
|
|
@ -29,6 +29,7 @@ import listAdder from './list_adder';
|
||||||
import filters from './filters';
|
import filters from './filters';
|
||||||
import conversations from './conversations';
|
import conversations from './conversations';
|
||||||
import suggestions from './suggestions';
|
import suggestions from './suggestions';
|
||||||
|
import polls from './polls';
|
||||||
|
|
||||||
const reducers = {
|
const reducers = {
|
||||||
dropdown_menu,
|
dropdown_menu,
|
||||||
|
@ -61,6 +62,7 @@ const reducers = {
|
||||||
filters,
|
filters,
|
||||||
conversations,
|
conversations,
|
||||||
suggestions,
|
suggestions,
|
||||||
|
polls,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default combineReducers(reducers);
|
export default combineReducers(reducers);
|
||||||
|
|
19
app/javascript/mastodon/reducers/polls.js
Normal file
19
app/javascript/mastodon/reducers/polls.js
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
import { POLL_VOTE_SUCCESS, POLL_FETCH_SUCCESS } from 'mastodon/actions/polls';
|
||||||
|
import { POLLS_IMPORT } from 'mastodon/actions/importer';
|
||||||
|
import { Map as ImmutableMap, fromJS } from 'immutable';
|
||||||
|
|
||||||
|
const importPolls = (state, polls) => state.withMutations(map => polls.forEach(poll => map.set(poll.id, fromJS(poll))));
|
||||||
|
|
||||||
|
const initialState = ImmutableMap();
|
||||||
|
|
||||||
|
export default function polls(state = initialState, action) {
|
||||||
|
switch(action.type) {
|
||||||
|
case POLLS_IMPORT:
|
||||||
|
return importPolls(state, action.polls);
|
||||||
|
case POLL_VOTE_SUCCESS:
|
||||||
|
case POLL_FETCH_SUCCESS:
|
||||||
|
return importPolls(state, [action.poll]);
|
||||||
|
default:
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
}
|
|
@ -29,6 +29,8 @@ const initialTimeline = ImmutableMap({
|
||||||
const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => {
|
const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => {
|
||||||
return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
|
return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
|
||||||
mMap.set('isLoading', false);
|
mMap.set('isLoading', false);
|
||||||
|
mMap.set('isPartial', isPartial);
|
||||||
|
|
||||||
if (!next && !isLoadingRecent) mMap.set('hasMore', false);
|
if (!next && !isLoadingRecent) mMap.set('hasMore', false);
|
||||||
|
|
||||||
if (!statuses.isEmpty()) {
|
if (!statuses.isEmpty()) {
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
@import 'mastodon/stream_entries';
|
@import 'mastodon/stream_entries';
|
||||||
@import 'mastodon/boost';
|
@import 'mastodon/boost';
|
||||||
@import 'mastodon/components';
|
@import 'mastodon/components';
|
||||||
|
@import 'mastodon/polls';
|
||||||
@import 'mastodon/introduction';
|
@import 'mastodon/introduction';
|
||||||
@import 'mastodon/modal';
|
@import 'mastodon/modal';
|
||||||
@import 'mastodon/emoji_picker';
|
@import 'mastodon/emoji_picker';
|
||||||
|
|
|
@ -105,6 +105,10 @@
|
||||||
border-color: lighten($ui-primary-color, 4%);
|
border-color: lighten($ui-primary-color, 4%);
|
||||||
color: lighten($darker-text-color, 4%);
|
color: lighten($darker-text-color, 4%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&:disabled {
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.button--block {
|
&.button--block {
|
||||||
|
|
100
app/javascript/styles/mastodon/polls.scss
Normal file
100
app/javascript/styles/mastodon/polls.scss
Normal file
|
@ -0,0 +1,100 @@
|
||||||
|
.poll {
|
||||||
|
margin-top: 16px;
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
li {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__chart {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
height: 100%;
|
||||||
|
display: inline-block;
|
||||||
|
border-radius: 4px;
|
||||||
|
background: darken($ui-primary-color, 14%);
|
||||||
|
|
||||||
|
&.leading {
|
||||||
|
background: $ui-highlight-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__text {
|
||||||
|
position: relative;
|
||||||
|
display: inline-block;
|
||||||
|
padding: 6px 0;
|
||||||
|
line-height: 18px;
|
||||||
|
cursor: default;
|
||||||
|
|
||||||
|
input[type=radio],
|
||||||
|
input[type=checkbox] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.selectable {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__input {
|
||||||
|
display: inline-block;
|
||||||
|
position: relative;
|
||||||
|
border: 1px solid $ui-primary-color;
|
||||||
|
box-sizing: border-box;
|
||||||
|
width: 18px;
|
||||||
|
height: 18px;
|
||||||
|
margin-right: 10px;
|
||||||
|
top: -1px;
|
||||||
|
border-radius: 50%;
|
||||||
|
vertical-align: middle;
|
||||||
|
|
||||||
|
&.checkbox {
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.active {
|
||||||
|
border-color: $valid-value-color;
|
||||||
|
background: $valid-value-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__number {
|
||||||
|
display: inline-block;
|
||||||
|
width: 36px;
|
||||||
|
font-weight: 700;
|
||||||
|
padding: 0 10px;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__footer {
|
||||||
|
padding-top: 6px;
|
||||||
|
padding-bottom: 5px;
|
||||||
|
color: $dark-text-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__link {
|
||||||
|
display: inline;
|
||||||
|
background: transparent;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
border: 0;
|
||||||
|
color: $dark-text-color;
|
||||||
|
text-decoration: underline;
|
||||||
|
font-size: inherit;
|
||||||
|
|
||||||
|
&:hover,
|
||||||
|
&:focus,
|
||||||
|
&:active {
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.button {
|
||||||
|
height: 36px;
|
||||||
|
padding: 0 16px;
|
||||||
|
margin-right: 10px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
}
|
|
@ -4,7 +4,7 @@ class ActivityPub::Activity
|
||||||
include JsonLdHelper
|
include JsonLdHelper
|
||||||
include Redisable
|
include Redisable
|
||||||
|
|
||||||
SUPPORTED_TYPES = %w(Note).freeze
|
SUPPORTED_TYPES = %w(Note Question).freeze
|
||||||
CONVERTED_TYPES = %w(Image Video Article Page).freeze
|
CONVERTED_TYPES = %w(Image Video Article Page).freeze
|
||||||
|
|
||||||
def initialize(json, account, **options)
|
def initialize(json, account, **options)
|
||||||
|
|
|
@ -6,7 +6,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
||||||
|
|
||||||
RedisLock.acquire(lock_options) do |lock|
|
RedisLock.acquire(lock_options) do |lock|
|
||||||
if lock.acquired?
|
if lock.acquired?
|
||||||
return if delete_arrived_first?(object_uri)
|
return if delete_arrived_first?(object_uri) || poll_vote?
|
||||||
|
|
||||||
@status = find_existing_status
|
@status = find_existing_status
|
||||||
|
|
||||||
|
@ -68,6 +68,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
||||||
thread: replied_to_status,
|
thread: replied_to_status,
|
||||||
conversation: conversation_from_uri(@object['conversation']),
|
conversation: conversation_from_uri(@object['conversation']),
|
||||||
media_attachment_ids: process_attachments.take(4).map(&:id),
|
media_attachment_ids: process_attachments.take(4).map(&:id),
|
||||||
|
owned_poll: process_poll,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -209,6 +210,40 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
||||||
media_attachments
|
media_attachments
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def process_poll
|
||||||
|
return unless @object['type'] == 'Question' && (@object['anyOf'].is_a?(Array) || @object['oneOf'].is_a?(Array))
|
||||||
|
|
||||||
|
expires_at = begin
|
||||||
|
if @object['closed'].is_a?(String)
|
||||||
|
@object['closed']
|
||||||
|
elsif !@object['closed'].nil? && !@object['closed'].is_a?(FalseClass)
|
||||||
|
Time.now.utc
|
||||||
|
else
|
||||||
|
@object['endTime']
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if @object['anyOf'].is_a?(Array)
|
||||||
|
multiple = true
|
||||||
|
items = @object['anyOf']
|
||||||
|
else
|
||||||
|
multiple = false
|
||||||
|
items = @object['oneOf']
|
||||||
|
end
|
||||||
|
|
||||||
|
@account.polls.new(
|
||||||
|
multiple: multiple,
|
||||||
|
expires_at: expires_at,
|
||||||
|
options: items.map { |item| item['name'].presence || item['content'] },
|
||||||
|
cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 }
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def poll_vote?
|
||||||
|
return false if replied_to_status.nil? || replied_to_status.poll.nil? || !replied_to_status.local? || !replied_to_status.poll.options.include?(@object['name'])
|
||||||
|
replied_to_status.poll.votes.create!(account: @account, choice: replied_to_status.poll.options.index(@object['name']), uri: @object['id'])
|
||||||
|
end
|
||||||
|
|
||||||
def resolve_thread(status)
|
def resolve_thread(status)
|
||||||
return unless status.reply? && status.thread.nil? && Request.valid_url?(in_reply_to_uri)
|
return unless status.reply? && status.thread.nil? && Request.valid_url?(in_reply_to_uri)
|
||||||
ThreadResolveWorker.perform_async(status.id, in_reply_to_uri)
|
ThreadResolveWorker.perform_async(status.id, in_reply_to_uri)
|
||||||
|
|
|
@ -19,6 +19,10 @@ class Formatter
|
||||||
|
|
||||||
raw_content = status.text
|
raw_content = status.text
|
||||||
|
|
||||||
|
if options[:inline_poll_options] && status.poll
|
||||||
|
raw_content = raw_content + '\n\n' + status.poll.options.map { |title| "[ ] #{title}" }.join('\n')
|
||||||
|
end
|
||||||
|
|
||||||
return '' if raw_content.blank?
|
return '' if raw_content.blank?
|
||||||
|
|
||||||
unless status.local?
|
unless status.local?
|
||||||
|
|
|
@ -352,7 +352,7 @@ class OStatus::AtomSerializer
|
||||||
append_element(entry, 'link', nil, rel: :alternate, type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(status)) if status.account.local?
|
append_element(entry, 'link', nil, rel: :alternate, type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(status)) if status.account.local?
|
||||||
|
|
||||||
append_element(entry, 'summary', status.spoiler_text, 'xml:lang': status.language) if status.spoiler_text?
|
append_element(entry, 'summary', status.spoiler_text, 'xml:lang': status.language) if status.spoiler_text?
|
||||||
append_element(entry, 'content', Formatter.instance.format(status).to_str || '.', type: 'html', 'xml:lang': status.language)
|
append_element(entry, 'content', Formatter.instance.format(status, inline_poll_options: true).to_str || '.', type: 'html', 'xml:lang': status.language)
|
||||||
|
|
||||||
status.active_mentions.sort_by(&:id).each do |mentioned|
|
status.active_mentions.sort_by(&:id).each do |mentioned|
|
||||||
append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': OStatus::TagManager::TYPES[:person], href: OStatus::TagManager.instance.uri_for(mentioned.account))
|
append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': OStatus::TagManager::TYPES[:person], href: OStatus::TagManager.instance.uri_for(mentioned.account))
|
||||||
|
|
|
@ -245,6 +245,7 @@ class Account < ApplicationRecord
|
||||||
def fields_attributes=(attributes)
|
def fields_attributes=(attributes)
|
||||||
fields = []
|
fields = []
|
||||||
old_fields = self[:fields] || []
|
old_fields = self[:fields] || []
|
||||||
|
old_fields = [] if old_fields.is_a?(Hash)
|
||||||
|
|
||||||
if attributes.is_a?(Hash)
|
if attributes.is_a?(Hash)
|
||||||
attributes.each_value do |attr|
|
attributes.each_value do |attr|
|
||||||
|
|
|
@ -27,6 +27,7 @@ module AccountAssociations
|
||||||
|
|
||||||
# Media
|
# Media
|
||||||
has_many :media_attachments, dependent: :destroy
|
has_many :media_attachments, dependent: :destroy
|
||||||
|
has_many :polls, dependent: :destroy
|
||||||
|
|
||||||
# PuSH subscriptions
|
# PuSH subscriptions
|
||||||
has_many :subscriptions, dependent: :destroy
|
has_many :subscriptions, dependent: :destroy
|
||||||
|
|
|
@ -23,7 +23,7 @@ class Export
|
||||||
|
|
||||||
def to_lists_csv
|
def to_lists_csv
|
||||||
CSV.generate do |csv|
|
CSV.generate do |csv|
|
||||||
account.owned_lists.select(:title).each do |list|
|
account.owned_lists.select(:title, :id).each do |list|
|
||||||
list.accounts.select(:username, :domain).each do |account|
|
list.accounts.select(:username, :domain).each do |account|
|
||||||
csv << [list.title, acct(account)]
|
csv << [list.title, acct(account)]
|
||||||
end
|
end
|
||||||
|
|
|
@ -18,11 +18,12 @@ class FeaturedTag < ApplicationRecord
|
||||||
|
|
||||||
delegate :name, to: :tag, allow_nil: true
|
delegate :name, to: :tag, allow_nil: true
|
||||||
|
|
||||||
validates :name, presence: true
|
validates_associated :tag, on: :create
|
||||||
|
validates :name, presence: true, on: :create
|
||||||
validate :validate_featured_tags_limit, on: :create
|
validate :validate_featured_tags_limit, on: :create
|
||||||
|
|
||||||
def name=(str)
|
def name=(str)
|
||||||
self.tag = Tag.find_or_initialize_by(name: str.delete('#').mb_chars.downcase.to_s)
|
self.tag = Tag.find_or_initialize_by(name: str.strip.delete('#').mb_chars.downcase.to_s)
|
||||||
end
|
end
|
||||||
|
|
||||||
def increment(timestamp)
|
def increment(timestamp)
|
||||||
|
|
97
app/models/poll.rb
Normal file
97
app/models/poll.rb
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
# == Schema Information
|
||||||
|
#
|
||||||
|
# Table name: polls
|
||||||
|
#
|
||||||
|
# id :bigint(8) not null, primary key
|
||||||
|
# account_id :bigint(8)
|
||||||
|
# status_id :bigint(8)
|
||||||
|
# expires_at :datetime
|
||||||
|
# options :string default([]), not null, is an Array
|
||||||
|
# cached_tallies :bigint(8) default([]), not null, is an Array
|
||||||
|
# multiple :boolean default(FALSE), not null
|
||||||
|
# hide_totals :boolean default(FALSE), not null
|
||||||
|
# votes_count :bigint(8) default(0), not null
|
||||||
|
# last_fetched_at :datetime
|
||||||
|
# created_at :datetime not null
|
||||||
|
# updated_at :datetime not null
|
||||||
|
#
|
||||||
|
|
||||||
|
class Poll < ApplicationRecord
|
||||||
|
include Expireable
|
||||||
|
|
||||||
|
belongs_to :account
|
||||||
|
belongs_to :status
|
||||||
|
|
||||||
|
has_many :votes, class_name: 'PollVote', inverse_of: :poll, dependent: :destroy
|
||||||
|
|
||||||
|
validates :options, presence: true
|
||||||
|
validates :expires_at, presence: true, if: :local?
|
||||||
|
validates_with PollValidator, if: :local?
|
||||||
|
|
||||||
|
scope :attached, -> { where.not(status_id: nil) }
|
||||||
|
scope :unattached, -> { where(status_id: nil) }
|
||||||
|
|
||||||
|
before_validation :prepare_options
|
||||||
|
before_validation :prepare_votes_count
|
||||||
|
|
||||||
|
after_initialize :prepare_cached_tallies
|
||||||
|
|
||||||
|
after_commit :reset_parent_cache, on: :update
|
||||||
|
|
||||||
|
def loaded_options
|
||||||
|
options.map.with_index { |title, key| Option.new(self, key.to_s, title, cached_tallies[key]) }
|
||||||
|
end
|
||||||
|
|
||||||
|
def unloaded_options
|
||||||
|
options.map.with_index { |title, key| Option.new(self, key.to_s, title, nil) }
|
||||||
|
end
|
||||||
|
|
||||||
|
def possibly_stale?
|
||||||
|
remote? && last_fetched_before_expiration? && time_passed_since_last_fetch?
|
||||||
|
end
|
||||||
|
|
||||||
|
delegate :local?, to: :account
|
||||||
|
|
||||||
|
def remote?
|
||||||
|
!local?
|
||||||
|
end
|
||||||
|
|
||||||
|
class Option < ActiveModelSerializers::Model
|
||||||
|
attributes :id, :title, :votes_count, :poll
|
||||||
|
|
||||||
|
def initialize(poll, id, title, votes_count)
|
||||||
|
@poll = poll
|
||||||
|
@id = id
|
||||||
|
@title = title
|
||||||
|
@votes_count = votes_count
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def prepare_cached_tallies
|
||||||
|
self.cached_tallies = options.map { 0 } if cached_tallies.empty?
|
||||||
|
end
|
||||||
|
|
||||||
|
def prepare_votes_count
|
||||||
|
self.votes_count = cached_tallies.sum unless cached_tallies.empty?
|
||||||
|
end
|
||||||
|
|
||||||
|
def prepare_options
|
||||||
|
self.options = options.map(&:strip).reject(&:blank?)
|
||||||
|
end
|
||||||
|
|
||||||
|
def reset_parent_cache
|
||||||
|
return if status_id.nil?
|
||||||
|
Rails.cache.delete("statuses/#{status_id}")
|
||||||
|
end
|
||||||
|
|
||||||
|
def last_fetched_before_expiration?
|
||||||
|
last_fetched_at.nil? || expires_at.nil? || last_fetched_at < expires_at
|
||||||
|
end
|
||||||
|
|
||||||
|
def time_passed_since_last_fetch?
|
||||||
|
last_fetched_at.nil? || last_fetched_at < 1.minute.ago
|
||||||
|
end
|
||||||
|
end
|
36
app/models/poll_vote.rb
Normal file
36
app/models/poll_vote.rb
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
# == Schema Information
|
||||||
|
#
|
||||||
|
# Table name: poll_votes
|
||||||
|
#
|
||||||
|
# id :bigint(8) not null, primary key
|
||||||
|
# account_id :bigint(8)
|
||||||
|
# poll_id :bigint(8)
|
||||||
|
# choice :integer default(0), not null
|
||||||
|
# created_at :datetime not null
|
||||||
|
# updated_at :datetime not null
|
||||||
|
# uri :string
|
||||||
|
#
|
||||||
|
|
||||||
|
class PollVote < ApplicationRecord
|
||||||
|
belongs_to :account
|
||||||
|
belongs_to :poll, inverse_of: :votes
|
||||||
|
|
||||||
|
validates :choice, presence: true
|
||||||
|
validates_with VoteValidator
|
||||||
|
|
||||||
|
after_create_commit :increment_counter_cache
|
||||||
|
|
||||||
|
delegate :local?, to: :account
|
||||||
|
|
||||||
|
def object_type
|
||||||
|
:vote
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def increment_counter_cache
|
||||||
|
poll.cached_tallies[choice] = (poll.cached_tallies[choice] || 0) + 1
|
||||||
|
poll.save
|
||||||
|
end
|
||||||
|
end
|
|
@ -23,6 +23,7 @@
|
||||||
# in_reply_to_account_id :bigint(8)
|
# in_reply_to_account_id :bigint(8)
|
||||||
# local_only :boolean
|
# local_only :boolean
|
||||||
# full_status_text :text default(""), not null
|
# full_status_text :text default(""), not null
|
||||||
|
# poll_id :bigint(8)
|
||||||
#
|
#
|
||||||
|
|
||||||
class Status < ApplicationRecord
|
class Status < ApplicationRecord
|
||||||
|
@ -46,6 +47,7 @@ class Status < ApplicationRecord
|
||||||
belongs_to :account, inverse_of: :statuses
|
belongs_to :account, inverse_of: :statuses
|
||||||
belongs_to :in_reply_to_account, foreign_key: 'in_reply_to_account_id', class_name: 'Account', optional: true
|
belongs_to :in_reply_to_account, foreign_key: 'in_reply_to_account_id', class_name: 'Account', optional: true
|
||||||
belongs_to :conversation, optional: true
|
belongs_to :conversation, optional: true
|
||||||
|
belongs_to :poll, optional: true
|
||||||
|
|
||||||
belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies, optional: true
|
belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies, optional: true
|
||||||
belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true
|
belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true
|
||||||
|
@ -64,12 +66,14 @@ class Status < ApplicationRecord
|
||||||
has_one :notification, as: :activity, dependent: :destroy
|
has_one :notification, as: :activity, dependent: :destroy
|
||||||
has_one :stream_entry, as: :activity, inverse_of: :status
|
has_one :stream_entry, as: :activity, inverse_of: :status
|
||||||
has_one :status_stat, inverse_of: :status
|
has_one :status_stat, inverse_of: :status
|
||||||
|
has_one :owned_poll, class_name: 'Poll', inverse_of: :status, dependent: :destroy
|
||||||
|
|
||||||
validates :uri, uniqueness: true, presence: true, unless: :local?
|
validates :uri, uniqueness: true, presence: true, unless: :local?
|
||||||
validates :text, presence: true, unless: -> { with_media? || reblog? }
|
validates :text, presence: true, unless: -> { with_media? || reblog? }
|
||||||
validates_with StatusLengthValidator
|
validates_with StatusLengthValidator
|
||||||
validates_with DisallowedHashtagsValidator
|
validates_with DisallowedHashtagsValidator
|
||||||
validates :reblog, uniqueness: { scope: :account }, if: :reblog?
|
validates :reblog, uniqueness: { scope: :account }, if: :reblog?
|
||||||
|
validates_associated :owned_poll
|
||||||
|
|
||||||
default_scope { recent }
|
default_scope { recent }
|
||||||
|
|
||||||
|
@ -106,6 +110,7 @@ class Status < ApplicationRecord
|
||||||
:tags,
|
:tags,
|
||||||
:preview_cards,
|
:preview_cards,
|
||||||
:stream_entry,
|
:stream_entry,
|
||||||
|
:poll,
|
||||||
account: :account_stat,
|
account: :account_stat,
|
||||||
active_mentions: { account: :account_stat },
|
active_mentions: { account: :account_stat },
|
||||||
reblog: [
|
reblog: [
|
||||||
|
@ -116,6 +121,7 @@ class Status < ApplicationRecord
|
||||||
:media_attachments,
|
:media_attachments,
|
||||||
:conversation,
|
:conversation,
|
||||||
:status_stat,
|
:status_stat,
|
||||||
|
:poll,
|
||||||
account: :account_stat,
|
account: :account_stat,
|
||||||
active_mentions: { account: :account_stat },
|
active_mentions: { account: :account_stat },
|
||||||
],
|
],
|
||||||
|
@ -257,6 +263,8 @@ class Status < ApplicationRecord
|
||||||
before_validation :set_conversation
|
before_validation :set_conversation
|
||||||
before_validation :set_local
|
before_validation :set_local
|
||||||
|
|
||||||
|
after_create :set_poll_id
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
def selectable_visibilities
|
def selectable_visibilities
|
||||||
visibilities.keys - %w(direct limited)
|
visibilities.keys - %w(direct limited)
|
||||||
|
@ -458,6 +466,10 @@ class Status < ApplicationRecord
|
||||||
self.reblog = reblog.reblog if reblog? && reblog.reblog?
|
self.reblog = reblog.reblog if reblog? && reblog.reblog?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def set_poll_id
|
||||||
|
update_column(:poll_id, owned_poll.id) unless owned_poll.nil?
|
||||||
|
end
|
||||||
|
|
||||||
def set_visibility
|
def set_visibility
|
||||||
self.visibility = (account.locked? ? :private : :public) if visibility.nil?
|
self.visibility = (account.locked? ? :private : :public) if visibility.nil?
|
||||||
self.visibility = reblog.visibility if reblog?
|
self.visibility = reblog.visibility if reblog?
|
||||||
|
|
7
app/policies/poll_policy.rb
Normal file
7
app/policies/poll_policy.rb
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class PollPolicy < ApplicationPolicy
|
||||||
|
def vote?
|
||||||
|
StatusPolicy.new(current_account, record.status).show? && !current_account.blocking?(record.account) && !record.account.blocking?(current_account)
|
||||||
|
end
|
||||||
|
end
|
|
@ -15,12 +15,18 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
|
||||||
|
|
||||||
has_one :replies, serializer: ActivityPub::CollectionSerializer, if: :local?
|
has_one :replies, serializer: ActivityPub::CollectionSerializer, if: :local?
|
||||||
|
|
||||||
|
has_many :poll_options, key: :one_of, if: :poll_and_not_multiple?
|
||||||
|
has_many :poll_options, key: :any_of, if: :poll_and_multiple?
|
||||||
|
|
||||||
|
attribute :end_time, if: :poll_and_expires?
|
||||||
|
attribute :closed, if: :poll_and_expired?
|
||||||
|
|
||||||
def id
|
def id
|
||||||
ActivityPub::TagManager.instance.uri_for(object)
|
ActivityPub::TagManager.instance.uri_for(object)
|
||||||
end
|
end
|
||||||
|
|
||||||
def type
|
def type
|
||||||
'Note'
|
object.poll ? 'Question' : 'Note'
|
||||||
end
|
end
|
||||||
|
|
||||||
def summary
|
def summary
|
||||||
|
@ -38,6 +44,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
|
||||||
def replies
|
def replies
|
||||||
replies = object.self_replies(5).pluck(:id, :uri)
|
replies = object.self_replies(5).pluck(:id, :uri)
|
||||||
last_id = replies.last&.first
|
last_id = replies.last&.first
|
||||||
|
|
||||||
ActivityPub::CollectionPresenter.new(
|
ActivityPub::CollectionPresenter.new(
|
||||||
type: :unordered,
|
type: :unordered,
|
||||||
id: ActivityPub::TagManager.instance.replies_uri_for(object),
|
id: ActivityPub::TagManager.instance.replies_uri_for(object),
|
||||||
|
@ -114,6 +121,36 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
|
||||||
object.account.local?
|
object.account.local?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def poll_options
|
||||||
|
if !object.poll.expired? && object.poll.hide_totals?
|
||||||
|
object.poll.unloaded_options
|
||||||
|
else
|
||||||
|
object.poll.loaded_options
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def poll_and_multiple?
|
||||||
|
object.poll&.multiple?
|
||||||
|
end
|
||||||
|
|
||||||
|
def poll_and_not_multiple?
|
||||||
|
object.poll && !object.poll.multiple?
|
||||||
|
end
|
||||||
|
|
||||||
|
def closed
|
||||||
|
object.poll.expires_at.iso8601
|
||||||
|
end
|
||||||
|
|
||||||
|
alias end_time closed
|
||||||
|
|
||||||
|
def poll_and_expires?
|
||||||
|
object.poll&.expires_at&.present?
|
||||||
|
end
|
||||||
|
|
||||||
|
def poll_and_expired?
|
||||||
|
object.poll&.expired?
|
||||||
|
end
|
||||||
|
|
||||||
class MediaAttachmentSerializer < ActiveModel::Serializer
|
class MediaAttachmentSerializer < ActiveModel::Serializer
|
||||||
include RoutingHelper
|
include RoutingHelper
|
||||||
|
|
||||||
|
@ -181,4 +218,34 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
|
||||||
|
|
||||||
class CustomEmojiSerializer < ActivityPub::EmojiSerializer
|
class CustomEmojiSerializer < ActivityPub::EmojiSerializer
|
||||||
end
|
end
|
||||||
|
|
||||||
|
class OptionSerializer < ActiveModel::Serializer
|
||||||
|
class RepliesSerializer < ActiveModel::Serializer
|
||||||
|
attributes :type, :total_items
|
||||||
|
|
||||||
|
def type
|
||||||
|
'Collection'
|
||||||
|
end
|
||||||
|
|
||||||
|
def total_items
|
||||||
|
object.votes_count
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
attributes :type, :name
|
||||||
|
|
||||||
|
has_one :replies, serializer: ActivityPub::NoteSerializer::OptionSerializer::RepliesSerializer
|
||||||
|
|
||||||
|
def type
|
||||||
|
'Note'
|
||||||
|
end
|
||||||
|
|
||||||
|
def name
|
||||||
|
object.title
|
||||||
|
end
|
||||||
|
|
||||||
|
def replies
|
||||||
|
object
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
52
app/serializers/activitypub/vote_serializer.rb
Normal file
52
app/serializers/activitypub/vote_serializer.rb
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class ActivityPub::VoteSerializer < ActiveModel::Serializer
|
||||||
|
class NoteSerializer < ActiveModel::Serializer
|
||||||
|
attributes :id, :type, :name, :attributed_to,
|
||||||
|
:in_reply_to, :to
|
||||||
|
|
||||||
|
def id
|
||||||
|
ActivityPub::TagManager.instance.uri_for(object) || [ActivityPub::TagManager.instance.uri_for(object.account), '#votes/', object.id].join
|
||||||
|
end
|
||||||
|
|
||||||
|
def type
|
||||||
|
'Note'
|
||||||
|
end
|
||||||
|
|
||||||
|
def name
|
||||||
|
object.poll.options[object.choice.to_i]
|
||||||
|
end
|
||||||
|
|
||||||
|
def attributed_to
|
||||||
|
ActivityPub::TagManager.instance.uri_for(object.account)
|
||||||
|
end
|
||||||
|
|
||||||
|
def in_reply_to
|
||||||
|
ActivityPub::TagManager.instance.uri_for(object.poll.status)
|
||||||
|
end
|
||||||
|
|
||||||
|
def to
|
||||||
|
ActivityPub::TagManager.instance.uri_for(object.poll.account)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
attributes :id, :type, :actor, :to
|
||||||
|
|
||||||
|
has_one :object, serializer: ActivityPub::VoteSerializer::NoteSerializer
|
||||||
|
|
||||||
|
def id
|
||||||
|
[ActivityPub::TagManager.instance.uri_for(object.account), '#votes/', object.id, '/activity'].join
|
||||||
|
end
|
||||||
|
|
||||||
|
def type
|
||||||
|
'Create'
|
||||||
|
end
|
||||||
|
|
||||||
|
def actor
|
||||||
|
ActivityPub::TagManager.instance.uri_for(object.account)
|
||||||
|
end
|
||||||
|
|
||||||
|
def to
|
||||||
|
ActivityPub::TagManager.instance.uri_for(object.poll.account)
|
||||||
|
end
|
||||||
|
end
|
38
app/serializers/rest/poll_serializer.rb
Normal file
38
app/serializers/rest/poll_serializer.rb
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class REST::PollSerializer < ActiveModel::Serializer
|
||||||
|
attributes :id, :expires_at, :expired,
|
||||||
|
:multiple, :votes_count
|
||||||
|
|
||||||
|
has_many :dynamic_options, key: :options
|
||||||
|
|
||||||
|
attribute :voted, if: :current_user?
|
||||||
|
|
||||||
|
def id
|
||||||
|
object.id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
|
def dynamic_options
|
||||||
|
if !object.expired? && object.hide_totals?
|
||||||
|
object.unloaded_options
|
||||||
|
else
|
||||||
|
object.loaded_options
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def expired
|
||||||
|
object.expired?
|
||||||
|
end
|
||||||
|
|
||||||
|
def voted
|
||||||
|
object.votes.where(account: current_user.account).exists?
|
||||||
|
end
|
||||||
|
|
||||||
|
def current_user?
|
||||||
|
!current_user.nil?
|
||||||
|
end
|
||||||
|
|
||||||
|
class OptionSerializer < ActiveModel::Serializer
|
||||||
|
attributes :title, :votes_count
|
||||||
|
end
|
||||||
|
end
|
|
@ -23,6 +23,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
|
||||||
has_many :emojis, serializer: REST::CustomEmojiSerializer
|
has_many :emojis, serializer: REST::CustomEmojiSerializer
|
||||||
|
|
||||||
has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
|
has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
|
||||||
|
has_one :poll, serializer: REST::PollSerializer
|
||||||
|
|
||||||
def id
|
def id
|
||||||
object.id.to_s
|
object.id.to_s
|
||||||
|
|
|
@ -22,7 +22,7 @@ class RSS::AccountSerializer
|
||||||
item.title(status.title)
|
item.title(status.title)
|
||||||
.link(TagManager.instance.url_for(status))
|
.link(TagManager.instance.url_for(status))
|
||||||
.pub_date(status.created_at)
|
.pub_date(status.created_at)
|
||||||
.description(status.spoiler_text.presence || Formatter.instance.format(status).to_str)
|
.description(status.spoiler_text.presence || Formatter.instance.format(status, inline_poll_options: true).to_str)
|
||||||
|
|
||||||
status.media_attachments.each do |media|
|
status.media_attachments.each do |media|
|
||||||
item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size)
|
item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size)
|
||||||
|
|
52
app/services/activitypub/fetch_remote_poll_service.rb
Normal file
52
app/services/activitypub/fetch_remote_poll_service.rb
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class ActivityPub::FetchRemotePollService < BaseService
|
||||||
|
include JsonLdHelper
|
||||||
|
|
||||||
|
def call(poll, on_behalf_of = nil)
|
||||||
|
@json = fetch_resource(poll.status.uri, true, on_behalf_of)
|
||||||
|
|
||||||
|
return unless supported_context? && expected_type?
|
||||||
|
|
||||||
|
expires_at = begin
|
||||||
|
if @json['closed'].is_a?(String)
|
||||||
|
@json['closed']
|
||||||
|
elsif !@json['closed'].nil? && !@json['closed'].is_a?(FalseClass)
|
||||||
|
Time.now.utc
|
||||||
|
else
|
||||||
|
@json['endTime']
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
items = begin
|
||||||
|
if @json['anyOf'].is_a?(Array)
|
||||||
|
@json['anyOf']
|
||||||
|
else
|
||||||
|
@json['oneOf']
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
latest_options = items.map { |item| item['name'].presence || item['content'] }
|
||||||
|
|
||||||
|
# If for some reasons the options were changed, it invalidates all previous
|
||||||
|
# votes, so we need to remove them
|
||||||
|
poll.votes.delete_all if latest_options != poll.options
|
||||||
|
|
||||||
|
poll.update!(
|
||||||
|
last_fetched_at: Time.now.utc,
|
||||||
|
expires_at: expires_at,
|
||||||
|
options: latest_options,
|
||||||
|
cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 }
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def supported_context?
|
||||||
|
super(@json)
|
||||||
|
end
|
||||||
|
|
||||||
|
def expected_type?
|
||||||
|
equals_or_includes_any?(@json['type'], %w(Question))
|
||||||
|
end
|
||||||
|
end
|
|
@ -36,9 +36,7 @@ class ActivityPub::FetchRepliesService < BaseService
|
||||||
return collection_or_uri if collection_or_uri.is_a?(Hash)
|
return collection_or_uri if collection_or_uri.is_a?(Hash)
|
||||||
return unless @allow_synchronous_requests
|
return unless @allow_synchronous_requests
|
||||||
return if invalid_origin?(collection_or_uri)
|
return if invalid_origin?(collection_or_uri)
|
||||||
collection = fetch_resource_without_id_validation(collection_or_uri)
|
fetch_resource_without_id_validation(collection_or_uri, nil, true)
|
||||||
raise Mastodon::UnexpectedResponseError if collection.nil?
|
|
||||||
collection
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def filtered_replies
|
def filtered_replies
|
||||||
|
|
|
@ -15,6 +15,7 @@ class PostStatusService < BaseService
|
||||||
# @option [String] :spoiler_text
|
# @option [String] :spoiler_text
|
||||||
# @option [String] :language
|
# @option [String] :language
|
||||||
# @option [String] :scheduled_at
|
# @option [String] :scheduled_at
|
||||||
|
# @option [Hash] :poll Optional poll to attach
|
||||||
# @option [Enumerable] :media_ids Optional array of media IDs to attach
|
# @option [Enumerable] :media_ids Optional array of media IDs to attach
|
||||||
# @option [Doorkeeper::Application] :application
|
# @option [Doorkeeper::Application] :application
|
||||||
# @option [String] :idempotency Optional idempotency key
|
# @option [String] :idempotency Optional idempotency key
|
||||||
|
@ -28,6 +29,7 @@ class PostStatusService < BaseService
|
||||||
return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
|
return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
|
||||||
|
|
||||||
validate_media!
|
validate_media!
|
||||||
|
validate_poll!
|
||||||
preprocess_attributes!
|
preprocess_attributes!
|
||||||
|
|
||||||
if scheduled?
|
if scheduled?
|
||||||
|
@ -98,13 +100,19 @@ class PostStatusService < BaseService
|
||||||
def validate_media!
|
def validate_media!
|
||||||
return if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
|
return if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
|
||||||
|
|
||||||
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4
|
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
|
||||||
|
|
||||||
@media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
|
@media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
|
||||||
|
|
||||||
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:video?)
|
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:video?)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def validate_poll!
|
||||||
|
return if @options[:poll].blank?
|
||||||
|
|
||||||
|
@poll = @account.polls.new(@options[:poll])
|
||||||
|
end
|
||||||
|
|
||||||
def language_from_option(str)
|
def language_from_option(str)
|
||||||
ISO_639.find(str)&.alpha2
|
ISO_639.find(str)&.alpha2
|
||||||
end
|
end
|
||||||
|
@ -157,6 +165,7 @@ class PostStatusService < BaseService
|
||||||
text: @text,
|
text: @text,
|
||||||
media_attachments: @media || [],
|
media_attachments: @media || [],
|
||||||
thread: @in_reply_to,
|
thread: @in_reply_to,
|
||||||
|
owned_poll: @poll,
|
||||||
sensitive: (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?,
|
sensitive: (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?,
|
||||||
spoiler_text: @options[:spoiler_text] || '',
|
spoiler_text: @options[:spoiler_text] || '',
|
||||||
visibility: @visibility,
|
visibility: @visibility,
|
||||||
|
|
|
@ -20,7 +20,7 @@ class ResolveURLService < BaseService
|
||||||
def process_url
|
def process_url
|
||||||
if equals_or_includes_any?(type, %w(Application Group Organization Person Service))
|
if equals_or_includes_any?(type, %w(Application Group Organization Person Service))
|
||||||
FetchRemoteAccountService.new.call(atom_url, body, protocol)
|
FetchRemoteAccountService.new.call(atom_url, body, protocol)
|
||||||
elsif equals_or_includes_any?(type, %w(Note Article Image Video Page))
|
elsif equals_or_includes_any?(type, %w(Note Article Image Video Page Question))
|
||||||
FetchRemoteStatusService.new.call(atom_url, body, protocol)
|
FetchRemoteStatusService.new.call(atom_url, body, protocol)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -84,7 +84,7 @@ class SuspendAccountService < BaseService
|
||||||
@account.locked = false
|
@account.locked = false
|
||||||
@account.display_name = ''
|
@account.display_name = ''
|
||||||
@account.note = ''
|
@account.note = ''
|
||||||
@account.fields = {}
|
@account.fields = []
|
||||||
@account.statuses_count = 0
|
@account.statuses_count = 0
|
||||||
@account.followers_count = 0
|
@account.followers_count = 0
|
||||||
@account.following_count = 0
|
@account.following_count = 0
|
||||||
|
|
40
app/services/vote_service.rb
Normal file
40
app/services/vote_service.rb
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class VoteService < BaseService
|
||||||
|
include Authorization
|
||||||
|
|
||||||
|
def call(account, poll, choices)
|
||||||
|
authorize_with account, poll, :vote?
|
||||||
|
|
||||||
|
@account = account
|
||||||
|
@poll = poll
|
||||||
|
@choices = choices
|
||||||
|
@votes = []
|
||||||
|
|
||||||
|
ApplicationRecord.transaction do
|
||||||
|
@choices.each do |choice|
|
||||||
|
@votes << @poll.votes.create!(account: @account, choice: choice)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return if @poll.account.local?
|
||||||
|
|
||||||
|
@votes.each do |vote|
|
||||||
|
ActivityPub::DeliveryWorker.perform_async(
|
||||||
|
build_json(vote),
|
||||||
|
@account.id,
|
||||||
|
@poll.account.inbox_url
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def build_json(vote)
|
||||||
|
ActiveModelSerializers::SerializableResource.new(
|
||||||
|
vote,
|
||||||
|
serializer: ActivityPub::VoteSerializer,
|
||||||
|
adapter: ActivityPub::Adapter
|
||||||
|
).to_json
|
||||||
|
end
|
||||||
|
end
|
19
app/validators/poll_validator.rb
Normal file
19
app/validators/poll_validator.rb
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class PollValidator < ActiveModel::Validator
|
||||||
|
MAX_OPTIONS = 4
|
||||||
|
MAX_OPTION_CHARS = 25
|
||||||
|
MAX_EXPIRATION = 1.month.freeze
|
||||||
|
MIN_EXPIRATION = 5.minutes.freeze
|
||||||
|
|
||||||
|
def validate(poll)
|
||||||
|
current_time = Time.now.utc
|
||||||
|
|
||||||
|
poll.errors.add(:options, I18n.t('polls.errors.too_few_options')) unless poll.options.size > 1
|
||||||
|
poll.errors.add(:options, I18n.t('polls.errors.too_many_options', max: MAX_OPTIONS)) if poll.options.size > MAX_OPTIONS
|
||||||
|
poll.errors.add(:options, I18n.t('polls.errors.over_character_limit', max: MAX_OPTION_CHARS)) if poll.options.any? { |option| option.mb_chars.grapheme_length > MAX_OPTION_CHARS }
|
||||||
|
poll.errors.add(:options, I18n.t('polls.errors.duplicate_options')) unless poll.options.uniq.size == poll.options.size
|
||||||
|
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at.nil? || poll.expires_at - current_time >= MAX_EXPIRATION
|
||||||
|
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if poll.expires_at.present? && poll.expires_at - current_time <= MIN_EXPIRATION
|
||||||
|
end
|
||||||
|
end
|
13
app/validators/vote_validator.rb
Normal file
13
app/validators/vote_validator.rb
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class VoteValidator < ActiveModel::Validator
|
||||||
|
def validate(vote)
|
||||||
|
vote.errors.add(:base, I18n.t('polls.errors.expired')) if vote.poll.expired?
|
||||||
|
|
||||||
|
if vote.poll.multiple? && vote.poll.votes.where(account: vote.account, choice: vote.choice).exists?
|
||||||
|
vote.errors.add(:base, I18n.t('polls.errors.already_voted'))
|
||||||
|
elsif !vote.poll.multiple? && vote.poll.votes.where(account: vote.account).exists?
|
||||||
|
vote.errors.add(:base, I18n.t('polls.errors.already_voted'))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -22,7 +22,10 @@
|
||||||
%a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
|
%a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
|
||||||
.e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
|
.e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
|
||||||
|
|
||||||
- if !status.media_attachments.empty?
|
- if status.poll
|
||||||
|
= react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
|
||||||
|
= render partial: 'stream_entries/poll', locals: { poll: status.poll }
|
||||||
|
- elsif !status.media_attachments.empty?
|
||||||
- if status.media_attachments.first.video?
|
- if status.media_attachments.first.video?
|
||||||
- video = status.media_attachments.first
|
- video = status.media_attachments.first
|
||||||
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 670, height: 380, detailed: true, inline: true, alt: video.description do
|
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 670, height: 380, detailed: true, inline: true, alt: video.description do
|
||||||
|
|
29
app/views/stream_entries/_poll.html.haml
Normal file
29
app/views/stream_entries/_poll.html.haml
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
- options = (!poll.expired? && poll.hide_totals?) ? poll.unloaded_options : poll.loaded_options
|
||||||
|
- voted = user_signed_in? && poll.votes.where(account: current_account).exists?
|
||||||
|
- show_results = voted || poll.expired?
|
||||||
|
|
||||||
|
.poll
|
||||||
|
%ul
|
||||||
|
- options.each do |option|
|
||||||
|
%li
|
||||||
|
- if show_results
|
||||||
|
- percent = 100 * option.votes_count / poll.votes_count
|
||||||
|
%span.poll__chart{ style: "width: #{percent}%" }
|
||||||
|
|
||||||
|
%label.poll__text><
|
||||||
|
%span.poll__number= percent.round
|
||||||
|
= option.title
|
||||||
|
- else
|
||||||
|
%label.poll__text><
|
||||||
|
%span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}><
|
||||||
|
= option.title
|
||||||
|
.poll__footer
|
||||||
|
- unless show_results
|
||||||
|
%button.button.button-secondary{ disabled: true }
|
||||||
|
= t('statuses.poll.vote')
|
||||||
|
|
||||||
|
%span= t('statuses.poll.total_votes', count: poll.votes_count)
|
||||||
|
|
||||||
|
- unless poll.expires_at.nil?
|
||||||
|
·
|
||||||
|
%span= l poll.expires_at
|
|
@ -27,7 +27,10 @@
|
||||||
.e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
|
.e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
|
||||||
= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
|
= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
|
||||||
|
|
||||||
- if !status.media_attachments.empty?
|
- if status.poll
|
||||||
|
= react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
|
||||||
|
= render partial: 'stream_entries/poll', locals: { poll: status.poll }
|
||||||
|
- elsif !status.media_attachments.empty?
|
||||||
- if status.media_attachments.first.video?
|
- if status.media_attachments.first.video?
|
||||||
- video = status.media_attachments.first
|
- video = status.media_attachments.first
|
||||||
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description do
|
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description do
|
||||||
|
|
|
@ -8,5 +8,7 @@ class ActivityPub::FetchRepliesWorker
|
||||||
|
|
||||||
def perform(parent_status_id, replies_uri)
|
def perform(parent_status_id, replies_uri)
|
||||||
ActivityPub::FetchRepliesService.new.call(Status.find(parent_status_id), replies_uri)
|
ActivityPub::FetchRepliesService.new.call(Status.find(parent_status_id), replies_uri)
|
||||||
|
rescue ActiveRecord::RecordNotFound
|
||||||
|
true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -738,6 +738,16 @@ en:
|
||||||
older: Older
|
older: Older
|
||||||
prev: Prev
|
prev: Prev
|
||||||
truncate: "…"
|
truncate: "…"
|
||||||
|
polls:
|
||||||
|
errors:
|
||||||
|
already_voted: You have already voted on this poll
|
||||||
|
duplicate_options: contain duplicate items
|
||||||
|
duration_too_long: is too far into the future
|
||||||
|
duration_too_short: is too soon
|
||||||
|
expired: The poll has already ended
|
||||||
|
over_character_limit: cannot be longer than %{MAX} characters each
|
||||||
|
too_few_options: must have more than one item
|
||||||
|
too_many_options: can't contain more than %{MAX} items
|
||||||
preferences:
|
preferences:
|
||||||
languages: Languages
|
languages: Languages
|
||||||
other: Other
|
other: Other
|
||||||
|
@ -848,6 +858,11 @@ en:
|
||||||
ownership: Someone else's toot cannot be pinned
|
ownership: Someone else's toot cannot be pinned
|
||||||
private: Non-public toot cannot be pinned
|
private: Non-public toot cannot be pinned
|
||||||
reblog: A boost cannot be pinned
|
reblog: A boost cannot be pinned
|
||||||
|
poll:
|
||||||
|
total_votes:
|
||||||
|
one: "%{count} vote"
|
||||||
|
other: "%{count} votes"
|
||||||
|
vote: Vote
|
||||||
show_more: Show more
|
show_more: Show more
|
||||||
sign_in_to_participate: Sign in to participate in the conversation
|
sign_in_to_participate: Sign in to participate in the conversation
|
||||||
title: '%{name}: "%{quote}"'
|
title: '%{name}: "%{quote}"'
|
||||||
|
|
|
@ -374,6 +374,10 @@ Rails.application.routes.draw do
|
||||||
resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts'
|
resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
resources :polls, only: [:create, :show] do
|
||||||
|
resources :votes, only: :create, controller: 'polls/votes'
|
||||||
|
end
|
||||||
|
|
||||||
namespace :push do
|
namespace :push do
|
||||||
resource :subscription, only: [:create, :show, :update, :destroy]
|
resource :subscription, only: [:create, :show, :update, :destroy]
|
||||||
end
|
end
|
||||||
|
|
17
db/migrate/20190225031541_create_polls.rb
Normal file
17
db/migrate/20190225031541_create_polls.rb
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
class CreatePolls < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
create_table :polls do |t|
|
||||||
|
t.belongs_to :account, foreign_key: { on_delete: :cascade }
|
||||||
|
t.belongs_to :status, foreign_key: { on_delete: :cascade }
|
||||||
|
t.datetime :expires_at
|
||||||
|
t.string :options, null: false, array: true, default: []
|
||||||
|
t.bigint :cached_tallies, null: false, array: true, default: []
|
||||||
|
t.boolean :multiple, null: false, default: false
|
||||||
|
t.boolean :hide_totals, null: false, default: false
|
||||||
|
t.bigint :votes_count, null: false, default: 0
|
||||||
|
t.datetime :last_fetched_at
|
||||||
|
|
||||||
|
t.timestamps
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
11
db/migrate/20190225031625_create_poll_votes.rb
Normal file
11
db/migrate/20190225031625_create_poll_votes.rb
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
class CreatePollVotes < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
create_table :poll_votes do |t|
|
||||||
|
t.belongs_to :account, foreign_key: { on_delete: :cascade }
|
||||||
|
t.belongs_to :poll, foreign_key: { on_delete: :cascade }
|
||||||
|
t.integer :choice, null: false, default: 0
|
||||||
|
|
||||||
|
t.timestamps
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
5
db/migrate/20190226003449_add_poll_id_to_statuses.rb
Normal file
5
db/migrate/20190226003449_add_poll_id_to_statuses.rb
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
class AddPollIdToStatuses < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
add_column :statuses, :poll_id, :bigint
|
||||||
|
end
|
||||||
|
end
|
5
db/migrate/20190304152020_add_uri_to_poll_votes.rb
Normal file
5
db/migrate/20190304152020_add_uri_to_poll_votes.rb
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
class AddUriToPollVotes < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
add_column :poll_votes, :uri, :string
|
||||||
|
end
|
||||||
|
end
|
34
db/schema.rb
34
db/schema.rb
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 2019_02_03_180359) do
|
ActiveRecord::Schema.define(version: 2019_03_04_152020) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
@ -452,6 +452,33 @@ ActiveRecord::Schema.define(version: 2019_02_03_180359) do
|
||||||
t.index ["database", "captured_at"], name: "index_pghero_space_stats_on_database_and_captured_at"
|
t.index ["database", "captured_at"], name: "index_pghero_space_stats_on_database_and_captured_at"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "poll_votes", force: :cascade do |t|
|
||||||
|
t.bigint "account_id"
|
||||||
|
t.bigint "poll_id"
|
||||||
|
t.integer "choice", default: 0, null: false
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
|
t.string "uri"
|
||||||
|
t.index ["account_id"], name: "index_poll_votes_on_account_id"
|
||||||
|
t.index ["poll_id"], name: "index_poll_votes_on_poll_id"
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "polls", force: :cascade do |t|
|
||||||
|
t.bigint "account_id"
|
||||||
|
t.bigint "status_id"
|
||||||
|
t.datetime "expires_at"
|
||||||
|
t.string "options", default: [], null: false, array: true
|
||||||
|
t.bigint "cached_tallies", default: [], null: false, array: true
|
||||||
|
t.boolean "multiple", default: false, null: false
|
||||||
|
t.boolean "hide_totals", default: false, null: false
|
||||||
|
t.bigint "votes_count", default: 0, null: false
|
||||||
|
t.datetime "last_fetched_at"
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
|
t.index ["account_id"], name: "index_polls_on_account_id"
|
||||||
|
t.index ["status_id"], name: "index_polls_on_status_id"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "preview_cards", force: :cascade do |t|
|
create_table "preview_cards", force: :cascade do |t|
|
||||||
t.string "url", default: "", null: false
|
t.string "url", default: "", null: false
|
||||||
t.string "title", default: "", null: false
|
t.string "title", default: "", null: false
|
||||||
|
@ -593,6 +620,7 @@ ActiveRecord::Schema.define(version: 2019_02_03_180359) do
|
||||||
t.bigint "application_id"
|
t.bigint "application_id"
|
||||||
t.bigint "in_reply_to_account_id"
|
t.bigint "in_reply_to_account_id"
|
||||||
t.boolean "local_only"
|
t.boolean "local_only"
|
||||||
|
t.bigint "poll_id"
|
||||||
t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
|
t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
|
||||||
t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
|
t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
|
||||||
t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
|
t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
|
||||||
|
@ -760,6 +788,10 @@ ActiveRecord::Schema.define(version: 2019_02_03_180359) do
|
||||||
add_foreign_key "oauth_access_tokens", "oauth_applications", column: "application_id", name: "fk_f5fc4c1ee3", on_delete: :cascade
|
add_foreign_key "oauth_access_tokens", "oauth_applications", column: "application_id", name: "fk_f5fc4c1ee3", on_delete: :cascade
|
||||||
add_foreign_key "oauth_access_tokens", "users", column: "resource_owner_id", name: "fk_e84df68546", on_delete: :cascade
|
add_foreign_key "oauth_access_tokens", "users", column: "resource_owner_id", name: "fk_e84df68546", on_delete: :cascade
|
||||||
add_foreign_key "oauth_applications", "users", column: "owner_id", name: "fk_b0988c7c0a", on_delete: :cascade
|
add_foreign_key "oauth_applications", "users", column: "owner_id", name: "fk_b0988c7c0a", on_delete: :cascade
|
||||||
|
add_foreign_key "poll_votes", "accounts", on_delete: :cascade
|
||||||
|
add_foreign_key "poll_votes", "polls", on_delete: :cascade
|
||||||
|
add_foreign_key "polls", "accounts", on_delete: :cascade
|
||||||
|
add_foreign_key "polls", "statuses", on_delete: :cascade
|
||||||
add_foreign_key "report_notes", "accounts", on_delete: :cascade
|
add_foreign_key "report_notes", "accounts", on_delete: :cascade
|
||||||
add_foreign_key "report_notes", "reports", on_delete: :cascade
|
add_foreign_key "report_notes", "reports", on_delete: :cascade
|
||||||
add_foreign_key "reports", "accounts", column: "action_taken_by_account_id", name: "fk_bca45b75fd", on_delete: :nullify
|
add_foreign_key "reports", "accounts", column: "action_taken_by_account_id", name: "fk_bca45b75fd", on_delete: :nullify
|
||||||
|
|
|
@ -13,7 +13,7 @@ module Mastodon
|
||||||
end
|
end
|
||||||
|
|
||||||
def patch
|
def patch
|
||||||
3
|
4
|
||||||
end
|
end
|
||||||
|
|
||||||
def pre
|
def pre
|
||||||
|
|
34
spec/controllers/api/v1/polls/votes_controller_spec.rb
Normal file
34
spec/controllers/api/v1/polls/votes_controller_spec.rb
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Api::V1::Polls::VotesController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
|
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||||
|
let(:scopes) { 'write:statuses' }
|
||||||
|
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
|
||||||
|
|
||||||
|
before { allow(controller).to receive(:doorkeeper_token) { token } }
|
||||||
|
|
||||||
|
describe 'POST #create' do
|
||||||
|
let(:poll) { Fabricate(:poll) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
post :create, params: { poll_id: poll.id, choices: %w(1) }
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
expect(response).to have_http_status(200)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates a vote' do
|
||||||
|
vote = poll.votes.where(account: user.account).first
|
||||||
|
|
||||||
|
expect(vote).to_not be_nil
|
||||||
|
expect(vote.choice).to eq 1
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'updates poll tallies' do
|
||||||
|
expect(poll.reload.cached_tallies).to eq [0, 1]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
23
spec/controllers/api/v1/polls_controller_spec.rb
Normal file
23
spec/controllers/api/v1/polls_controller_spec.rb
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Api::V1::PollsController, type: :controller do
|
||||||
|
render_views
|
||||||
|
|
||||||
|
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||||
|
let(:scopes) { 'read:statuses' }
|
||||||
|
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
|
||||||
|
|
||||||
|
before { allow(controller).to receive(:doorkeeper_token) { token } }
|
||||||
|
|
||||||
|
describe 'GET #show' do
|
||||||
|
let(:poll) { Fabricate(:poll) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
get :show, params: { id: poll.id }
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
expect(response).to have_http_status(200)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
8
spec/fabricators/poll_fabricator.rb
Normal file
8
spec/fabricators/poll_fabricator.rb
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
Fabricator(:poll) do
|
||||||
|
account
|
||||||
|
status
|
||||||
|
expires_at { 7.days.from_now }
|
||||||
|
options %w(Foo Bar)
|
||||||
|
multiple false
|
||||||
|
hide_totals false
|
||||||
|
end
|
5
spec/fabricators/poll_vote_fabricator.rb
Normal file
5
spec/fabricators/poll_vote_fabricator.rb
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
Fabricator(:poll_vote) do
|
||||||
|
account
|
||||||
|
poll
|
||||||
|
choice 0
|
||||||
|
end
|
|
@ -1,7 +1,7 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe ActivityPub::Activity::Create do
|
RSpec.describe ActivityPub::Activity::Create do
|
||||||
let(:sender) { Fabricate(:account, followers_url: 'http://example.com/followers') }
|
let(:sender) { Fabricate(:account, followers_url: 'http://example.com/followers', domain: 'example.com', uri: 'https://example.com/actor') }
|
||||||
|
|
||||||
let(:json) do
|
let(:json) do
|
||||||
{
|
{
|
||||||
|
@ -28,6 +28,20 @@ RSpec.describe ActivityPub::Activity::Create do
|
||||||
subject.perform
|
subject.perform
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'unknown object type' do
|
||||||
|
let(:object_json) do
|
||||||
|
{
|
||||||
|
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
|
||||||
|
type: 'Banana',
|
||||||
|
content: 'Lorem ipsum',
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not create a status' do
|
||||||
|
expect(sender.statuses.count).to be_zero
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context 'standalone' do
|
context 'standalone' do
|
||||||
let(:object_json) do
|
let(:object_json) do
|
||||||
{
|
{
|
||||||
|
@ -407,6 +421,67 @@ RSpec.describe ActivityPub::Activity::Create do
|
||||||
expect(status).to_not be_nil
|
expect(status).to_not be_nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'with poll' do
|
||||||
|
let(:object_json) do
|
||||||
|
{
|
||||||
|
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
|
||||||
|
type: 'Question',
|
||||||
|
content: 'Which color was the submarine?',
|
||||||
|
oneOf: [
|
||||||
|
{
|
||||||
|
name: 'Yellow',
|
||||||
|
replies: {
|
||||||
|
type: 'Collection',
|
||||||
|
totalItems: 10,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'Blue',
|
||||||
|
replies: {
|
||||||
|
type: 'Collection',
|
||||||
|
totalItems: 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates status' do
|
||||||
|
status = sender.statuses.first
|
||||||
|
expect(status).to_not be_nil
|
||||||
|
expect(status.poll).to_not be_nil
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates a poll' do
|
||||||
|
poll = sender.polls.first
|
||||||
|
expect(poll).to_not be_nil
|
||||||
|
expect(poll.status).to_not be_nil
|
||||||
|
expect(poll.options).to eq %w(Yellow Blue)
|
||||||
|
expect(poll.cached_tallies).to eq [10, 3]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when a vote to a local poll' do
|
||||||
|
let(:poll) { Fabricate(:poll, options: %w(Yellow Blue)) }
|
||||||
|
let!(:local_status) { Fabricate(:status, owned_poll: poll) }
|
||||||
|
|
||||||
|
let(:object_json) do
|
||||||
|
{
|
||||||
|
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
|
||||||
|
type: 'Note',
|
||||||
|
name: 'Yellow',
|
||||||
|
inReplyTo: ActivityPub::TagManager.instance.uri_for(local_status)
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'adds a vote to the poll with correct uri' do
|
||||||
|
vote = poll.votes.first
|
||||||
|
expect(vote).to_not be_nil
|
||||||
|
expect(vote.uri).to eq object_json[:id]
|
||||||
|
expect(poll.reload.cached_tallies).to eq [1, 0]
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when sender is followed by local users' do
|
context 'when sender is followed by local users' do
|
||||||
|
|
5
spec/models/poll_spec.rb
Normal file
5
spec/models/poll_spec.rb
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Poll, type: :model do
|
||||||
|
pending "add some examples to (or delete) #{__FILE__}"
|
||||||
|
end
|
5
spec/models/poll_vote_spec.rb
Normal file
5
spec/models/poll_vote_spec.rb
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe PollVote, type: :model do
|
||||||
|
pending "add some examples to (or delete) #{__FILE__}"
|
||||||
|
end
|
Loading…
Reference in a new issue