diff --git a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
index 1a026354a..da6380e1b 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
@@ -44,8 +44,8 @@ class SearchResults extends ImmutablePureComponent {
if (results.get("accounts") && results.get("accounts").size > 0) {
accounts = (
>}>
- {withoutLastResult(results.get('accounts')).map(accountId => )}
- {(results.get('accounts').size > INITIAL_PAGE_LIMIT && results.get('accounts').size % INITIAL_PAGE_LIMIT === 1) && }
+ {withoutLastResult(results.get("accounts")).map(accountId => )}
+ {(results.get("accounts").size > INITIAL_PAGE_LIMIT && results.get("accounts").size % INITIAL_PAGE_LIMIT === 1) && }
);
}
@@ -53,8 +53,8 @@ class SearchResults extends ImmutablePureComponent {
if (results.get("hashtags") && results.get("hashtags").size > 0) {
hashtags = (
>}>
- {withoutLastResult(results.get('hashtags')).map(hashtag => )}
- {(results.get('hashtags').size > INITIAL_PAGE_LIMIT && results.get('hashtags').size % INITIAL_PAGE_LIMIT === 1) && }
+ {withoutLastResult(results.get("hashtags")).map(hashtag => )}
+ {(results.get("hashtags").size > INITIAL_PAGE_LIMIT && results.get("hashtags").size % INITIAL_PAGE_LIMIT === 1) && }
);
}
@@ -62,8 +62,8 @@ class SearchResults extends ImmutablePureComponent {
if (results.get("statuses") && results.get("statuses").size > 0) {
statuses = (
>}>
- {withoutLastResult(results.get('statuses')).map(statusId => )}
- {(results.get('statuses').size > INITIAL_PAGE_LIMIT && results.get('statuses').size % INITIAL_PAGE_LIMIT === 1) && }
+ {withoutLastResult(results.get("statuses")).map(statusId => )}
+ {(results.get("statuses").size > INITIAL_PAGE_LIMIT && results.get("statuses").size % INITIAL_PAGE_LIMIT === 1) && }
);
}
diff --git a/app/javascript/flavours/glitch/features/explore/results.jsx b/app/javascript/flavours/glitch/features/explore/results.jsx
index 45acda7a7..43f68b63e 100644
--- a/app/javascript/flavours/glitch/features/explore/results.jsx
+++ b/app/javascript/flavours/glitch/features/explore/results.jsx
@@ -161,38 +161,38 @@ class Results extends PureComponent {
const statuses = results.get("statuses", ImmutableList());
switch(type) {
- case 'all':
- filteredResults = (accounts.size + hashtags.size + statuses.size) > 0 ? (
- <>
- {accounts.size > 0 && (
-
>} onClickMore={this.handleLoadMoreAccounts}>
- {accounts.take(INITIAL_DISPLAY).map(id => )}
-
- )}
+ case "all":
+ filteredResults = (accounts.size + hashtags.size + statuses.size) > 0 ? (
+ <>
+ {accounts.size > 0 && (
+
>} onClickMore={this.handleLoadMoreAccounts}>
+ {accounts.take(INITIAL_DISPLAY).map(id => )}
+
+ )}
- {hashtags.size > 0 && (
-
>} onClickMore={this.handleLoadMoreHashtags}>
- {hashtags.take(INITIAL_DISPLAY).map(hashtag => )}
-
- )}
+ {hashtags.size > 0 && (
+
>} onClickMore={this.handleLoadMoreHashtags}>
+ {hashtags.take(INITIAL_DISPLAY).map(hashtag => )}
+
+ )}
- {statuses.size > 0 && (
-
>} onClickMore={this.handleLoadMoreStatuses}>
- {statuses.take(INITIAL_DISPLAY).map(id => )}
-
- )}
- >
- ) : [];
- break;
- case 'accounts':
- filteredResults = renderAccounts(accounts);
- break;
- case 'hashtags':
- filteredResults = renderHashtags(hashtags);
- break;
- case 'statuses':
- filteredResults = renderStatuses(statuses);
- break;
+ {statuses.size > 0 && (
+
>} onClickMore={this.handleLoadMoreStatuses}>
+ {statuses.take(INITIAL_DISPLAY).map(id => )}
+
+ )}
+ >
+ ) : [];
+ break;
+ case "accounts":
+ filteredResults = renderAccounts(accounts);
+ break;
+ case "hashtags":
+ filteredResults = renderHashtags(hashtags);
+ break;
+ case "statuses":
+ filteredResults = renderStatuses(statuses);
+ break;
}
return (
diff --git a/app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx b/app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx
index 76d70bb94..fafee38c6 100644
--- a/app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx
+++ b/app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx
@@ -57,7 +57,7 @@ class Account extends ImmutablePureComponent {
let button;
- if (account.getIn(['relationship', 'following'])) {
+ if (account.getIn(["relationship", "following"])) {
button =
;
} else {
button =
;
diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx
index 5cfc30779..c9a9663f2 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@@ -140,7 +140,7 @@ class GettingStarted extends ImmutablePureComponent {
navItems.push(
);
}
- if (!columns.find(item => item.get('id') === 'PUBLIC')) {
+ if (!columns.find(item => item.get("id") === "PUBLIC")) {
navItems.push(
);
}
}
@@ -150,11 +150,11 @@ class GettingStarted extends ImmutablePureComponent {
}
if (signedIn) {
- if (!multiColumn || !columns.find(item => item.get('id') === 'DIRECT')) {
+ if (!multiColumn || !columns.find(item => item.get("id") === "DIRECT")) {
navItems.push(
);
}
- if (!multiColumn || !columns.find(item => item.get('id') === 'BOOKMARKS')) {
+ if (!multiColumn || !columns.find(item => item.get("id") === "BOOKMARKS")) {
navItems.push(
);
}
@@ -167,8 +167,8 @@ class GettingStarted extends ImmutablePureComponent {
listItems = listItems.concat([
- {lists.filter(list => !columns.find(item => item.get('id') === 'LIST' && item.getIn(['params', 'id']) === list.get('id'))).map(list =>
- ,
+ {lists.filter(list => !columns.find(item => item.get("id") === "LIST" && item.getIn(["params", "id"]) === list.get("id"))).map(list =>
+ ,
)}
,
]);
diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
index 23d18460b..08a38a84b 100644
--- a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
+++ b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
@@ -353,26 +353,26 @@ class InteractionModal extends React.PureComponent {
let title, actionDescription, icon;
switch(type) {
- case 'reply':
- icon =
;
- title =
;
- actionDescription =
;
- break;
- case 'reblog':
- icon =
;
- title =
;
- actionDescription =
;
- break;
- case 'favourite':
- icon =
;
- title =
;
- actionDescription =
;
- break;
- case 'follow':
- icon =
;
- title =
;
- actionDescription =
;
- break;
+ case "reply":
+ icon =
;
+ title =
;
+ actionDescription =
;
+ break;
+ case "reblog":
+ icon =
;
+ title =
;
+ actionDescription =
;
+ break;
+ case "favourite":
+ icon =
;
+ title =
;
+ actionDescription =
;
+ break;
+ case "follow":
+ icon =
;
+ title =
;
+ actionDescription =
;
+ break;
}
let signupButton;
diff --git a/app/javascript/flavours/glitch/features/list_adder/components/list.jsx b/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
index 0083298e0..d7b8baa8c 100644
--- a/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
+++ b/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
@@ -56,7 +56,7 @@ class List extends ImmutablePureComponent {
- {list.get('title')}
+ {list.get("title")}
diff --git a/app/javascript/flavours/glitch/features/lists/index.jsx b/app/javascript/flavours/glitch/features/lists/index.jsx
index fde16ddca..1d8bad390 100644
--- a/app/javascript/flavours/glitch/features/lists/index.jsx
+++ b/app/javascript/flavours/glitch/features/lists/index.jsx
@@ -76,7 +76,7 @@ class Lists extends ImmutablePureComponent {
bindToDocument={!multiColumn}
>
{lists.map(list =>
- ,
+ ,
)}
diff --git a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
index e87a290a6..3d95a3cb2 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
@@ -66,42 +66,42 @@ class FilterBar extends PureComponent {
onClick={this.onClick("mention")}
title={intl.formatMessage(tooltips.mentions)}
>
-
+
);
diff --git a/app/javascript/flavours/glitch/features/notifications/components/overlay.jsx b/app/javascript/flavours/glitch/features/notifications/components/overlay.jsx
index 90f3512f7..89b6ee32c 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/overlay.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/overlay.jsx
@@ -49,7 +49,7 @@ class NotificationOverlay extends ImmutablePureComponent {
>
- {active ? () : ''}
+ {active ? () : ""}
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index 49d0ef57f..e137ca558 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -174,11 +174,11 @@ class Footer extends ImmutablePureComponent {
let replyIcon, replyTitle;
- if (status.get('in_reply_to_id', null) === null) {
- replyIcon = 'arrow-bend-up-left';
+ if (status.get("in_reply_to_id", null) === null) {
+ replyIcon = "arrow-bend-up-left";
replyTitle = intl.formatMessage(messages.reply);
} else {
- replyIcon = 'arrow-bend-double-up-left';
+ replyIcon = "arrow-bend-double-up-left";
replyTitle = intl.formatMessage(messages.replyAll);
}
@@ -220,9 +220,9 @@ class Footer extends ImmutablePureComponent {
return (
{replyButton}
-
-
- {withOpenButton && }
+
+
+ {withOpenButton && }
);
}
diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
index fab7cb0ff..0e5c3a7b9 100644
--- a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
@@ -221,16 +221,16 @@ class ActionBar extends PureComponent {
return (
-
+
-
+
-
+
-
+
diff --git a/app/javascript/flavours/glitch/features/status/components/card.jsx b/app/javascript/flavours/glitch/features/status/components/card.jsx
index 8c09556e9..1d362d70b 100644
--- a/app/javascript/flavours/glitch/features/status/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/card.jsx
@@ -213,7 +213,7 @@ export default class Card extends PureComponent {
- {horizontal &&
}
+ {horizontal &&
}
)}
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index f84a48e33..894adf562 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -133,11 +133,11 @@ class DetailedStatus extends ImmutablePureComponent {
return null;
}
- let applicationLink = '';
- let reblogLink = '';
- let reblogIcon = 'rocket-launch';
- let favouriteLink = '';
- let edited = '';
+ let applicationLink = "";
+ let reblogLink = "";
+ let reblogIcon = "rocket-launch";
+ let favouriteLink = "";
+ let edited = "";
// Depending on user settings, some media are considered as parts of the
// contents (affected by CW) while other will be displayed outside of the
@@ -254,10 +254,10 @@ class DetailedStatus extends ImmutablePureComponent {
const visibilityLink = <> ·
>;
- if (status.get('visibility') === 'direct') {
- reblogIcon = 'at';
- } else if (status.get('visibility') === 'private') {
- reblogIcon = 'lock-simple';
+ if (status.get("visibility") === "direct") {
+ reblogIcon = "at";
+ } else if (status.get("visibility") === "private") {
+ reblogIcon = "lock-simple";
}
if (!["unlisted", "public"].includes(status.get("visibility"))) {
@@ -265,8 +265,8 @@ class DetailedStatus extends ImmutablePureComponent {
} else if (this.context.router) {
reblogLink = (
<>
- {' · '}
-
+ {" · "}
+
@@ -277,8 +277,8 @@ class DetailedStatus extends ImmutablePureComponent {
} else {
reblogLink = (
<>
- {' · '}
-
+ {" · "}
+
@@ -290,7 +290,7 @@ class DetailedStatus extends ImmutablePureComponent {
if (this.context.router) {
favouriteLink = (
-
+
@@ -299,7 +299,7 @@ class DetailedStatus extends ImmutablePureComponent {
);
} else {
favouriteLink = (
-
+
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 98845d2df..7a84a05a7 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -727,7 +727,7 @@ class Status extends ImmutablePureComponent {
showBackButton
multiColumn={multiColumn}
extraButton={(
-
+
)}
/>
diff --git a/app/javascript/flavours/glitch/features/ui/components/column_link.jsx b/app/javascript/flavours/glitch/features/ui/components/column_link.jsx
index 1918fc291..025dc72ae 100644
--- a/app/javascript/flavours/glitch/features/ui/components/column_link.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/column_link.jsx
@@ -3,12 +3,12 @@ import PropTypes from "prop-types";
import classNames from "classnames";
import { NavLink } from "react-router-dom";
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon } from "flavours/glitch/components/icon";
const ColumnLink = ({ icon, text, to, onClick, href, method, badge, transparent, ...other }) => {
- const className = classNames('column-link', { 'column-link--transparent': transparent });
- const badgeElement = typeof badge !== 'undefined' ? {badge} : null;
- const iconElement = typeof icon === 'string' ? : icon;
+ const className = classNames("column-link", { "column-link--transparent": transparent });
+ const badgeElement = typeof badge !== "undefined" ? {badge} : null;
+ const iconElement = typeof icon === "string" ? : icon;
if (href) {
return (
diff --git a/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx
index fae07c4d1..ee8fe8b28 100644
--- a/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx
@@ -596,8 +596,8 @@ class DoodleModal extends ImmutablePureComponent {
-
-
+
+
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.jsx b/app/javascript/flavours/glitch/features/ui/components/header.jsx
index 168d07a28..159b109d7 100644
--- a/app/javascript/flavours/glitch/features/ui/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/header.jsx
@@ -68,8 +68,8 @@ class Header extends PureComponent {
if (signedIn) {
content = (
<>
- {location.pathname !== '/search' &&
}
- {location.pathname !== '/publish' &&
}
+ {location.pathname !== "/search" &&
}
+ {location.pathname !== "/publish" &&
}
>
);
diff --git a/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx
index 5ac1be055..eae24db83 100644
--- a/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx
@@ -47,7 +47,7 @@ class ListPanel extends ImmutablePureComponent {
{lists.map(list => (
-
+
))}
);
diff --git a/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
index e6fa492c4..bcbd9c4e9 100644
--- a/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
@@ -212,7 +212,7 @@ class ReportModal extends ImmutablePureComponent {