Merge pull request #2339 from ClearlyClaire/glitch-soc/merge-upstream
* Cleanup unused portions of statuses/status partial (#26045) * Wrong count in response when removing favourite/reblog (#24365) Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Paperclip: add support for Azure blob storage (#23607) * Fix a missing redirection on getting-started in multi column mode (#26070) * Fix haml-lint Rubocop `Style/NumericPredicate` cop (#26040) * Change casing for 'Server Settings' string (#26011) * Move localized subject mailer shared example to separate file (#25889) * Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (#26039) * Fix `Lint/Void` cop (#25922) * Add stricter protocol fields validation for accounts (#25937) * Improve the bug report templates (#25621) * Fix the crossorigin attribute (#26096) * Fix replica being used even if not explicitly defined (#26074) * Clean up unused application records (#24871) * Change thread view to scroll to the selected post rather than the post being replied to (#24685) * Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (#26023) * change focus ui for keyboard only input (#25935) * Use username as display name for suspended users or users with blank display names (#25276) * Fix CSP headers being unintendedly wide (#26105) * Fix linting issue (#26106) * Replace 'favourite' by 'favorite' for American English (#26009) * Override default Action Mailer `preview_path` (#26110) * Favourits -> Favorites (#26109) * Bump version to v4.1.5 (#26108) * Fix incorrect connect timeout in outgoing requests (#26116) * Fix missing translation strings for importing lists (#26120) * Use valid email address for first account (#26114) * Update haml-lint 0.49.1 (#26118) * Fix focus and hover styles in web UI (#26125) * Remove back button from bookmarks, favourites and lists screens in web UI (#26126) * Remove 16:9 cropping from web UI (#26132) * Change design of link previews in web UI (#26136) * change poll form element colors to fit with the rest of the ui (#26139) * Add `lang` attribute to trending links (#26111) * Update dependency rdf-normalize to v0.6.1 (#26130) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency brakeman to v6.0.1 (#26141) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency postcss to v8.4.27 (#26144) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix unexpected redirection to /explore after sign-in (#26143) * Update dependency aws-sdk-s3 to v1.131.0 (#26145) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add report.updated webhook (#24211) * Fix LinkCrawlWorker crashing on `null` `created_at` (#26151) * Fix UI Overlap with the loupe icon in the Explore Tab (#26113) * Fix missing border on error screen in light theme in web UI (#26152) * Fix missing action label on sensitive videos and embeds in web UI (#26135) * Fix `lang` for UI texts in link preview (#26149) * Add published date and author to news on the explore screen in web UI (#26155) * Coverage for `Auth::OmniauthCallbacks` controller (#26147) * fix poll input active style (#26162) * Add `published_at` attribute to preview cards (#26153) * Update dependency sass to v1.64.1 (#26146) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Revert poll colors to green outside of compose form (#26164) * Preserve translation on status re-import (#26168) * Fix missing GIF badge in account gallery (#26166) * Reformat large text arg in `FetchLinkCardService` spec (#26183) * Ignore long line in regex initializer (#26182) * Reformat large key values in service specs (#26181) * Reformat large hash in `ContextHelper` module (#26180) * Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration (#26178) * Extract private methods in `StatusCacheHydrator` (#26177) * New Crowdin Translations (automated) (#26072) Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Remove the `sr` locale override .rb files (#25927) * Use correct naming on controller concern specs (#26197) * Migrate to request specs in `/api/v2/filters` (#25721) * Fix wrong filters sometimes applying in streaming (#26159) * Refactor streaming's filtering logic & improve documentation (#26213) * Add role badges to the WebUI (#25649) * Change interaction modal in web UI (#26075) Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> * Fix crash when processing Flag activity with no status (#26189) * Storage: add :azure to remaining callers (#26080) * Remove queued_at value from pubsub payloads (#26173) * Fix emoji picker button scrolling with textarea content in single-column view (#25304) * Change the wording of the dismissable explore prompt (#25917) * Update dependency haml_lint to v0.49.2 (#26222) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228) * Swap debug statements in streaming server (#26231) * Fix missing return values in streaming (#26233) * [Glitch] Wrong count in response when removing favourite/reblog Portlocal4c18928a93
to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix a missing redirection on getting-started in multi column mode Port586b1c9dca
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Change thread view to scroll to the selected post rather than the post being replied to Porte4ea80d808
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Replace 'favourite' by 'favorite' for American English Port217ef7f2af
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] change poll form element colors to fit with the rest of the ui Port80809ef33e
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Add `lang` attribute to trending links Port76fce34ebb
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix UI Overlap with the loupe icon in the Explore Tab Port9a567ec1d1
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix missing border on error screen in light theme in web UI Portd1a9f601c7
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix missing action label on sensitive videos and embeds in web UI Port714a20697f
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] fix poll input active style Port49d2e8979f
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Revert poll colors to green outside of compose form Portce1f35d7e2
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Add published date and author to news on the explore screen in web UI Portf826a95f6e
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Preserve translation on status re-import Port6781dc6462
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix missing GIF badge in account gallery Porta4b69bec2e
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * Fix interaction modal being broken because of glitch-soc's theming system * [Glitch] Change interaction modal in web UI Portb4e739ff0f
to glitch-soc Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Change the wording of the dismissable explore prompt Porta4ec187a20
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * Fix CSP tests in glitch-soc --------- Signed-off-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Matt Jankowski <matt@jankowski.online> Co-authored-by: Christian Schmidt <github@chsc.dk> Co-authored-by: Misty De Méo <mistydemeo@gmail.com> Co-authored-by: Stanislas Signoud <signez@stanisoft.net> Co-authored-by: gunchleoc <fios@foramnagaidhlig.net> Co-authored-by: Renaud Chaput <renchap@gmail.com> Co-authored-by: Trevor Wolf <teeerevor@gmail.com> Co-authored-by: наб <nabijaczleweli@nabijaczleweli.xyz> Co-authored-by: mogaminsk <mgmnjp@icloud.com> Co-authored-by: Nick Schonning <nschonni@gmail.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vyr Cossont <VyrCossont@users.noreply.github.com> Co-authored-by: gol-cha <info@mevo.xyz> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com> Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
commit
e96a90480b
556 changed files with 7130 additions and 4787 deletions
@ -1,56 +0,0 @@ |
||||
name: Bug Report |
||||
description: If something isn't working as expected |
||||
labels: [bug] |
||||
body: |
||||
- type: markdown |
||||
attributes: |
||||
value: | |
||||
Make sure that you are submitting a new bug that was not previously reported or already fixed. |
||||
|
||||
Please use a concise and distinct title for the issue. |
||||
- type: textarea |
||||
attributes: |
||||
label: Steps to reproduce the problem |
||||
description: What were you trying to do? |
||||
value: | |
||||
1. |
||||
2. |
||||
3. |
||||
... |
||||
validations: |
||||
required: true |
||||
- type: input |
||||
attributes: |
||||
label: Expected behaviour |
||||
description: What should have happened? |
||||
validations: |
||||
required: true |
||||
- type: input |
||||
attributes: |
||||
label: Actual behaviour |
||||
description: What happened? |
||||
validations: |
||||
required: true |
||||
- type: textarea |
||||
attributes: |
||||
label: Detailed description |
||||
validations: |
||||
required: false |
||||
- type: textarea |
||||
attributes: |
||||
label: Specifications |
||||
description: | |
||||
What version or commit hash of Mastodon did you find this bug in? |
||||
|
||||
If a front-end issue, what browser and operating systems were you using? |
||||
placeholder: | |
||||
Mastodon 3.5.3 (or Edge) |
||||
Ruby 2.7.6 (or v3.1.2) |
||||
Node.js 16.18.0 |
||||
|
||||
Google Chrome 106.0.5249.119 |
||||
Firefox 105.0.3 |
||||
|
||||
etc... |
||||
validations: |
||||
required: true |
@ -0,0 +1,76 @@ |
||||
name: Bug Report (Web Interface) |
||||
description: If you are using Mastodon's web interface and something is not working as expected |
||||
labels: [bug, 'status/to triage', 'area/web interface'] |
||||
body: |
||||
- type: markdown |
||||
attributes: |
||||
value: | |
||||
Make sure that you are submitting a new bug that was not previously reported or already fixed. |
||||
|
||||
Please use a concise and distinct title for the issue. |
||||
- type: textarea |
||||
attributes: |
||||
label: Steps to reproduce the problem |
||||
description: What were you trying to do? |
||||
value: | |
||||
1. |
||||
2. |
||||
3. |
||||
... |
||||
validations: |
||||
required: true |
||||
- type: input |
||||
attributes: |
||||
label: Expected behaviour |
||||
description: What should have happened? |
||||
validations: |
||||
required: true |
||||
- type: input |
||||
attributes: |
||||
label: Actual behaviour |
||||
description: What happened? |
||||
validations: |
||||
required: true |
||||
- type: textarea |
||||
attributes: |
||||
label: Detailed description |
||||
validations: |
||||
required: false |
||||
- type: input |
||||
attributes: |
||||
label: Mastodon instance |
||||
description: The address of the Mastodon instance where you experienced the issue |
||||
placeholder: mastodon.social |
||||
validations: |
||||
required: true |
||||
- type: input |
||||
attributes: |
||||
label: Mastodon version |
||||
description: | |
||||
This is displayed at the bottom of the About page, eg. `v4.1.2+nightly-20230627` |
||||
placeholder: v4.1.2 |
||||
validations: |
||||
required: true |
||||
- type: input |
||||
attributes: |
||||
label: Browser name and version |
||||
description: | |
||||
What browser are you using when getting this bug? Please specify the version as well. |
||||
placeholder: Firefox 105.0.3 |
||||
validations: |
||||
required: true |
||||
- type: input |
||||
attributes: |
||||
label: Operating system |
||||
description: | |
||||
What OS are you running? Please specify the version as well. |
||||
placeholder: macOS 13.4.1 |
||||
validations: |
||||
required: true |
||||
- type: textarea |
||||
attributes: |
||||
label: Technical details |
||||
description: | |
||||
Any additional technical details you may have. This can include the full error log, inspector's output… |
||||
validations: |
||||
required: false |
@ -0,0 +1,65 @@ |
||||
name: Bug Report (server / API) |
||||
description: | |
||||
If something is not working as expected, but is not from using the web interface. |
||||
labels: [bug, 'status/to triage'] |
||||
body: |
||||
- type: markdown |
||||
attributes: |
||||
value: | |
||||
Make sure that you are submitting a new bug that was not previously reported or already fixed. |
||||
|
||||
Please use a concise and distinct title for the issue. |
||||
- type: textarea |
||||
attributes: |
||||
label: Steps to reproduce the problem |
||||
description: What were you trying to do? |
||||
value: | |
||||
1. |
||||
2. |
||||
3. |
||||
... |
||||
validations: |
||||
required: true |
||||
- type: input |
||||
attributes: |
||||
label: Expected behaviour |
||||
description: What should have happened? |
||||
validations: |
||||
required: true |
||||
- type: input |
||||
attributes: |
||||
label: Actual behaviour |
||||
description: What happened? |
||||
validations: |
||||
required: true |
||||
- type: textarea |
||||
attributes: |
||||
label: Detailed description |
||||
validations: |
||||
required: false |
||||
- type: input |
||||
attributes: |
||||
label: Mastodon instance |
||||
description: The address of the Mastodon instance where you experienced the issue |
||||
placeholder: mastodon.social |
||||
validations: |
||||
required: false |
||||
- type: input |
||||
attributes: |
||||
label: Mastodon version |
||||
description: | |
||||
This is displayed at the bottom of the About page, eg. `v4.1.2+nightly-20230627` |
||||
placeholder: v4.1.2 |
||||
validations: |
||||
required: false |
||||
- type: textarea |
||||
attributes: |
||||
label: Technical details |
||||
description: | |
||||
Any additional technical details you may have, like logs or error traces |
||||
value: | |
||||
If this is happening on your own Mastodon server, please fill out those: |
||||
- Ruby version: (from `ruby --version`, eg. v3.1.2) |
||||
- Node.js version: (from `node --version`, eg. v18.16.0) |
||||
validations: |
||||
required: false |
@ -0,0 +1,12 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class InstancesIndex < Chewy::Index |
||||
settings index: { refresh_interval: '30s' } |
||||
|
||||
index_scope ::Instance.searchable |
||||
|
||||
root date_detection: false do |
||||
field :domain, type: 'text', index_prefixes: { min_chars: 1 } |
||||
field :accounts_count, type: 'long' |
||||
end |
||||
end |
@ -0,0 +1,45 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Api::V1::Peers::SearchController < Api::BaseController |
||||
before_action :require_enabled_api! |
||||
before_action :set_domains |
||||
|
||||
skip_before_action :require_authenticated_user!, unless: :whitelist_mode? |
||||
skip_around_action :set_locale |
||||
|
||||
vary_by '' |
||||
|
||||
def index |
||||
cache_even_if_authenticated! |
||||
render json: @domains |
||||
end |
||||
|
||||
private |
||||
|
||||
def require_enabled_api! |
||||
head 404 unless Setting.peers_api_enabled && !whitelist_mode? |
||||
end |
||||
|
||||
def set_domains |
||||
return if params[:q].blank? |
||||
|
||||
if Chewy.enabled? |
||||
@domains = InstancesIndex.query(function_score: { |
||||
query: { |
||||
prefix: { |
||||
domain: params[:q], |
||||
}, |
||||
}, |
||||
|
||||
field_value_factor: { |
||||
field: 'accounts_count', |
||||
modifier: 'log2p', |
||||
}, |
||||
}).limit(10).pluck(:domain) |
||||
else |
||||
domain = params[:q].strip |
||||
domain = TagManager.instance.normalize_domain(domain) |
||||
@domains = Instance.searchable.where(Instance.arel_table[:domain].matches("#{Instance.sanitize_sql_like(domain)}%", false, true)).limit(10).pluck(:domain) |
||||
end |
||||
end |
||||
end |
@ -0,0 +1,43 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class RemoteInteractionHelperController < ApplicationController |
||||
vary_by '' |
||||
|
||||
skip_before_action :require_functional! |
||||
skip_around_action :set_locale |
||||
skip_before_action :update_user_sign_in |
||||
|
||||
content_security_policy do |p| |
||||
# We inherit the normal `script-src` |
||||
|
||||
# Set every directive that does not have a fallback |
||||
p.default_src :none |
||||
p.form_action :none |
||||
p.base_uri :none |
||||
|
||||
# Disable every directive with a fallback to cut on response size |
||||
p.base_uri false |
||||
p.font_src false |
||||
p.img_src false |
||||
p.style_src false |
||||
p.media_src false |
||||
p.frame_src false |
||||
p.manifest_src false |
||||
p.connect_src false |
||||
p.child_src false |
||||
p.worker_src false |
||||
|
||||
# Widen the directives that we do need |
||||
p.frame_ancestors :self |
||||
p.connect_src :https |
||||
end |
||||
|
||||
def index |
||||
expires_in(5.minutes, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.day) |
||||
|
||||
response.headers['X-Frame-Options'] = 'SAMEORIGIN' |
||||
response.headers['Referrer-Policy'] = 'no-referrer' |
||||
|
||||
render layout: 'helper_frame' |
||||
end |
||||
end |
@ -0,0 +1,172 @@ |
||||
/* |
||||
|
||||
This script is meant to to be used in an `iframe` with the sole purpose of doing webfinger queries |
||||
client-side without being restricted by a strict `connect-src` Content-Security-Policy directive. |
||||
|
||||
It communicates with the parent window through message events that are authenticated by origin, |
||||
and performs no other task. |
||||
|
||||
*/ |
||||
|
||||
import 'packs/public-path'; |
||||
|
||||
import axios from 'axios'; |
||||
|
||||
interface JRDLink { |
||||
rel: string; |
||||
template?: string; |
||||
href?: string; |
||||
} |
||||
|
||||
const isJRDLink = (link: unknown): link is JRDLink => |
||||
typeof link === 'object' && |
||||
link !== null && |
||||
'rel' in link && |
||||
typeof link.rel === 'string' && |
||||
(!('template' in link) || typeof link.template === 'string') && |
||||
(!('href' in link) || typeof link.href === 'string'); |
||||
|
||||
const findLink = (rel: string, data: unknown): JRDLink | undefined => { |
||||
if ( |
||||
typeof data === 'object' && |
||||
data !== null && |
||||
'links' in data && |
||||
data.links instanceof Array |
||||
) { |
||||
return data.links.find( |
||||
(link): link is JRDLink => isJRDLink(link) && link.rel === rel, |
||||
); |
||||
} else { |
||||
return undefined; |
||||
} |
||||
}; |
||||
|
||||
const findTemplateLink = (data: unknown) => |
||||
findLink('http://ostatus.org/schema/1.0/subscribe', data)?.template; |
||||
|
||||
const fetchInteractionURLSuccess = ( |
||||
uri_or_domain: string, |
||||
template: string, |
||||
) => { |
||||
window.parent.postMessage( |
||||
{ |
||||
type: 'fetchInteractionURL-success', |
||||
uri_or_domain, |
||||
template, |
||||
}, |
||||
window.origin, |
||||
); |
||||
}; |
||||
|
||||
const fetchInteractionURLFailure = () => { |
||||
window.parent.postMessage( |
||||
{ |
||||
type: 'fetchInteractionURL-failure', |
||||
}, |
||||
window.origin, |
||||
); |
||||
}; |
||||
|
||||
const isValidDomain = (value: string) => { |
||||
const url = new URL('https:///path'); |
||||
url.hostname = value; |
||||
return url.hostname === value; |
||||
}; |
||||
|
||||
// Attempt to find a remote interaction URL from a domain
|
||||
const fromDomain = (domain: string) => { |
||||
const fallbackTemplate = `https://${domain}/authorize_interaction?uri={uri}`; |
||||
|
||||
axios |
||||
.get(`https://${domain}/.well-known/webfinger`, { |
||||
params: { resource: `https://${domain}` }, |
||||
}) |
||||
.then(({ data }) => { |
||||
const template = findTemplateLink(data); |
||||
fetchInteractionURLSuccess(domain, template ?? fallbackTemplate); |
||||
return; |
||||
}) |
||||
.catch(() => { |
||||
fetchInteractionURLSuccess(domain, fallbackTemplate); |
||||
}); |
||||
}; |
||||
|
||||
// Attempt to find a remote interaction URL from an arbitrary URL
|
||||
const fromURL = (url: string) => { |
||||
const domain = new URL(url).host; |
||||
const fallbackTemplate = `https://${domain}/authorize_interaction?uri={uri}`; |
||||
|
||||
axios |
||||
.get(`https://${domain}/.well-known/webfinger`, { |
||||
params: { resource: url }, |
||||
}) |
||||
.then(({ data }) => { |
||||
const template = findTemplateLink(data); |
||||
fetchInteractionURLSuccess(url, template ?? fallbackTemplate); |
||||
return; |
||||
}) |
||||
.catch(() => { |
||||
fromDomain(domain); |
||||
}); |
||||
}; |
||||
|
||||
// Attempt to find a remote interaction URL from a `user@domain` string
|
||||
const fromAcct = (acct: string) => { |
||||
acct = acct.replace(/^@/, ''); |
||||
|
||||
const segments = acct.split('@'); |
||||
|
||||
if (segments.length !== 2 || !segments[0] || !isValidDomain(segments[1])) { |
||||
fetchInteractionURLFailure(); |
||||
return; |
||||
} |
||||
|
||||
const domain = segments[1]; |
||||
const fallbackTemplate = `https://${domain}/authorize_interaction?uri={uri}`; |
||||
|
||||
axios |
||||
.get(`https://${domain}/.well-known/webfinger`, { |
||||
params: { resource: `acct:${acct}` }, |
||||
}) |
||||
.then(({ data }) => { |
||||
const template = findTemplateLink(data); |
||||
fetchInteractionURLSuccess(acct, template ?? fallbackTemplate); |
||||
return; |
||||
}) |
||||
.catch(() => { |
||||
// TODO: handle host-meta?
|
||||
fromDomain(domain); |
||||
}); |
||||
}; |
||||
|
||||
const fetchInteractionURL = (uri_or_domain: string) => { |
||||
if (/^https?:\/\//.test(uri_or_domain)) { |
||||
fromURL(uri_or_domain); |
||||
} else if (uri_or_domain.includes('@')) { |
||||
fromAcct(uri_or_domain); |
||||
} else { |
||||
fromDomain(uri_or_domain); |
||||
} |
||||
}; |
||||
|
||||
window.addEventListener('message', (event: MessageEvent<unknown>) => { |
||||
// Check message origin
|
||||
if ( |
||||
!window.origin || |
||||
window.parent !== event.source || |
||||
event.origin !== window.origin |
||||
) { |
||||
return; |
||||
} |
||||
|
||||
if ( |
||||
event.data && |
||||
typeof event.data === 'object' && |
||||
'type' in event.data && |
||||
event.data.type === 'fetchInteractionURL' && |
||||
'uri_or_domain' in event.data && |
||||
typeof event.data.uri_or_domain === 'string' |
||||
) { |
||||
fetchInteractionURL(event.data.uri_or_domain); |
||||
} |
||||
}); |
@ -0,0 +1,303 @@ |
||||
import { defineMessages, injectIntl } from 'react-intl'; |
||||
|
||||
import { connect } from 'react-redux'; |
||||
|
||||
import { initBlockModal } from 'flavours/glitch/actions/blocks'; |
||||
import { initBoostModal } from 'flavours/glitch/actions/boosts'; |
||||
import { |
||||
replyCompose, |
||||
mentionCompose, |
||||
directCompose, |
||||
} from 'flavours/glitch/actions/compose'; |
||||
import { |
||||
initAddFilter, |
||||
} from 'flavours/glitch/actions/filters'; |
||||
import { |
||||
reblog, |
||||
favourite, |
||||
bookmark, |
||||
unreblog, |
||||
unfavourite, |
||||
unbookmark, |
||||
pin, |
||||
unpin, |
||||
} from 'flavours/glitch/actions/interactions'; |
||||
import { changeLocalSetting } from 'flavours/glitch/actions/local_settings'; |
||||
import { openModal } from 'flavours/glitch/actions/modal'; |
||||
import { initMuteModal } from 'flavours/glitch/actions/mutes'; |
||||
import { deployPictureInPicture } from 'flavours/glitch/actions/picture_in_picture'; |
||||
import { initReport } from 'flavours/glitch/actions/reports'; |
||||
import { |
||||
muteStatus, |
||||
unmuteStatus, |
||||
deleteStatus, |
||||
hideStatus, |
||||
revealStatus, |
||||
editStatus, |
||||
translateStatus, |
||||
undoStatusTranslation, |
||||
} from 'flavours/glitch/actions/statuses'; |
||||
import Status from 'flavours/glitch/components/status'; |
||||
import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state'; |
||||
import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors'; |
||||
|
||||
import { showAlertForError } from '../actions/alerts'; |
||||
|
||||
const messages = defineMessages({ |
||||
deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, |
||||
deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' }, |
||||
redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' }, |
||||
redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' }, |
||||
replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' }, |
||||
replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' }, |
||||
editConfirm: { id: 'confirmations.edit.confirm', defaultMessage: 'Edit' }, |
||||
editMessage: { id: 'confirmations.edit.message', defaultMessage: 'Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?' }, |
||||
unfilterConfirm: { id: 'confirmations.unfilter.confirm', defaultMessage: 'Show' }, |
||||
author: { id: 'confirmations.unfilter.author', defaultMessage: 'Author' }, |
||||
matchingFilters: { id: 'confirmations.unfilter.filters', defaultMessage: 'Matching {count, plural, one {filter} other {filters}}' }, |
||||
editFilter: { id: 'confirmations.unfilter.edit_filter', defaultMessage: 'Edit filter' }, |
||||
}); |
||||
|
||||
const makeMapStateToProps = () => { |
||||
const getStatus = makeGetStatus(); |
||||
const getPictureInPicture = makeGetPictureInPicture(); |
||||
|
||||
const mapStateToProps = (state, props) => { |
||||
|
||||
let status = getStatus(state, props); |
||||
let reblogStatus = status ? status.get('reblog', null) : null; |
||||
let account = undefined; |
||||
let prepend = undefined; |
||||
|
||||
if (props.featured && status) { |
||||
account = status.get('account'); |
||||
prepend = 'featured'; |
||||
} else if (reblogStatus !== null && typeof reblogStatus === 'object') { |
||||
account = status.get('account'); |
||||
status = reblogStatus; |
||||
prepend = 'reblogged_by'; |
||||
} |
||||
|
||||
return { |
||||
containerId: props.containerId || props.id, // Should match reblogStatus's id for reblogs
|
||||
status: status, |
||||
nextInReplyToId: props.nextId ? state.getIn(['statuses', props.nextId, 'in_reply_to_id']) : null, |
||||
account: account || props.account, |
||||
settings: state.get('local_settings'), |
||||
prepend: prepend || props.prepend, |
||||
pictureInPicture: getPictureInPicture(state, props), |
||||
}; |
||||
}; |
||||
|
||||
return mapStateToProps; |
||||
}; |
||||
|
||||
const mapDispatchToProps = (dispatch, { intl, contextType }) => ({ |
||||
|
||||
onReply (status, router) { |
||||
dispatch((_, getState) => { |
||||
let state = getState(); |
||||
|
||||
if (state.getIn(['local_settings', 'confirm_before_clearing_draft']) && state.getIn(['compose', 'text']).trim().length !== 0) { |
||||
dispatch(openModal({ |
||||
modalType: 'CONFIRM', |
||||
modalProps: { |
||||
message: intl.formatMessage(messages.replyMessage), |
||||
confirm: intl.formatMessage(messages.replyConfirm), |
||||
onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)), |
||||
onConfirm: () => dispatch(replyCompose(status, router)), |
||||
}, |
||||
})); |
||||
} else { |
||||
dispatch(replyCompose(status, router)); |
||||
} |
||||
}); |
||||
}, |
||||
|
||||
onModalReblog (status, privacy) { |
||||
if (status.get('reblogged')) { |
||||
dispatch(unreblog(status)); |
||||
} else { |
||||
dispatch(reblog(status, privacy)); |
||||
} |
||||
}, |
||||
|
||||
onReblog (status, e) { |
||||
dispatch((_, getState) => { |
||||
let state = getState(); |
||||
if (state.getIn(['local_settings', 'confirm_boost_missing_media_description']) && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) { |
||||
dispatch(initBoostModal({ status, onReblog: this.onModalReblog, missingMediaDescription: true })); |
||||
} else if (e.shiftKey || !boostModal) { |
||||
this.onModalReblog(status); |
||||
} else { |
||||
dispatch(initBoostModal({ status, onReblog: this.onModalReblog })); |
||||
} |
||||
}); |
||||
}, |
||||
|
||||
onBookmark (status) { |
||||
if (status.get('bookmarked')) { |
||||
dispatch(unbookmark(status)); |
||||
} else { |
||||
dispatch(bookmark(status)); |
||||
} |
||||
}, |
||||
|
||||
onModalFavourite (status) { |
||||
dispatch(favourite(status)); |
||||
}, |
||||
|
||||
onFavourite (status, e) { |
||||
if (status.get('favourited')) { |
||||
dispatch(unfavourite(status)); |
||||
} else { |
||||
if (e.shiftKey || !favouriteModal) { |
||||
this.onModalFavourite(status); |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'FAVOURITE', |
||||
modalProps: { |
||||
status, |
||||
onFavourite: this.onModalFavourite, |
||||
}, |
||||
})); |
||||
} |
||||
} |
||||
}, |
||||
|
||||
onPin (status) { |
||||
if (status.get('pinned')) { |
||||
dispatch(unpin(status)); |
||||
} else { |
||||
dispatch(pin(status)); |
||||
} |
||||
}, |
||||
|
||||
onEmbed (status) { |
||||
dispatch(openModal({ |
||||
modalType: 'EMBED', |
||||
modalProps: { |
||||
id: status.get('id'), |
||||
onError: error => dispatch(showAlertForError(error)), |
||||
}, |
||||
})); |
||||
}, |
||||
|
||||
onDelete (status, history, withRedraft = false) { |
||||
if (!deleteModal) { |
||||
dispatch(deleteStatus(status.get('id'), history, withRedraft)); |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'CONFIRM', |
||||
modalProps: { |
||||
message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage), |
||||
confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm), |
||||
onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)), |
||||
}, |
||||
})); |
||||
} |
||||
}, |
||||
|
||||
onEdit (status, history) { |
||||
dispatch((_, getState) => { |
||||
let state = getState(); |
||||
if (state.getIn(['compose', 'text']).trim().length !== 0) { |
||||
dispatch(openModal({ |
||||
modalType: 'CONFIRM', |
||||
modalProps: { |
||||
message: intl.formatMessage(messages.editMessage), |
||||
confirm: intl.formatMessage(messages.editConfirm), |
||||
onConfirm: () => dispatch(editStatus(status.get('id'), history)), |
||||
}, |
||||
})); |
||||
} else { |
||||
dispatch(editStatus(status.get('id'), history)); |
||||
} |
||||
}); |
||||
}, |
||||
|
||||
onTranslate (status) { |
||||
if (status.get('translation')) { |
||||
dispatch(undoStatusTranslation(status.get('id'), status.get('poll'))); |
||||
} else { |
||||
dispatch(translateStatus(status.get('id'))); |
||||
} |
||||
}, |
||||
|
||||
onDirect (account, router) { |
||||
dispatch(directCompose(account, router)); |
||||
}, |
||||
|
||||
onMention (account, router) { |
||||
dispatch(mentionCompose(account, router)); |
||||
}, |
||||
|
||||
onOpenMedia (statusId, media, index, lang) { |
||||
dispatch(openModal({ |
||||
modalType: 'MEDIA', |
||||
modalProps: { statusId, media, index, lang }, |
||||
})); |
||||
}, |
||||
|
||||
onOpenVideo (statusId, media, lang, options) { |
||||
dispatch(openModal({ |
||||
modalType: 'VIDEO', |
||||
modalProps: { statusId, media, lang, options }, |
||||
})); |
||||
}, |
||||
|
||||
onBlock (status) { |
||||
const account = status.get('account'); |
||||
dispatch(initBlockModal(account)); |
||||
}, |
||||
|
||||
onReport (status) { |
||||
dispatch(initReport(status.get('account'), status)); |
||||
}, |
||||
|
||||
onAddFilter (status) { |
||||
dispatch(initAddFilter(status, { contextType })); |
||||
}, |
||||
|
||||
onMute (account) { |
||||
dispatch(initMuteModal(account)); |
||||
}, |
||||
|
||||
onMuteConversation (status) { |
||||
if (status.get('muted')) { |
||||
dispatch(unmuteStatus(status.get('id'))); |
||||
} else { |
||||
dispatch(muteStatus(status.get('id'))); |
||||
} |
||||
}, |
||||
|
||||
onToggleHidden (status) { |
||||
if (status.get('hidden')) { |
||||
dispatch(revealStatus(status.get('id'))); |
||||
} else { |
||||
dispatch(hideStatus(status.get('id'))); |
||||
} |
||||
}, |
||||
|
||||
deployPictureInPicture (status, type, mediaProps) { |
||||
dispatch((_, getState) => { |
||||
if (getState().getIn(['local_settings', 'media', 'pop_in_player'])) { |
||||
dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps)); |
||||
} |
||||
}); |
||||
}, |
||||
|
||||
onInteractionModal (type, status) { |
||||
dispatch(openModal({ |
||||
modalType: 'INTERACTION', |
||||
modalProps: { |
||||
type, |
||||
accountId: status.getIn(['account', 'id']), |
||||
url: status.get('url'), |
||||
}, |
||||
})); |
||||
}, |
||||
|
||||
}); |
||||
|
||||
export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status)); |
@ -0,0 +1,232 @@ |
||||
import PropTypes from 'prop-types'; |
||||
|
||||
import { defineMessages, injectIntl } from 'react-intl'; |
||||
|
||||
import classNames from 'classnames'; |
||||
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
||||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
||||
import { connect } from 'react-redux'; |
||||
|
||||
import { initBoostModal } from 'flavours/glitch/actions/boosts'; |
||||
import { replyCompose } from 'flavours/glitch/actions/compose'; |
||||
import { reblog, favourite, unreblog, unfavourite } from 'flavours/glitch/actions/interactions'; |
||||
import { openModal } from 'flavours/glitch/actions/modal'; |
||||
import { IconButton } from 'flavours/glitch/components/icon_button'; |
||||
import { me, boostModal } from 'flavours/glitch/initial_state'; |
||||
import { makeGetStatus } from 'flavours/glitch/selectors'; |
||||
|
||||
const messages = defineMessages({ |
||||
reply: { id: 'status.reply', defaultMessage: 'Reply' }, |
||||
replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' }, |
||||
reblog: { id: 'status.reblog', defaultMessage: 'Boost' }, |
||||
reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' }, |
||||
cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' }, |
||||
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' }, |
||||
favourite: { id: 'status.favourite', defaultMessage: 'Favorite' }, |
||||
replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' }, |
||||
replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' }, |
||||
open: { id: 'status.open', defaultMessage: 'Expand this status' }, |
||||
}); |
||||
|
||||
const makeMapStateToProps = () => { |
||||
const getStatus = makeGetStatus(); |
||||
|
||||
const mapStateToProps = (state, { statusId }) => ({ |
||||
status: getStatus(state, { id: statusId }), |
||||
askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0, |
||||
showReplyCount: state.getIn(['local_settings', 'show_reply_count']), |
||||
}); |
||||
|
||||
return mapStateToProps; |
||||
}; |
||||
|
||||
class Footer extends ImmutablePureComponent { |
||||
|
||||
static contextTypes = { |
||||
router: PropTypes.object, |
||||
identity: PropTypes.object, |
||||
}; |
||||
|
||||
static propTypes = { |
||||
statusId: PropTypes.string.isRequired, |
||||
status: ImmutablePropTypes.map.isRequired, |
||||
intl: PropTypes.object.isRequired, |
||||
dispatch: PropTypes.func.isRequired, |
||||
askReplyConfirmation: PropTypes.bool, |
||||
showReplyCount: PropTypes.bool, |
||||
withOpenButton: PropTypes.bool, |
||||
onClose: PropTypes.func, |
||||
}; |
||||
|
||||
_performReply = () => { |
||||
const { dispatch, status, onClose } = this.props; |
||||
const { router } = this.context; |
||||
|
||||
if (onClose) { |
||||
onClose(true); |
||||
} |
||||
|
||||
dispatch(replyCompose(status, router.history)); |
||||
}; |
||||
|
||||
handleReplyClick = () => { |
||||
const { dispatch, askReplyConfirmation, status, intl } = this.props; |
||||
const { signedIn } = this.context.identity; |
||||
|
||||
if (signedIn) { |
||||
if (askReplyConfirmation) { |
||||
dispatch(openModal({ |
||||
modalType: 'CONFIRM', |
||||
modalProps: { |
||||
message: intl.formatMessage(messages.replyMessage), |
||||
confirm: intl.formatMessage(messages.replyConfirm), |
||||
onConfirm: this._performReply, |
||||
}, |
||||
})); |
||||
} else { |
||||
this._performReply(); |
||||
} |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'INTERACTION', |
||||
modalProps: { |
||||
type: 'reply', |
||||
accountId: status.getIn(['account', 'id']), |
||||
url: status.get('url'), |
||||
}, |
||||
})); |
||||
} |
||||
}; |
||||
|
||||
handleFavouriteClick = () => { |
||||
const { dispatch, status } = this.props; |
||||
const { signedIn } = this.context.identity; |
||||
|
||||
if (signedIn) { |
||||
if (status.get('favourited')) { |
||||
dispatch(unfavourite(status)); |
||||
} else { |
||||
dispatch(favourite(status)); |
||||
} |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'INTERACTION', |
||||
modalProps: { |
||||
type: 'favourite', |
||||
accountId: status.getIn(['account', 'id']), |
||||
url: status.get('url'), |
||||
}, |
||||
})); |
||||
} |
||||
}; |
||||
|
||||
_performReblog = (privacy) => { |
||||
const { dispatch, status } = this.props; |
||||
dispatch(reblog(status, privacy)); |
||||
}; |
||||
|
||||
handleReblogClick = e => { |
||||
const { dispatch, status } = this.props; |
||||
const { signedIn } = this.context.identity; |
||||
|
||||
if (signedIn) { |
||||
if (status.get('reblogged')) { |
||||
dispatch(unreblog(status)); |
||||
} else if ((e && e.shiftKey) || !boostModal) { |
||||
this._performReblog(); |
||||
} else { |
||||
dispatch(initBoostModal({ status, onReblog: this._performReblog })); |
||||
} |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'INTERACTION', |
||||
modalProps: { |
||||
type: 'reblog', |
||||
accountId: status.getIn(['account', 'id']), |
||||
url: status.get('url'), |
||||
}, |
||||
})); |
||||
} |
||||
}; |
||||
|
||||
handleOpenClick = e => { |
||||
const { router } = this.context; |
||||
|
||||
if (e.button !== 0 || !router) { |
||||
return; |
||||
} |
||||
|
||||
const { status, onClose } = this.props; |
||||
|
||||
if (onClose) { |
||||
onClose(); |
||||
} |
||||
|
||||
router.history.push(`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`); |
||||
}; |
||||
|
||||
render () { |
||||
const { status, intl, showReplyCount, withOpenButton } = this.props; |
||||
|
||||
const publicStatus = ['public', 'unlisted'].includes(status.get('visibility')); |
||||
const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private'; |
||||
|
||||
let replyIcon, replyTitle; |
||||
|
||||
if (status.get('in_reply_to_id', null) === null) { |
||||
replyIcon = 'reply'; |
||||
replyTitle = intl.formatMessage(messages.reply); |
||||
} else { |
||||
replyIcon = 'reply-all'; |
||||
replyTitle = intl.formatMessage(messages.replyAll); |
||||
} |
||||
|
||||
let reblogTitle = ''; |
||||
|
||||
if (status.get('reblogged')) { |
||||
reblogTitle = intl.formatMessage(messages.cancel_reblog_private); |
||||
} else if (publicStatus) { |
||||
reblogTitle = intl.formatMessage(messages.reblog); |
||||
} else if (reblogPrivate) { |
||||
reblogTitle = intl.formatMessage(messages.reblog_private); |
||||
} else { |
||||
reblogTitle = intl.formatMessage(messages.cannot_reblog); |
||||
} |
||||
|
||||
let replyButton = null; |
||||
if (showReplyCount) { |
||||
replyButton = ( |
||||
<IconButton |
||||
className='status__action-bar-button' |
||||
title={replyTitle} |
||||
icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} |
||||
onClick={this.handleReplyClick} |
||||
counter={status.get('replies_count')} |
||||
obfuscateCount |
||||
/> |
||||
); |
||||
} else { |
||||
replyButton = ( |
||||
<IconButton |
||||
className='status__action-bar-button' |
||||
title={replyTitle} |
||||
icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} |
||||
onClick={this.handleReplyClick} |
||||
/> |
||||
); |
||||
} |
||||
|
||||
return ( |
||||
<div className='picture-in-picture__footer'> |
||||
{replyButton} |
||||
<IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} /> |
||||
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} /> |
||||
{withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} href={status.get('url')} />} |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
} |
||||
|
||||
export default connect(makeMapStateToProps)(injectIntl(Footer)); |
@ -0,0 +1,761 @@ |
||||
import PropTypes from 'prop-types'; |
||||
|
||||
import { defineMessages, injectIntl } from 'react-intl'; |
||||
|
||||
import classNames from 'classnames'; |
||||
import { Helmet } from 'react-helmet'; |
||||
|
||||
import Immutable from 'immutable'; |
||||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
||||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
||||
import { connect } from 'react-redux'; |
||||
import { createSelector } from 'reselect'; |
||||
|
||||
import { HotKeys } from 'react-hotkeys'; |
||||
|
||||
import { initBlockModal } from 'flavours/glitch/actions/blocks'; |
||||
import { initBoostModal } from 'flavours/glitch/actions/boosts'; |
||||
import { |
||||
replyCompose, |
||||
mentionCompose, |
||||
directCompose, |
||||
} from 'flavours/glitch/actions/compose'; |
||||
import { |
||||
favourite, |
||||
unfavourite, |
||||
bookmark, |
||||
unbookmark, |
||||
reblog, |
||||
unreblog, |
||||
pin, |
||||
unpin, |
||||
} from 'flavours/glitch/actions/interactions'; |
||||
import { changeLocalSetting } from 'flavours/glitch/actions/local_settings'; |
||||
import { openModal } from 'flavours/glitch/actions/modal'; |
||||
import { initMuteModal } from 'flavours/glitch/actions/mutes'; |
||||
import { initReport } from 'flavours/glitch/actions/reports'; |
||||
import { |
||||
fetchStatus, |
||||
muteStatus, |
||||
unmuteStatus, |
||||
deleteStatus, |
||||
editStatus, |
||||
hideStatus, |
||||
revealStatus, |
||||
translateStatus, |
||||
undoStatusTranslation, |
||||
} from 'flavours/glitch/actions/statuses'; |
||||
import { Icon } from 'flavours/glitch/components/icon'; |
||||
import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator'; |
||||
import { textForScreenReader, defaultMediaVisibility } from 'flavours/glitch/components/status'; |
||||
import ScrollContainer from 'flavours/glitch/containers/scroll_container'; |
||||
import StatusContainer from 'flavours/glitch/containers/status_container'; |
||||
import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error'; |
||||
import Column from 'flavours/glitch/features/ui/components/column'; |
||||
import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state'; |
||||
import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors'; |
||||
import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning'; |
||||
|
||||
import ColumnHeader from '../../components/column_header'; |
||||
import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen'; |
||||
|
||||
import ActionBar from './components/action_bar'; |
||||
import DetailedStatus from './components/detailed_status'; |
||||
|
||||
const messages = defineMessages({ |
||||
deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, |
||||
deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' }, |
||||
redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' }, |
||||
redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' }, |
||||
revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' }, |
||||
hideAll: { id: 'status.show_less_all', defaultMessage: 'Show less for all' }, |
||||
statusTitleWithAttachments: { id: 'status.title.with_attachments', defaultMessage: '{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}' }, |
||||
detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' }, |
||||
replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' }, |
||||
replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' }, |
||||
tootHeading: { id: 'account.posts_with_replies', defaultMessage: 'Posts and replies' }, |
||||
}); |
||||
|
||||
const makeMapStateToProps = () => { |
||||
const getStatus = makeGetStatus(); |
||||
const getPictureInPicture = makeGetPictureInPicture(); |
||||
|
||||
const getAncestorsIds = createSelector([ |
||||
(_, { id }) => id, |
||||
state => state.getIn(['contexts', 'inReplyTos']), |
||||
], (statusId, inReplyTos) => { |
||||
let ancestorsIds = Immutable.List(); |
||||
ancestorsIds = ancestorsIds.withMutations(mutable => { |
||||
let id = statusId; |
||||
|
||||
while (id && !mutable.includes(id)) { |
||||
mutable.unshift(id); |
||||
id = inReplyTos.get(id); |
||||
} |
||||
}); |
||||
|
||||
return ancestorsIds; |
||||
}); |
||||
|
||||
const getDescendantsIds = createSelector([ |
||||
(_, { id }) => id, |
||||
state => state.getIn(['contexts', 'replies']), |
||||
state => state.get('statuses'), |
||||
], (statusId, contextReplies, statuses) => { |
||||
let descendantsIds = []; |
||||
const ids = [statusId]; |
||||
|
||||
while (ids.length > 0) { |
||||
let id = ids.pop(); |
||||
const replies = contextReplies.get(id); |
||||
|
||||
if (statusId !== id) { |
||||
descendantsIds.push(id); |
||||
} |
||||
|
||||
if (replies) { |
||||
replies.reverse().forEach(reply => { |
||||
if (!ids.includes(reply) && !descendantsIds.includes(reply) && statusId !== reply) ids.push(reply); |
||||
}); |
||||
} |
||||
} |
||||
|
||||
let insertAt = descendantsIds.findIndex((id) => statuses.get(id).get('in_reply_to_account_id') !== statuses.get(id).get('account')); |
||||
if (insertAt !== -1) { |
||||
descendantsIds.forEach((id, idx) => { |
||||
if (idx > insertAt && statuses.get(id).get('in_reply_to_account_id') === statuses.get(id).get('account')) { |
||||
descendantsIds.splice(idx, 1); |
||||
descendantsIds.splice(insertAt, 0, id); |
||||
insertAt += 1; |
||||
} |
||||
}); |
||||
} |
||||
|
||||
return Immutable.List(descendantsIds); |
||||
}); |
||||
|
||||
const mapStateToProps = (state, props) => { |
||||
const status = getStatus(state, { id: props.params.statusId }); |
||||
|
||||
let ancestorsIds = Immutable.List(); |
||||
let descendantsIds = Immutable.List(); |
||||
|
||||
if (status) { |
||||
ancestorsIds = getAncestorsIds(state, { id: status.get('in_reply_to_id') }); |
||||
descendantsIds = getDescendantsIds(state, { id: status.get('id') }); |
||||
} |
||||
|
||||
return { |
||||
isLoading: state.getIn(['statuses', props.params.statusId, 'isLoading']), |
||||
status, |
||||
ancestorsIds, |
||||
descendantsIds, |
||||
settings: state.get('local_settings'), |
||||
askReplyConfirmation: state.getIn(['local_settings', 'confirm_before_clearing_draft']) && state.getIn(['compose', 'text']).trim().length !== 0, |
||||
domain: state.getIn(['meta', 'domain']), |
||||
pictureInPicture: getPictureInPicture(state, { id: props.params.statusId }), |
||||
}; |
||||
}; |
||||
|
||||
return mapStateToProps; |
||||
}; |
||||
|
||||
const truncate = (str, num) => { |
||||
const arr = Array.from(str); |
||||
if (arr.length > num) { |
||||
return arr.slice(0, num).join('') + '…'; |
||||
} else { |
||||
return str; |
||||
} |
||||
}; |
||||
|
||||
const titleFromStatus = (intl, status) => { |
||||
const displayName = status.getIn(['account', 'display_name']); |
||||
const username = status.getIn(['account', 'username']); |
||||
const user = displayName.trim().length === 0 ? username : displayName; |
||||
const text = status.get('search_index'); |
||||
const attachmentCount = status.get('media_attachments').size; |
||||
|
||||
return text ? `${user}: "${truncate(text, 30)}"` : intl.formatMessage(messages.statusTitleWithAttachments, { user, attachmentCount }); |
||||
}; |
||||
|
||||
class Status extends ImmutablePureComponent { |
||||
|
||||
static contextTypes = { |
||||
router: PropTypes.object, |
||||
identity: PropTypes.object, |
||||
}; |
||||
|
||||
static propTypes = { |
||||
params: PropTypes.object.isRequired, |
||||
dispatch: PropTypes.func.isRequired, |
||||
status: ImmutablePropTypes.map, |
||||
isLoading: PropTypes.bool, |
||||
settings: ImmutablePropTypes.map.isRequired, |
||||
ancestorsIds: ImmutablePropTypes.list.isRequired, |
||||
descendantsIds: ImmutablePropTypes.list.isRequired, |
||||
intl: PropTypes.object.isRequired, |
||||
askReplyConfirmation: PropTypes.bool, |
||||
multiColumn: PropTypes.bool, |
||||
domain: PropTypes.string.isRequired, |
||||
pictureInPicture: ImmutablePropTypes.contains({ |
||||
inUse: PropTypes.bool, |
||||
available: PropTypes.bool, |
||||
}), |
||||
}; |
||||
|
||||
state = { |
||||
fullscreen: false, |
||||
isExpanded: undefined, |
||||
threadExpanded: undefined, |
||||
statusId: undefined, |
||||
loadedStatusId: undefined, |
||||
showMedia: undefined, |
||||
revealBehindCW: undefined, |
||||
}; |
||||
|
||||
componentDidMount () { |
||||
attachFullscreenListener(this.onFullScreenChange); |
||||
this.props.dispatch(fetchStatus(this.props.params.statusId)); |
||||
} |
||||
|
||||
static getDerivedStateFromProps(props, state) { |
||||
let update = {}; |
||||
let updated = false; |
||||
|
||||
if (props.params.statusId && state.statusId !== props.params.statusId) { |
||||
props.dispatch(fetchStatus(props.params.statusId)); |
||||
update.threadExpanded = undefined; |
||||
update.statusId = props.params.statusId; |
||||
updated = true; |
||||
} |
||||
|
||||
const revealBehindCW = props.settings.getIn(['media', 'reveal_behind_cw']); |
||||
if (revealBehindCW !== state.revealBehindCW) { |
||||
update.revealBehindCW = revealBehindCW; |
||||
if (revealBehindCW) update.showMedia = defaultMediaVisibility(props.status, props.settings); |
||||
updated = true; |
||||
} |
||||
|
||||
if (props.status && state.loadedStatusId !== props.status.get('id')) { |
||||
update.showMedia = defaultMediaVisibility(props.status, props.settings); |
||||
update.loadedStatusId = props.status.get('id'); |
||||
update.isExpanded = autoUnfoldCW(props.settings, props.status); |
||||
updated = true; |
||||
} |
||||
|
||||
return updated ? update : null; |
||||
} |
||||
|
||||
handleToggleHidden = () => { |
||||
const { status } = this.props; |
||||
|
||||
if (this.props.settings.getIn(['content_warnings', 'shared_state'])) { |
||||
if (status.get('hidden')) { |
||||
this.props.dispatch(revealStatus(status.get('id'))); |
||||
} else { |
||||
this.props.dispatch(hideStatus(status.get('id'))); |
||||
} |
||||
} else if (this.props.status.get('spoiler_text')) { |
||||
this.setExpansion(!this.state.isExpanded); |
||||
} |
||||
}; |
||||
|
||||
handleToggleMediaVisibility = () => { |
||||
this.setState({ showMedia: !this.state.showMedia }); |
||||
}; |
||||
|
||||
handleModalFavourite = (status) => { |
||||
this.props.dispatch(favourite(status)); |
||||
}; |
||||
|
||||
handleFavouriteClick = (status, e) => { |
||||
const { dispatch } = this.props; |
||||
const { signedIn } = this.context.identity; |
||||
|
||||
if (signedIn) { |
||||
if (status.get('favourited')) { |
||||
dispatch(unfavourite(status)); |
||||
} else { |
||||
if ((e && e.shiftKey) || !favouriteModal) { |
||||
this.handleModalFavourite(status); |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'FAVOURITE', |
||||
modalProps: { |
||||
status, |
||||
onFavourite: this.handleModalFavourite, |
||||
}, |
||||
})); |
||||
} |
||||
} |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'INTERACTION', |
||||
modalProps: { |
||||
type: 'favourite', |
||||
accountId: status.getIn(['account', 'id']), |
||||
url: status.get('url'), |
||||
}, |
||||
})); |
||||
} |
||||
}; |
||||
|
||||
handlePin = (status) => { |
||||
if (status.get('pinned')) { |
||||
this.props.dispatch(unpin(status)); |
||||
} else { |
||||
this.props.dispatch(pin(status)); |
||||
} |
||||
}; |
||||
|
||||
handleReplyClick = (status) => { |
||||
const { askReplyConfirmation, dispatch, intl } = this.props; |
||||
const { signedIn } = this.context.identity; |
||||
|
||||
if (signedIn) { |
||||
if (askReplyConfirmation) { |
||||
dispatch(openModal({ |
||||
modalType: 'CONFIRM', |
||||
modalProps: { |
||||
message: intl.formatMessage(messages.replyMessage), |
||||
confirm: intl.formatMessage(messages.replyConfirm), |
||||
onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)), |
||||
onConfirm: () => dispatch(replyCompose(status, this.context.router.history)), |
||||
}, |
||||
})); |
||||
} else { |
||||
dispatch(replyCompose(status, this.context.router.history)); |
||||
} |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'INTERACTION', |
||||
modalProps: { |
||||
type: 'reply', |
||||
accountId: status.getIn(['account', 'id']), |
||||
url: status.get('url'), |
||||
}, |
||||
})); |
||||
} |
||||
}; |
||||
|
||||
handleModalReblog = (status, privacy) => { |
||||
const { dispatch } = this.props; |
||||
|
||||
if (status.get('reblogged')) { |
||||
dispatch(unreblog(status)); |
||||
} else { |
||||
dispatch(reblog(status, privacy)); |
||||
} |
||||
}; |
||||
|
||||
handleReblogClick = (status, e) => { |
||||
const { settings, dispatch } = this.props; |
||||
const { signedIn } = this.context.identity; |
||||
|
||||
if (signedIn) { |
||||
if (settings.get('confirm_boost_missing_media_description') && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) { |
||||
dispatch(initBoostModal({ status, onReblog: this.handleModalReblog, missingMediaDescription: true })); |
||||
} else if ((e && e.shiftKey) || !boostModal) { |
||||
this.handleModalReblog(status); |
||||
} else { |
||||
dispatch(initBoostModal({ status, onReblog: this.handleModalReblog })); |
||||
} |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'INTERACTION', |
||||
modalProps: { |
||||
type: 'reblog', |
||||
accountId: status.getIn(['account', 'id']), |
||||
url: status.get('url'), |
||||
}, |
||||
})); |
||||
} |
||||
}; |
||||
|
||||
handleBookmarkClick = (status) => { |
||||
if (status.get('bookmarked')) { |
||||
this.props.dispatch(unbookmark(status)); |
||||
} else { |
||||
this.props.dispatch(bookmark(status)); |
||||
} |
||||
}; |
||||
|
||||
handleDeleteClick = (status, history, withRedraft = false) => { |
||||
const { dispatch, intl } = this.props; |
||||
|
||||
if (!deleteModal) { |
||||
dispatch(deleteStatus(status.get('id'), history, withRedraft)); |
||||
} else { |
||||
dispatch(openModal({ |
||||
modalType: 'CONFIRM', |
||||
modalProps: { |
||||
message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage), |
||||
confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm), |
||||
onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)), |
||||
}, |
||||
})); |
||||
} |
||||
}; |
||||
|
||||
handleEditClick = (status, history) => { |
||||
this.props.dispatch(editStatus(status.get('id'), history)); |
||||
}; |
||||
|
||||
handleDirectClick = (account, router) => { |
||||
this.props.dispatch(directCompose(account, router)); |
||||
}; |
||||
|
||||
handleMentionClick = (account, router) => { |
||||
this.props.dispatch(mentionCompose(account, router)); |
||||
}; |
||||
|
||||
handleOpenMedia = (media, index, lang) => { |
||||
this.props.dispatch(openModal({ |
||||
modalType: 'MEDIA', |
||||
modalProps: { statusId: this.props.status.get('id'), media, index, lang }, |
||||
})); |
||||
}; |
||||
|
||||
handleOpenVideo = (media, lang, options) => { |
||||
this.props.dispatch(openModal({ |
||||
modalType: 'VIDEO', |
||||
modalProps: { statusId: this.props.status.get('id'), media, lang, options }, |
||||
})); |
||||
}; |
||||
|
||||
handleHotkeyOpenMedia = e => { |
||||
const { status } = this.props; |
||||
|
||||
e.preventDefault(); |
||||
|
||||
if (status.get('media_attachments').size > 0) { |
||||
if (status.getIn(['media_attachments', 0, 'type']) === 'video') { |
||||
this.handleOpenVideo(status.getIn(['media_attachments', 0]), { startTime: 0 }); |
||||
} else { |
||||
this.handleOpenMedia(status.get('media_attachments'), 0); |
||||
} |
||||
} |
||||
}; |
||||
|
||||
handleMuteClick = (account) => { |
||||
this.props.dispatch(initMuteModal(account)); |
||||
}; |
||||
|
||||
handleConversationMuteClick = (status) => { |
||||
if (status.get('muted')) { |
||||
this.props.dispatch(unmuteStatus(status.get('id'))); |
||||
} else { |
||||
this.props.dispatch(muteStatus(status.get('id'))); |
||||
} |
||||
}; |
||||
|
||||
handleToggleAll = () => { |
||||
const { status, ancestorsIds, descendantsIds, settings } = this.props; |
||||
const statusIds = [status.get('id')].concat(ancestorsIds.toJS(), descendantsIds.toJS()); |
||||
let { isExpanded } = this.state; |
||||
|
||||
if (settings.getIn(['content_warnings', 'shared_state'])) |
||||
isExpanded = !status.get('hidden'); |
||||
|
||||
if (!isExpanded) { |
||||
this.props.dispatch(revealStatus(statusIds)); |
||||
} else { |
||||
this.props.dispatch(hideStatus(statusIds)); |
||||
} |
||||
|
||||
this.setState({ isExpanded: !isExpanded, threadExpanded: !isExpanded }); |
||||
}; |
||||
|
||||
handleTranslate = status => { |
||||
const { dispatch } = this.props; |
||||
|
||||
if (status.get('translation')) { |
||||
dispatch(undoStatusTranslation(status.get('id'), status.get('poll'))); |
||||
} else { |
||||
dispatch(translateStatus(status.get('id'))); |
||||
} |
||||
}; |
||||
|
||||
handleBlockClick = (status) => { |
||||
const { dispatch } = this.props; |
||||
const account = status.get('account'); |
||||
dispatch(initBlockModal(account)); |
||||
}; |
||||
|
||||
handleReport = (status) => { |
||||
this.props.dispatch(initReport(status.get('account'), status)); |
||||
}; |
||||
|
||||
handleEmbed = (status) => { |
||||
this.props.dispatch(openModal({ |
||||
modalType: 'EMBED', |
||||
modalProps: { id: status.get('id') }, |
||||
})); |
||||
}; |
||||
|
||||
handleHotkeyToggleSensitive = () => { |
||||
this.handleToggleMediaVisibility(); |
||||
}; |
||||
|
||||
handleHotkeyMoveUp = () => { |
||||
this.handleMoveUp(this.props.status.get('id')); |
||||
}; |
||||
|
||||
handleHotkeyMoveDown = () => { |
||||
this.handleMoveDown(this.props.status.get('id')); |
||||
}; |
||||
|
||||
handleHotkeyReply = e => { |
||||
e.preventDefault(); |
||||
this.handleReplyClick(this.props.status); |
||||
}; |
||||
|
||||
handleHotkeyFavourite = () => { |
||||
this.handleFavouriteClick(this.props.status); |
||||
}; |
||||
|
||||
handleHotkeyBoost = () => { |
||||
this.handleReblogClick(this.props.status); |
||||
}; |
||||
|
||||
handleHotkeyBookmark = () => { |
||||
this.handleBookmarkClick(this.props.status); |
||||
}; |
||||
|
||||
handleHotkeyMention = e => { |
||||
e.preventDefault(); |
||||
this.handleMentionClick(this.props.status); |
||||
}; |
||||
|
||||
handleHotkeyOpenProfile = () => { |
||||
this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`); |
||||
}; |
||||
|
||||
handleMoveUp = id => { |
||||
const { status, ancestorsIds, descendantsIds } = this.props; |
||||
|
||||
if (id === status.get('id')) { |
||||
this._selectChild(ancestorsIds.size - 1, true); |
||||
} else { |
||||
let index = ancestorsIds.indexOf(id); |
||||
|
||||
if (index === -1) { |
||||
index = descendantsIds.indexOf(id); |
||||
this._selectChild(ancestorsIds.size + index, true); |
||||
} else { |
||||
this._selectChild(index - 1, true); |
||||
} |
||||
} |
||||
}; |
||||
|
||||
handleMoveDown = id => { |
||||
const { status, ancestorsIds, descendantsIds } = this.props; |
||||
|
||||
if (id === status.get('id')) { |
||||
this._selectChild(ancestorsIds.size + 1, false); |
||||
} else { |
||||
let index = ancestorsIds.indexOf(id); |
||||
|
||||
if (index === -1) { |
||||
index = descendantsIds.indexOf(id); |
||||
this._selectChild(ancestorsIds.size + index + 2, false); |
||||
} else { |
||||
this._selectChild(index + 1, false); |
||||
} |
||||
} |
||||
}; |
||||
|
||||
_selectChild (index, align_top) { |
||||
const container = this.node; |
||||
const element = container.querySelectorAll('.focusable')[index]; |
||||
|
||||
if (element) { |
||||
if (align_top && container.scrollTop > element.offsetTop) { |
||||
element.scrollIntoView(true); |
||||
} else if (!align_top && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) { |
||||
element.scrollIntoView(false); |
||||
} |
||||
element.focus(); |
||||
} |
||||
} |
||||
|
||||
handleHeaderClick = () => { |
||||
this.column.scrollTop(); |
||||
}; |
||||
|
||||
renderChildren (list, ancestors) { |
||||
const { params: { statusId } } = this.props; |
||||
|
||||
return list.map((id, i) => ( |
||||
<StatusContainer |
||||
key={id} |
||||
id={id} |
||||
expanded={this.state.threadExpanded} |
||||
onMoveUp={this.handleMoveUp} |
||||
onMoveDown={this.handleMoveDown} |
||||
contextType='thread' |
||||
previousId={i > 0 && list.get(i - 1)} |
||||
nextId={list.get(i + 1) || (ancestors && statusId)} |
||||
rootId={statusId} |
||||
/> |
||||
)); |
||||
} |
||||
|
||||
setExpansion = value => { |
||||
this.setState({ isExpanded: value }); |
||||
}; |
||||
|
||||
setRef = c => { |
||||
this.node = c; |
||||
}; |
||||
|
||||
setColumnRef = c => { |
||||
this.column = c; |
||||
}; |
||||
|
||||
componentDidUpdate (prevProps) { |
||||
const { status, ancestorsIds, multiColumn } = this.props; |
||||
|
||||
if (status && (ancestorsIds.size > prevProps.ancestorsIds.size || prevProps.status?.get('id') !== status.get('id'))) { |
||||
window.requestAnimationFrame(() => { |
||||
this.node?.querySelector('.detailed-status__wrapper')?.scrollIntoView(true); |
||||
|
||||
// In the single-column interface, `scrollIntoView` will put the post behind the header, |
||||
// so compensate for that. |
||||
if (!multiColumn) { |
||||
const offset = document.querySelector('.column-header__wrapper')?.getBoundingClientRect()?.bottom; |
||||
if (offset) { |
||||
const scrollingElement = document.scrollingElement || document.body; |
||||
scrollingElement.scrollBy(0, -offset); |
||||
} |
||||
} |
||||
}); |
||||
} |
||||
} |
||||
|
||||
componentWillUnmount () { |
||||
detachFullscreenListener(this.onFullScreenChange); |
||||
} |
||||
|
||||
onFullScreenChange = () => { |
||||
this.setState({ fullscreen: isFullscreen() }); |
||||
}; |
||||
|
||||
render () { |
||||
let ancestors, descendants; |
||||
const { isLoading, status, settings, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props; |
||||
const { fullscreen } = this.state; |
||||
|
||||
if (isLoading) { |
||||
return ( |
||||
<Column> |
||||
<LoadingIndicator /> |
||||
</Column> |
||||
); |
||||
} |
||||
|
||||
if (status === null) { |
||||
return ( |
||||
<BundleColumnError multiColumn={multiColumn} errorType='routing' /> |
||||
); |
||||
} |
||||
|
||||
const isExpanded = settings.getIn(['content_warnings', 'shared_state']) ? !status.get('hidden') : this.state.isExpanded; |
||||
|
||||
if (ancestorsIds && ancestorsIds.size > 0) { |
||||
ancestors = <>{this.renderChildren(ancestorsIds, true)}</>; |
||||
} |
||||
|
||||
if (descendantsIds && descendantsIds.size > 0) { |
||||
descendants = <>{this.renderChildren(descendantsIds)}</>; |
||||
} |
||||
|
||||
const isLocal = status.getIn(['account', 'acct'], '').indexOf('@') === -1; |
||||
const isIndexable = !status.getIn(['account', 'noindex']); |
||||
|
||||
const handlers = { |
||||
moveUp: this.handleHotkeyMoveUp, |
||||
moveDown: this.handleHotkeyMoveDown, |
||||
reply: this.handleHotkeyReply, |
||||
favourite: this.handleHotkeyFavourite, |
||||
boost: this.handleHotkeyBoost, |
||||
bookmark: this.handleHotkeyBookmark, |
||||
mention: this.handleHotkeyMention, |
||||
openProfile: this.handleHotkeyOpenProfile, |
||||
toggleSpoiler: this.handleToggleHidden, |
||||
toggleSensitive: this.handleHotkeyToggleSensitive, |
||||
openMedia: this.handleHotkeyOpenMedia, |
||||
}; |
||||
|
||||
return ( |
||||
<Column bindToDocument={!multiColumn} ref={this.setColumnRef} label={intl.formatMessage(messages.detailedStatus)}> |
||||
<ColumnHeader |
||||
icon='comment' |
||||
title={intl.formatMessage(messages.tootHeading)} |
||||
onClick={this.handleHeaderClick} |
||||
showBackButton |
||||
multiColumn={multiColumn} |
||||
extraButton={( |
||||
<button type='button' className='column-header__button' title={intl.formatMessage(!isExpanded ? messages.revealAll : messages.hideAll)} aria-label={intl.formatMessage(!isExpanded ? messages.revealAll : messages.hideAll)} onClick={this.handleToggleAll}><Icon id={!isExpanded ? 'eye-slash' : 'eye'} /></button> |
||||
)} |
||||
/> |
||||
|
||||
<ScrollContainer scrollKey='thread'> |
||||
<div className={classNames('scrollable', { fullscreen })} ref={this.setRef}> |
||||
{ancestors} |
||||
|
||||
<HotKeys handlers={handlers}> |
||||
<div className={classNames('focusable', 'detailed-status__wrapper', `detailed-status__wrapper-${status.get('visibility')}`)} tabIndex={0} aria-label={textForScreenReader(intl, status, false, isExpanded)}> |
||||
<DetailedStatus |
||||
key={`details-${status.get('id')}`} |
||||
status={status} |
||||
settings={settings} |
||||
onOpenVideo={this.handleOpenVideo} |
||||
onOpenMedia={this.handleOpenMedia} |
||||
expanded={isExpanded} |
||||
onToggleHidden={this.handleToggleHidden} |
||||
onTranslate={this.handleTranslate} |
||||
domain={domain} |
||||
showMedia={this.state.showMedia} |
||||
onToggleMediaVisibility={this.handleToggleMediaVisibility} |
||||
pictureInPicture={pictureInPicture} |
||||
/> |
||||
|
||||
<ActionBar |
||||
key={`action-bar-${status.get('id')}`} |
||||
status={status} |
||||
onReply={this.handleReplyClick} |
||||
onFavourite={this.handleFavouriteClick} |
||||
onReblog={this.handleReblogClick} |
||||
onBookmark={this.handleBookmarkClick} |
||||
onDelete={this.handleDeleteClick} |
||||
onEdit={this.handleEditClick} |
||||
onDirect={this.handleDirectClick} |
||||
onMention={this.handleMentionClick} |
||||
onMute={this.handleMuteClick} |
||||
onMuteConversation={this.handleConversationMuteClick} |
||||
onBlock={this.handleBlockClick} |
||||
onReport={this.handleReport} |
||||
onPin={this.handlePin} |
||||
onEmbed={this.handleEmbed} |
||||
/> |
||||
</div> |
||||
</HotKeys> |
||||
|
||||
{descendants} |
||||
</div> |
||||
</ScrollContainer> |
||||
|
||||
<Helmet> |
||||
<title>{titleFromStatus(intl, status)}</title> |
||||
<meta name='robots' content={(isLocal && isIndexable) ? 'all' : 'noindex'} /> |
||||
<link rel='canonical' href={status.get('url')} /> |
||||
</Helmet> |
||||
</Column> |
||||
); |
||||
} |
||||
|
||||
} |
||||
|
||||
export default injectIntl(connect(makeMapStateToProps)(Status)); |
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,101 @@ |
||||
// Commonly used web colors |
||||
$black: #000000; // Black |
||||
$white: #ffffff; // White |
||||
$red-600: #b7253d !default; // Deep Carmine |
||||
$red-500: #df405a !default; // Cerise |
||||
$blurple-600: #563acc; // Iris |
||||
$blurple-500: #6364ff; // Brand purple |
||||
$blurple-300: #858afa; // Faded Blue |
||||
$grey-600: #4e4c5a; // Trout |
||||
$grey-100: #dadaf3; // Topaz |
||||
|
||||
$success-green: #79bd9a !default; // Padua |
||||
$error-red: $red-500 !default; // Cerise |
||||
$warning-red: #ff5050 !default; // Sunset Orange |
||||
$gold-star: #ca8f04 !default; // Dark Goldenrod |
||||
|
||||
$red-bookmark: $warning-red; |
||||
|
||||
// Values from the classic Mastodon UI |
||||
$classic-base-color: #282c37; // Midnight Express |
||||
$classic-primary-color: #9baec8; // Echo Blue |
||||
$classic-secondary-color: #d9e1e8; // Pattens Blue |
||||
$classic-highlight-color: #6364ff; // Brand purple |
||||
|
||||
// Variables for defaults in UI |
||||
$base-shadow-color: $black !default; |
||||
$base-overlay-background: $black !default; |
||||
$base-border-color: $white !default; |
||||
$simple-background-color: $white !default; |
||||
$valid-value-color: $success-green !default; |
||||
$error-value-color: $error-red !default; |
||||
|
||||
// Tell UI to use selected colors |
||||
$ui-base-color: $classic-base-color !default; // Darkest |
||||
$ui-base-lighter-color: lighten( |
||||
$ui-base-color, |
||||
26% |
||||
) !default; // Lighter darkest |
||||
$ui-primary-color: $classic-primary-color !default; // Lighter |
||||
$ui-secondary-color: $classic-secondary-color !default; // Lightest |
||||
$ui-highlight-color: $classic-highlight-color !default; |
||||
$ui-button-color: $white !default; |
||||
$ui-button-background-color: $blurple-500 !default; |
||||
$ui-button-focus-background-color: $blurple-600 !default; |
||||
|
||||
$ui-button-secondary-color: $grey-100 !default; |
||||
$ui-button-secondary-border-color: $grey-100 !default; |
||||
$ui-button-secondary-focus-background-color: $grey-600 !default; |
||||
$ui-button-secondary-focus-color: $white !default; |
||||
|
||||
$ui-button-tertiary-color: $blurple-300 !default; |
||||
$ui-button-tertiary-border-color: $blurple-300 !default; |
||||
$ui-button-tertiary-focus-background-color: $blurple-600 !default; |
||||
$ui-button-tertiary-focus-color: $white !default; |
||||
|
||||
$ui-button-destructive-background-color: $red-500 !default; |
||||
$ui-button-destructive-focus-background-color: $red-600 !default; |
||||
|
||||
// Variables for texts |
||||
$primary-text-color: $white !default; |
||||
$darker-text-color: $ui-primary-color !default; |
||||
$dark-text-color: $ui-base-lighter-color !default; |
||||
$secondary-text-color: $ui-secondary-color !default; |
||||
$highlight-text-color: lighten($ui-highlight-color, 8%) !default; |
||||
$action-button-color: $ui-base-lighter-color !default; |
||||
$action-button-focus-color: lighten($ui-base-lighter-color, 4%) !default; |
||||
$passive-text-color: $gold-star !default; |
||||
$active-passive-text-color: $success-green !default; |
||||
|
||||
// For texts on inverted backgrounds |
||||
$inverted-text-color: $ui-base-color !default; |
||||
$lighter-text-color: $ui-base-lighter-color !default; |
||||
$light-text-color: $ui-primary-color !default; |
||||
|
||||
// Language codes that uses CJK fonts |
||||
$cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW; |
||||
|
||||
// Variables for components |
||||
$media-modal-media-max-width: 100%; |
||||
|
||||
// put margins on top and bottom of image to avoid the screen covered by image. |
||||
$media-modal-media-max-height: 80%; |
||||
|
||||
$no-gap-breakpoint: 1175px; |
||||
|
||||
$font-sans-serif: 'mastodon-font-sans-serif' !default; |
||||
$font-display: 'mastodon-font-display' !default; |
||||
$font-monospace: 'mastodon-font-monospace' !default; |
||||
|
||||
// Avatar border size (8% default, 100% for rounded avatars) |
||||
$ui-avatar-border-size: 8%; |
||||
|
||||
// More variables |
||||
$dismiss-overlay-width: 4rem; |
||||
|
||||
:root { |
||||
--dropdown-border-color: #{lighten($ui-base-color, 12%)}; |
||||
--dropdown-background-color: #{lighten($ui-base-color, 4%)}; |
||||
--dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)}, |
||||
0 8px 10px -6px #{rgba($base-shadow-color, 0.25)}; |
||||
} |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue