2020-10-13 02:19:35 +03:00
|
|
|
import './public-path';
|
2023-05-09 04:08:47 +03:00
|
|
|
|
2023-05-09 15:55:35 +03:00
|
|
|
import { loadPolyfills } from '../mastodon/polyfills';
|
2023-05-09 04:08:47 +03:00
|
|
|
import ready from '../mastodon/ready';
|
2023-05-09 15:55:35 +03:00
|
|
|
import { start } from '../mastodon/common';
|
|
|
|
|
2019-11-04 14:03:09 +02:00
|
|
|
import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
|
Revamp post filtering system (#18058)
* Add model for custom filter keywords
* Use CustomFilterKeyword internally
Does not change the API
* Fix /filters/edit and /filters/new
* Add migration tests
* Remove whole_word column from custom_filters (covered by custom_filter_keywords)
* Redesign /filters
Instead of a list, present a card that displays more information and handles
multiple keywords per filter.
* Redesign /filters/new and /filters/edit to add and remove keywords
This adds a new gem dependency: cocoon, as well as a npm dependency:
cocoon-js-vanilla. Those are used to easily populate and remove form fields
from the user interface when manipulating multiple keyword filters at once.
* Add /api/v2/filters to edit filter with multiple keywords
Entities:
- `Filter`: `id`, `title`, `filter_action` (either `hide` or `warn`), `context`
`keywords`
- `FilterKeyword`: `id`, `keyword`, `whole_word`
API endpoits:
- `GET /api/v2/filters` to list filters (including keywords)
- `POST /api/v2/filters` to create a new filter
`keywords_attributes` can also be passed to create keywords in one request
- `GET /api/v2/filters/:id` to read a particular filter
- `PUT /api/v2/filters/:id` to update a new filter
`keywords_attributes` can also be passed to edit, delete or add keywords in
one request
- `DELETE /api/v2/filters/:id` to delete a particular filter
- `GET /api/v2/filters/:id/keywords` to list keywords for a filter
- `POST /api/v2/filters/:filter_id/keywords/:id` to add a new keyword to a
filter
- `GET /api/v2/filter_keywords/:id` to read a particular keyword
- `PUT /api/v2/filter_keywords/:id` to edit a particular keyword
- `DELETE /api/v2/filter_keywords/:id` to delete a particular keyword
* Change from `irreversible` boolean to `action` enum
* Remove irrelevent `irreversible_must_be_within_context` check
* Fix /filters/new and /filters/edit with update for filter_action
* Fix Rubocop/Codeclimate complaining about task names
* Refactor FeedManager#phrase_filtered?
This moves regexp building and filter caching to the `CustomFilter` class.
This does not change the functional behavior yet, but this changes how the
cache is built, doing per-custom_filter regexps so that filters can be matched
independently, while still offering caching.
* Perform server-side filtering and output result in REST API
* Fix numerous filters_changed events being sent when editing multiple keywords at once
* Add some tests
* Use the new API in the WebUI
- use client-side logic for filters we have fetched rules for.
This is so that filter changes can be retroactively applied without
reloading the UI.
- use server-side logic for filters we haven't fetched rules for yet
(e.g. network error, or initial timeline loading)
* Minor optimizations and refactoring
* Perform server-side filtering on the streaming server
* Change the wording of filter action labels
* Fix issues pointed out by linter
* Change design of “Show anyway” link in accordence to review comments
* Drop “irreversible” filtering behavior
* Move /api/v2/filter_keywords to /api/v1/filters/keywords
* Rename `filter_results` attribute to `filtered`
* Rename REST::LegacyFilterSerializer to REST::V1::FilterSerializer
* Fix systemChannelId value in streaming server
* Simplify code by removing client-side filtering code
The simplifcation comes at a cost though: filters aren't retroactively
applied anymore.
2022-06-28 10:42:13 +03:00
|
|
|
import 'cocoon-js-vanilla';
|
2023-04-16 03:10:48 +03:00
|
|
|
import axios from 'axios';
|
|
|
|
import { throttle } from 'lodash';
|
|
|
|
import { defineMessages } from 'react-intl';
|
2023-05-09 04:08:47 +03:00
|
|
|
import * as IntlMessageFormat from 'intl-messageformat';
|
|
|
|
import { timeAgoString } from '../mastodon/components/relative_timestamp';
|
|
|
|
import { delegate } from '@rails/ujs';
|
2023-05-09 17:42:02 +03:00
|
|
|
import emojify from '../mastodon/features/emoji/emoji';
|
2023-05-09 04:08:47 +03:00
|
|
|
import { getLocale } from '../mastodon/locales';
|
|
|
|
import React from 'react';
|
2023-05-22 16:48:01 +03:00
|
|
|
import { createRoot } from 'react-dom/client';
|
2023-05-09 04:08:47 +03:00
|
|
|
import { createBrowserHistory } from 'history';
|
|
|
|
|
|
|
|
start();
|
2023-04-16 03:10:48 +03:00
|
|
|
|
|
|
|
const messages = defineMessages({
|
|
|
|
usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
|
|
|
|
passwordExceedsLength: { id: 'password_confirmation.exceeds_maxlength', defaultMessage: 'Password confirmation exceeds the maximum password length' },
|
|
|
|
passwordDoesNotMatch: { id: 'password_confirmation.mismatching', defaultMessage: 'Password confirmation does not match' },
|
|
|
|
});
|
2018-07-14 04:56:41 +03:00
|
|
|
|
2023-05-09 04:08:47 +03:00
|
|
|
function loaded() {
|
2023-04-16 03:10:48 +03:00
|
|
|
const { localeData } = getLocale();
|
2017-11-21 08:13:37 +02:00
|
|
|
|
2019-01-10 16:13:30 +02:00
|
|
|
const scrollToDetailedStatus = () => {
|
2019-09-18 16:41:50 +03:00
|
|
|
const history = createBrowserHistory();
|
2019-01-10 16:13:30 +02:00
|
|
|
const detailedStatuses = document.querySelectorAll('.public-layout .detailed-status');
|
|
|
|
const location = history.location;
|
|
|
|
|
|
|
|
if (detailedStatuses.length === 1 && (!location.state || !location.state.scrolledToDetailedStatus)) {
|
|
|
|
detailedStatuses[0].scrollIntoView();
|
|
|
|
history.replace(location.pathname, { ...location.state, scrolledToDetailedStatus: true });
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2019-07-21 19:10:40 +03:00
|
|
|
const getEmojiAnimationHandler = (swapTo) => {
|
|
|
|
return ({ target }) => {
|
|
|
|
target.src = target.getAttribute(swapTo);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2017-11-21 08:13:37 +02:00
|
|
|
ready(() => {
|
|
|
|
const locale = document.documentElement.lang;
|
|
|
|
|
|
|
|
const dateTimeFormat = new Intl.DateTimeFormat(locale, {
|
|
|
|
year: 'numeric',
|
|
|
|
month: 'long',
|
|
|
|
day: 'numeric',
|
|
|
|
hour: 'numeric',
|
|
|
|
minute: 'numeric',
|
|
|
|
});
|
|
|
|
|
2022-12-15 17:35:25 +02:00
|
|
|
const dateFormat = new Intl.DateTimeFormat(locale, {
|
|
|
|
year: 'numeric',
|
|
|
|
month: 'short',
|
|
|
|
day: 'numeric',
|
|
|
|
timeFormat: false,
|
|
|
|
});
|
|
|
|
|
|
|
|
const timeFormat = new Intl.DateTimeFormat(locale, {
|
|
|
|
timeStyle: 'short',
|
|
|
|
hour12: false,
|
|
|
|
});
|
|
|
|
|
2023-04-16 03:10:48 +03:00
|
|
|
const formatMessage = ({ id, defaultMessage }, values) => {
|
|
|
|
const messageFormat = new IntlMessageFormat(localeData[id] || defaultMessage, locale);
|
|
|
|
return messageFormat.format(values);
|
|
|
|
};
|
|
|
|
|
2017-11-21 08:13:37 +02:00
|
|
|
[].forEach.call(document.querySelectorAll('.emojify'), (content) => {
|
|
|
|
content.innerHTML = emojify(content.innerHTML);
|
|
|
|
});
|
|
|
|
|
|
|
|
[].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
|
|
|
|
const datetime = new Date(content.getAttribute('datetime'));
|
|
|
|
const formattedDate = dateTimeFormat.format(datetime);
|
|
|
|
|
|
|
|
content.title = formattedDate;
|
|
|
|
content.textContent = formattedDate;
|
|
|
|
});
|
|
|
|
|
2022-12-15 17:35:25 +02:00
|
|
|
const isToday = date => {
|
|
|
|
const today = new Date();
|
|
|
|
|
|
|
|
return date.getDate() === today.getDate() &&
|
|
|
|
date.getMonth() === today.getMonth() &&
|
|
|
|
date.getFullYear() === today.getFullYear();
|
|
|
|
};
|
2023-04-16 03:10:48 +03:00
|
|
|
const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
|
2022-12-15 17:35:25 +02:00
|
|
|
|
|
|
|
[].forEach.call(document.querySelectorAll('time.relative-formatted'), (content) => {
|
|
|
|
const datetime = new Date(content.getAttribute('datetime'));
|
|
|
|
|
|
|
|
let formattedContent;
|
|
|
|
|
|
|
|
if (isToday(datetime)) {
|
|
|
|
const formattedTime = timeFormat.format(datetime);
|
|
|
|
|
|
|
|
formattedContent = todayFormat.format({ time: formattedTime });
|
|
|
|
} else {
|
|
|
|
formattedContent = dateFormat.format(datetime);
|
|
|
|
}
|
|
|
|
|
|
|
|
content.title = formattedContent;
|
|
|
|
content.textContent = formattedContent;
|
|
|
|
});
|
|
|
|
|
2017-11-21 08:13:37 +02:00
|
|
|
[].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
|
|
|
|
const datetime = new Date(content.getAttribute('datetime'));
|
2018-07-28 20:25:33 +03:00
|
|
|
const now = new Date();
|
2017-11-21 08:13:37 +02:00
|
|
|
|
2023-04-07 17:19:43 +03:00
|
|
|
const timeGiven = content.getAttribute('datetime').includes('T');
|
|
|
|
content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime);
|
2018-07-28 20:25:33 +03:00
|
|
|
content.textContent = timeAgoString({
|
2023-04-16 03:10:48 +03:00
|
|
|
formatMessage,
|
2018-07-28 20:25:33 +03:00
|
|
|
formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
|
2023-04-07 17:19:43 +03:00
|
|
|
}, datetime, now, now.getFullYear(), timeGiven);
|
2017-11-21 08:13:37 +02:00
|
|
|
});
|
|
|
|
|
2018-05-12 16:30:06 +03:00
|
|
|
const reactComponents = document.querySelectorAll('[data-component]');
|
2018-09-18 17:45:58 +03:00
|
|
|
|
2018-05-12 16:30:06 +03:00
|
|
|
if (reactComponents.length > 0) {
|
|
|
|
import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
|
|
|
|
.then(({ default: MediaContainer }) => {
|
2019-01-13 11:23:54 +02:00
|
|
|
[].forEach.call(reactComponents, (component) => {
|
|
|
|
[].forEach.call(component.children, (child) => {
|
|
|
|
component.removeChild(child);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2018-05-12 16:30:06 +03:00
|
|
|
const content = document.createElement('div');
|
2018-03-24 13:52:26 +02:00
|
|
|
|
2023-05-22 16:48:01 +03:00
|
|
|
const root = createRoot(content);
|
|
|
|
root.render(<MediaContainer locale={locale} components={reactComponents} />);
|
2018-05-12 16:30:06 +03:00
|
|
|
document.body.appendChild(content);
|
2019-01-10 16:13:30 +02:00
|
|
|
scrollToDetailedStatus();
|
2018-05-12 16:30:06 +03:00
|
|
|
})
|
2019-01-10 16:13:30 +02:00
|
|
|
.catch(error => {
|
|
|
|
console.error(error);
|
|
|
|
scrollToDetailedStatus();
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
scrollToDetailedStatus();
|
2018-03-24 13:52:26 +02:00
|
|
|
}
|
2018-07-28 20:25:33 +03:00
|
|
|
|
2023-04-16 03:10:48 +03:00
|
|
|
delegate(document, '#user_account_attributes_username', 'input', throttle(() => {
|
|
|
|
const username = document.getElementById('user_account_attributes_username');
|
|
|
|
|
|
|
|
if (username.value && username.value.length > 0) {
|
|
|
|
axios.get('/api/v1/accounts/lookup', { params: { acct: username.value } }).then(() => {
|
|
|
|
username.setCustomValidity(formatMessage(messages.usernameTaken));
|
|
|
|
}).catch(() => {
|
|
|
|
username.setCustomValidity('');
|
|
|
|
});
|
2020-08-12 00:09:13 +03:00
|
|
|
} else {
|
2023-04-16 03:10:48 +03:00
|
|
|
username.setCustomValidity('');
|
2020-08-12 00:09:13 +03:00
|
|
|
}
|
2023-04-16 03:10:48 +03:00
|
|
|
}, 500, { leading: false, trailing: true }));
|
2020-08-12 00:09:13 +03:00
|
|
|
|
2020-08-12 13:11:15 +03:00
|
|
|
delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
|
|
|
|
const password = document.getElementById('user_password');
|
|
|
|
const confirmation = document.getElementById('user_password_confirmation');
|
|
|
|
if (!confirmation) return;
|
|
|
|
|
2021-12-05 22:49:50 +02:00
|
|
|
if (confirmation.value && confirmation.value.length > password.maxLength) {
|
2023-04-16 03:10:48 +03:00
|
|
|
confirmation.setCustomValidity(formatMessage(messages.passwordExceedsLength));
|
2021-12-05 22:49:50 +02:00
|
|
|
} else if (password.value && password.value !== confirmation.value) {
|
2023-04-16 03:10:48 +03:00
|
|
|
confirmation.setCustomValidity(formatMessage(messages.passwordDoesNotMatch));
|
2020-08-12 13:11:15 +03:00
|
|
|
} else {
|
|
|
|
confirmation.setCustomValidity('');
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
2019-07-21 19:10:40 +03:00
|
|
|
delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
|
|
|
|
delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
|
2020-04-05 15:02:22 +03:00
|
|
|
|
|
|
|
delegate(document, '.status__content__spoiler-link', 'click', function() {
|
2020-04-28 11:16:55 +03:00
|
|
|
const statusEl = this.parentNode.parentNode;
|
2020-04-05 15:02:22 +03:00
|
|
|
|
2020-04-28 11:16:55 +03:00
|
|
|
if (statusEl.dataset.spoiler === 'expanded') {
|
|
|
|
statusEl.dataset.spoiler = 'folded';
|
2023-04-16 03:10:48 +03:00
|
|
|
this.textContent = (new IntlMessageFormat(localeData['status.show_more'] || 'Show more', locale)).format();
|
2020-04-05 15:02:22 +03:00
|
|
|
} else {
|
2020-04-28 11:16:55 +03:00
|
|
|
statusEl.dataset.spoiler = 'expanded';
|
2023-04-16 03:10:48 +03:00
|
|
|
this.textContent = (new IntlMessageFormat(localeData['status.show_less'] || 'Show less', locale)).format();
|
2020-04-05 15:02:22 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
});
|
|
|
|
|
|
|
|
[].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
|
2020-04-28 11:16:55 +03:00
|
|
|
const statusEl = spoilerLink.parentNode.parentNode;
|
2023-04-16 03:10:48 +03:00
|
|
|
const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
|
2020-04-05 15:02:22 +03:00
|
|
|
spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
|
|
|
|
});
|
2017-11-21 08:13:37 +02:00
|
|
|
});
|
2019-09-20 11:52:14 +03:00
|
|
|
|
2022-10-30 03:43:15 +03:00
|
|
|
const toggleSidebar = () => {
|
|
|
|
const sidebar = document.querySelector('.sidebar ul');
|
|
|
|
const toggleButton = document.querySelector('.sidebar__toggle__icon');
|
|
|
|
|
|
|
|
if (sidebar.classList.contains('visible')) {
|
|
|
|
document.body.style.overflow = null;
|
2023-04-04 17:33:33 +03:00
|
|
|
toggleButton.setAttribute('aria-expanded', 'false');
|
2022-10-30 03:43:15 +03:00
|
|
|
} else {
|
|
|
|
document.body.style.overflow = 'hidden';
|
2023-04-04 17:33:33 +03:00
|
|
|
toggleButton.setAttribute('aria-expanded', 'true');
|
2022-10-30 03:43:15 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
toggleButton.classList.toggle('active');
|
|
|
|
sidebar.classList.toggle('visible');
|
|
|
|
};
|
|
|
|
|
2019-09-20 11:52:14 +03:00
|
|
|
delegate(document, '.sidebar__toggle__icon', 'click', () => {
|
2022-10-30 03:43:15 +03:00
|
|
|
toggleSidebar();
|
|
|
|
});
|
|
|
|
|
|
|
|
delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
|
|
|
|
if (e.key === ' ' || e.key === 'Enter') {
|
|
|
|
e.preventDefault();
|
|
|
|
toggleSidebar();
|
|
|
|
}
|
2019-09-20 11:52:14 +03:00
|
|
|
});
|
2020-12-10 07:27:26 +02:00
|
|
|
|
|
|
|
// Empty the honeypot fields in JS in case something like an extension
|
|
|
|
// automatically filled them.
|
|
|
|
delegate(document, '#registration_new_user,#new_user', 'submit', () => {
|
|
|
|
['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
|
|
|
|
const field = document.getElementById(id);
|
|
|
|
if (field) {
|
|
|
|
field.value = '';
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
2017-11-21 08:13:37 +02:00
|
|
|
}
|
|
|
|
|
2023-05-09 04:08:47 +03:00
|
|
|
|
|
|
|
function main() {
|
|
|
|
ready(loaded);
|
|
|
|
}
|
|
|
|
|
2019-11-04 14:03:09 +02:00
|
|
|
loadPolyfills()
|
|
|
|
.then(main)
|
|
|
|
.then(loadKeyboardExtensions)
|
|
|
|
.catch(error => {
|
|
|
|
console.error(error);
|
|
|
|
});
|