Improve eslint rules (#3147)

* Add semi to ESLint rules

* Add padded-blocks to ESLint rules

* Add comma-dangle to ESLint rules

* add config/webpack and storyboard

* add streaming/

* yarn test:lint -- --fix

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 12bdf342a8b27a13c3a523fbdee73a57b6524ad5..59218cb24d337bbbcf058a818a1061785af23278 100644 (file)
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -47,6 +47,13 @@ rules:
   no-mixed-spaces-and-tabs: warn
   no-nested-ternary: warn
   no-trailing-spaces: warn
   no-mixed-spaces-and-tabs: warn
   no-nested-ternary: warn
   no-trailing-spaces: warn

+  semi: error
+  padded-blocks:
+  - error
+  - classes: always
+  comma-dangle:
+  - error
+  - always-multiline

 
   react/jsx-wrap-multilines: error
   react/jsx-no-bind: error
 
   react/jsx-wrap-multilines: error
   react/jsx-no-bind: error

diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index 2b7bce6812fa9df4e560605eba1c604ef8b69d6b..d093815e2f66568bb9e5b5212af8a59154a14dcb 100644 (file)
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -1,4 +1,4 @@
-import api, { getLinks } from '../api'
+import api, { getLinks } from '../api';

 import Immutable from 'immutable';
 
 export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
 import Immutable from 'immutable';
 
 export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';


@@ -154,8 +154,8 @@ export function expandAccountTimeline(id) {
     api(getState).get(`/api/v1/accounts/${id}/statuses`, {
       params: {
         limit: 10,
     api(getState).get(`/api/v1/accounts/${id}/statuses`, {
       params: {
         limit: 10,

-        max_id: lastId
-      }
+        max_id: lastId,
+      },

     }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandAccountTimelineSuccess(id, response.data, next));
     }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandAccountTimelineSuccess(id, response.data, next));


@@ -175,8 +175,8 @@ export function expandAccountMediaTimeline(id) {
       params: {
         limit: 12,
         only_media: 'true',
       params: {
         limit: 12,
         only_media: 'true',

-        max_id: lastId
-      }
+        max_id: lastId,
+      },

     }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandAccountMediaTimelineSuccess(id, response.data, next));
     }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandAccountMediaTimelineSuccess(id, response.data, next));


@@ -189,14 +189,14 @@ export function expandAccountMediaTimeline(id) {
 export function fetchAccountRequest(id) {
   return {
     type: ACCOUNT_FETCH_REQUEST,
 export function fetchAccountRequest(id) {
   return {
     type: ACCOUNT_FETCH_REQUEST,

-    id
+    id,

   };
 };
 
 export function fetchAccountSuccess(account) {
   return {
     type: ACCOUNT_FETCH_SUCCESS,
   };
 };
 
 export function fetchAccountSuccess(account) {
   return {
     type: ACCOUNT_FETCH_SUCCESS,

-    account
+    account,

   };
 };
 
   };
 };
 


@@ -205,7 +205,7 @@ export function fetchAccountFail(id, error) {
     type: ACCOUNT_FETCH_FAIL,
     id,
     error,
     type: ACCOUNT_FETCH_FAIL,
     id,
     error,

-    skipAlert: true
+    skipAlert: true,

   };
 };
 
   };
 };
 


@@ -230,48 +230,48 @@ export function unfollowAccount(id) {
     }).catch(error => {
       dispatch(unfollowAccountFail(error));
     });
     }).catch(error => {
       dispatch(unfollowAccountFail(error));
     });

-  }
+  };

 };
 
 export function followAccountRequest(id) {
   return {
     type: ACCOUNT_FOLLOW_REQUEST,
 };
 
 export function followAccountRequest(id) {
   return {
     type: ACCOUNT_FOLLOW_REQUEST,

-    id
+    id,

   };
 };
 
 export function followAccountSuccess(relationship) {
   return {
     type: ACCOUNT_FOLLOW_SUCCESS,
   };
 };
 
 export function followAccountSuccess(relationship) {
   return {
     type: ACCOUNT_FOLLOW_SUCCESS,

-    relationship
+    relationship,

   };
 };
 
 export function followAccountFail(error) {
   return {
     type: ACCOUNT_FOLLOW_FAIL,
   };
 };
 
 export function followAccountFail(error) {
   return {
     type: ACCOUNT_FOLLOW_FAIL,

-    error
+    error,

   };
 };
 
 export function unfollowAccountRequest(id) {
   return {
     type: ACCOUNT_UNFOLLOW_REQUEST,
   };
 };
 
 export function unfollowAccountRequest(id) {
   return {
     type: ACCOUNT_UNFOLLOW_REQUEST,

-    id
+    id,

   };
 };
 
 export function unfollowAccountSuccess(relationship) {
   return {
     type: ACCOUNT_UNFOLLOW_SUCCESS,
   };
 };
 
 export function unfollowAccountSuccess(relationship) {
   return {
     type: ACCOUNT_UNFOLLOW_SUCCESS,

-    relationship
+    relationship,

   };
 };
 
 export function unfollowAccountFail(error) {
   return {
     type: ACCOUNT_UNFOLLOW_FAIL,
   };
 };
 
 export function unfollowAccountFail(error) {
   return {
     type: ACCOUNT_UNFOLLOW_FAIL,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -279,7 +279,7 @@ export function fetchAccountTimelineRequest(id, skipLoading) {
   return {
     type: ACCOUNT_TIMELINE_FETCH_REQUEST,
     id,
   return {
     type: ACCOUNT_TIMELINE_FETCH_REQUEST,
     id,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -289,7 +289,7 @@ export function fetchAccountTimelineSuccess(id, statuses, replace, skipLoading)
     id,
     statuses,
     replace,
     id,
     statuses,
     replace,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -299,7 +299,7 @@ export function fetchAccountTimelineFail(id, error, skipLoading) {
     id,
     error,
     skipLoading,
     id,
     error,
     skipLoading,

-    skipAlert: error.response.status === 404
+    skipAlert: error.response.status === 404,

   };
 };
 
   };
 };
 


@@ -307,7 +307,7 @@ export function fetchAccountMediaTimelineRequest(id, skipLoading) {
   return {
     type: ACCOUNT_MEDIA_TIMELINE_FETCH_REQUEST,
     id,
   return {
     type: ACCOUNT_MEDIA_TIMELINE_FETCH_REQUEST,
     id,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -317,7 +317,7 @@ export function fetchAccountMediaTimelineSuccess(id, statuses, replace, skipLoad
     id,
     statuses,
     replace,
     id,
     statuses,
     replace,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -327,14 +327,14 @@ export function fetchAccountMediaTimelineFail(id, error, skipLoading) {
     id,
     error,
     skipLoading,
     id,
     error,
     skipLoading,

-    skipAlert: error.response.status === 404
+    skipAlert: error.response.status === 404,

   };
 };
 
 export function expandAccountTimelineRequest(id) {
   return {
     type: ACCOUNT_TIMELINE_EXPAND_REQUEST,
   };
 };
 
 export function expandAccountTimelineRequest(id) {
   return {
     type: ACCOUNT_TIMELINE_EXPAND_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -343,7 +343,7 @@ export function expandAccountTimelineSuccess(id, statuses, next) {
     type: ACCOUNT_TIMELINE_EXPAND_SUCCESS,
     id,
     statuses,
     type: ACCOUNT_TIMELINE_EXPAND_SUCCESS,
     id,
     statuses,

-    next
+    next,

   };
 };
 
   };
 };
 


@@ -351,14 +351,14 @@ export function expandAccountTimelineFail(id, error) {
   return {
     type: ACCOUNT_TIMELINE_EXPAND_FAIL,
     id,
   return {
     type: ACCOUNT_TIMELINE_EXPAND_FAIL,
     id,

-    error
+    error,

   };
 };
 
 export function expandAccountMediaTimelineRequest(id) {
   return {
     type: ACCOUNT_MEDIA_TIMELINE_EXPAND_REQUEST,
   };
 };
 
 export function expandAccountMediaTimelineRequest(id) {
   return {
     type: ACCOUNT_MEDIA_TIMELINE_EXPAND_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -367,7 +367,7 @@ export function expandAccountMediaTimelineSuccess(id, statuses, next) {
     type: ACCOUNT_MEDIA_TIMELINE_EXPAND_SUCCESS,
     id,
     statuses,
     type: ACCOUNT_MEDIA_TIMELINE_EXPAND_SUCCESS,
     id,
     statuses,

-    next
+    next,

   };
 };
 
   };
 };
 


@@ -375,7 +375,7 @@ export function expandAccountMediaTimelineFail(id, error) {
   return {
     type: ACCOUNT_MEDIA_TIMELINE_EXPAND_FAIL,
     id,
   return {
     type: ACCOUNT_MEDIA_TIMELINE_EXPAND_FAIL,
     id,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -407,7 +407,7 @@ export function unblockAccount(id) {
 export function blockAccountRequest(id) {
   return {
     type: ACCOUNT_BLOCK_REQUEST,
 export function blockAccountRequest(id) {
   return {
     type: ACCOUNT_BLOCK_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -415,35 +415,35 @@ export function blockAccountSuccess(relationship, statuses) {
   return {
     type: ACCOUNT_BLOCK_SUCCESS,
     relationship,
   return {
     type: ACCOUNT_BLOCK_SUCCESS,
     relationship,

-    statuses
+    statuses,

   };
 };
 
 export function blockAccountFail(error) {
   return {
     type: ACCOUNT_BLOCK_FAIL,
   };
 };
 
 export function blockAccountFail(error) {
   return {
     type: ACCOUNT_BLOCK_FAIL,

-    error
+    error,

   };
 };
 
 export function unblockAccountRequest(id) {
   return {
     type: ACCOUNT_UNBLOCK_REQUEST,
   };
 };
 
 export function unblockAccountRequest(id) {
   return {
     type: ACCOUNT_UNBLOCK_REQUEST,

-    id
+    id,

   };
 };
 
 export function unblockAccountSuccess(relationship) {
   return {
     type: ACCOUNT_UNBLOCK_SUCCESS,
   };
 };
 
 export function unblockAccountSuccess(relationship) {
   return {
     type: ACCOUNT_UNBLOCK_SUCCESS,

-    relationship
+    relationship,

   };
 };
 
 export function unblockAccountFail(error) {
   return {
     type: ACCOUNT_UNBLOCK_FAIL,
   };
 };
 
 export function unblockAccountFail(error) {
   return {
     type: ACCOUNT_UNBLOCK_FAIL,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -476,7 +476,7 @@ export function unmuteAccount(id) {
 export function muteAccountRequest(id) {
   return {
     type: ACCOUNT_MUTE_REQUEST,
 export function muteAccountRequest(id) {
   return {
     type: ACCOUNT_MUTE_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -484,35 +484,35 @@ export function muteAccountSuccess(relationship, statuses) {
   return {
     type: ACCOUNT_MUTE_SUCCESS,
     relationship,
   return {
     type: ACCOUNT_MUTE_SUCCESS,
     relationship,

-    statuses
+    statuses,

   };
 };
 
 export function muteAccountFail(error) {
   return {
     type: ACCOUNT_MUTE_FAIL,
   };
 };
 
 export function muteAccountFail(error) {
   return {
     type: ACCOUNT_MUTE_FAIL,

-    error
+    error,

   };
 };
 
 export function unmuteAccountRequest(id) {
   return {
     type: ACCOUNT_UNMUTE_REQUEST,
   };
 };
 
 export function unmuteAccountRequest(id) {
   return {
     type: ACCOUNT_UNMUTE_REQUEST,

-    id
+    id,

   };
 };
 
 export function unmuteAccountSuccess(relationship) {
   return {
     type: ACCOUNT_UNMUTE_SUCCESS,
   };
 };
 
 export function unmuteAccountSuccess(relationship) {
   return {
     type: ACCOUNT_UNMUTE_SUCCESS,

-    relationship
+    relationship,

   };
 };
 
 export function unmuteAccountFail(error) {
   return {
     type: ACCOUNT_UNMUTE_FAIL,
   };
 };
 
 export function unmuteAccountFail(error) {
   return {
     type: ACCOUNT_UNMUTE_FAIL,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -535,7 +535,7 @@ export function fetchFollowers(id) {
 export function fetchFollowersRequest(id) {
   return {
     type: FOLLOWERS_FETCH_REQUEST,
 export function fetchFollowersRequest(id) {
   return {
     type: FOLLOWERS_FETCH_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -544,7 +544,7 @@ export function fetchFollowersSuccess(id, accounts, next) {
     type: FOLLOWERS_FETCH_SUCCESS,
     id,
     accounts,
     type: FOLLOWERS_FETCH_SUCCESS,
     id,
     accounts,

-    next
+    next,

   };
 };
 
   };
 };
 


@@ -552,7 +552,7 @@ export function fetchFollowersFail(id, error) {
   return {
     type: FOLLOWERS_FETCH_FAIL,
     id,
   return {
     type: FOLLOWERS_FETCH_FAIL,
     id,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -580,7 +580,7 @@ export function expandFollowers(id) {
 export function expandFollowersRequest(id) {
   return {
     type: FOLLOWERS_EXPAND_REQUEST,
 export function expandFollowersRequest(id) {
   return {
     type: FOLLOWERS_EXPAND_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -589,7 +589,7 @@ export function expandFollowersSuccess(id, accounts, next) {
     type: FOLLOWERS_EXPAND_SUCCESS,
     id,
     accounts,
     type: FOLLOWERS_EXPAND_SUCCESS,
     id,
     accounts,

-    next
+    next,

   };
 };
 
   };
 };
 


@@ -597,7 +597,7 @@ export function expandFollowersFail(id, error) {
   return {
     type: FOLLOWERS_EXPAND_FAIL,
     id,
   return {
     type: FOLLOWERS_EXPAND_FAIL,
     id,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -619,7 +619,7 @@ export function fetchFollowing(id) {
 export function fetchFollowingRequest(id) {
   return {
     type: FOLLOWING_FETCH_REQUEST,
 export function fetchFollowingRequest(id) {
   return {
     type: FOLLOWING_FETCH_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -628,7 +628,7 @@ export function fetchFollowingSuccess(id, accounts, next) {
     type: FOLLOWING_FETCH_SUCCESS,
     id,
     accounts,
     type: FOLLOWING_FETCH_SUCCESS,
     id,
     accounts,

-    next
+    next,

   };
 };
 
   };
 };
 


@@ -636,7 +636,7 @@ export function fetchFollowingFail(id, error) {
   return {
     type: FOLLOWING_FETCH_FAIL,
     id,
   return {
     type: FOLLOWING_FETCH_FAIL,
     id,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -664,7 +664,7 @@ export function expandFollowing(id) {
 export function expandFollowingRequest(id) {
   return {
     type: FOLLOWING_EXPAND_REQUEST,
 export function expandFollowingRequest(id) {
   return {
     type: FOLLOWING_EXPAND_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -673,7 +673,7 @@ export function expandFollowingSuccess(id, accounts, next) {
     type: FOLLOWING_EXPAND_SUCCESS,
     id,
     accounts,
     type: FOLLOWING_EXPAND_SUCCESS,
     id,
     accounts,

-    next
+    next,

   };
 };
 
   };
 };
 


@@ -681,7 +681,7 @@ export function expandFollowingFail(id, error) {
   return {
     type: FOLLOWING_EXPAND_FAIL,
     id,
   return {
     type: FOLLOWING_EXPAND_FAIL,
     id,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -708,7 +708,7 @@ export function fetchRelationshipsRequest(ids) {
   return {
     type: RELATIONSHIPS_FETCH_REQUEST,
     ids,
   return {
     type: RELATIONSHIPS_FETCH_REQUEST,
     ids,

-    skipLoading: true
+    skipLoading: true,

   };
 };
 
   };
 };
 


@@ -716,7 +716,7 @@ export function fetchRelationshipsSuccess(relationships) {
   return {
     type: RELATIONSHIPS_FETCH_SUCCESS,
     relationships,
   return {
     type: RELATIONSHIPS_FETCH_SUCCESS,
     relationships,

-    skipLoading: true
+    skipLoading: true,

   };
 };
 
   };
 };
 


@@ -724,7 +724,7 @@ export function fetchRelationshipsFail(error) {
   return {
     type: RELATIONSHIPS_FETCH_FAIL,
     error,
   return {
     type: RELATIONSHIPS_FETCH_FAIL,
     error,

-    skipLoading: true
+    skipLoading: true,

   };
 };
 
   };
 };
 


@@ -734,14 +734,14 @@ export function fetchFollowRequests() {
 
     api(getState).get('/api/v1/follow_requests').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
     api(getState).get('/api/v1/follow_requests').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');

-      dispatch(fetchFollowRequestsSuccess(response.data, next ? next.uri : null))
+      dispatch(fetchFollowRequestsSuccess(response.data, next ? next.uri : null));

     }).catch(error => dispatch(fetchFollowRequestsFail(error)));
   };
 };
 
 export function fetchFollowRequestsRequest() {
   return {
     }).catch(error => dispatch(fetchFollowRequestsFail(error)));
   };
 };
 
 export function fetchFollowRequestsRequest() {
   return {

-    type: FOLLOW_REQUESTS_FETCH_REQUEST
+    type: FOLLOW_REQUESTS_FETCH_REQUEST,

   };
 };
 
   };
 };
 


@@ -749,14 +749,14 @@ export function fetchFollowRequestsSuccess(accounts, next) {
   return {
     type: FOLLOW_REQUESTS_FETCH_SUCCESS,
     accounts,
   return {
     type: FOLLOW_REQUESTS_FETCH_SUCCESS,
     accounts,

-    next
+    next,

   };
 };
 
 export function fetchFollowRequestsFail(error) {
   return {
     type: FOLLOW_REQUESTS_FETCH_FAIL,
   };
 };
 
 export function fetchFollowRequestsFail(error) {
   return {
     type: FOLLOW_REQUESTS_FETCH_FAIL,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -772,14 +772,14 @@ export function expandFollowRequests() {
 
     api(getState).get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
     api(getState).get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');

-      dispatch(expandFollowRequestsSuccess(response.data, next ? next.uri : null))
+      dispatch(expandFollowRequestsSuccess(response.data, next ? next.uri : null));

     }).catch(error => dispatch(expandFollowRequestsFail(error)));
   };
 };
 
 export function expandFollowRequestsRequest() {
   return {
     }).catch(error => dispatch(expandFollowRequestsFail(error)));
   };
 };
 
 export function expandFollowRequestsRequest() {
   return {

-    type: FOLLOW_REQUESTS_EXPAND_REQUEST
+    type: FOLLOW_REQUESTS_EXPAND_REQUEST,

   };
 };
 
   };
 };
 


@@ -787,14 +787,14 @@ export function expandFollowRequestsSuccess(accounts, next) {
   return {
     type: FOLLOW_REQUESTS_EXPAND_SUCCESS,
     accounts,
   return {
     type: FOLLOW_REQUESTS_EXPAND_SUCCESS,
     accounts,

-    next
+    next,

   };
 };
 
 export function expandFollowRequestsFail(error) {
   return {
     type: FOLLOW_REQUESTS_EXPAND_FAIL,
   };
 };
 
 export function expandFollowRequestsFail(error) {
   return {
     type: FOLLOW_REQUESTS_EXPAND_FAIL,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -812,14 +812,14 @@ export function authorizeFollowRequest(id) {
 export function authorizeFollowRequestRequest(id) {
   return {
     type: FOLLOW_REQUEST_AUTHORIZE_REQUEST,
 export function authorizeFollowRequestRequest(id) {
   return {
     type: FOLLOW_REQUEST_AUTHORIZE_REQUEST,

-    id
+    id,

   };
 };
 
 export function authorizeFollowRequestSuccess(id) {
   return {
     type: FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
   };
 };
 
 export function authorizeFollowRequestSuccess(id) {
   return {
     type: FOLLOW_REQUEST_AUTHORIZE_SUCCESS,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -827,7 +827,7 @@ export function authorizeFollowRequestFail(id, error) {
   return {
     type: FOLLOW_REQUEST_AUTHORIZE_FAIL,
     id,
   return {
     type: FOLLOW_REQUEST_AUTHORIZE_FAIL,
     id,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -846,14 +846,14 @@ export function rejectFollowRequest(id) {
 export function rejectFollowRequestRequest(id) {
   return {
     type: FOLLOW_REQUEST_REJECT_REQUEST,
 export function rejectFollowRequestRequest(id) {
   return {
     type: FOLLOW_REQUEST_REJECT_REQUEST,

-    id
+    id,

   };
 };
 
 export function rejectFollowRequestSuccess(id) {
   return {
     type: FOLLOW_REQUEST_REJECT_SUCCESS,
   };
 };
 
 export function rejectFollowRequestSuccess(id) {
   return {
     type: FOLLOW_REQUEST_REJECT_SUCCESS,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -861,6 +861,6 @@ export function rejectFollowRequestFail(id, error) {
   return {
     type: FOLLOW_REQUEST_REJECT_FAIL,
     id,
   return {
     type: FOLLOW_REQUEST_REJECT_FAIL,
     id,

-    error
+    error,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/alerts.js b/app/javascript/mastodon/actions/alerts.js
index 086e0727ec2208b47c7477c566090a260ed26716..f37fdeeb6ab353724544e86231972d55f72b6185 100644 (file)
--- a/app/javascript/mastodon/actions/alerts.js
+++ b/app/javascript/mastodon/actions/alerts.js
@@ -5,13 +5,13 @@ export const ALERT_CLEAR   = 'ALERT_CLEAR';
 export function dismissAlert(alert) {
   return {
     type: ALERT_DISMISS,
 export function dismissAlert(alert) {
   return {
     type: ALERT_DISMISS,

-    alert
+    alert,

   };
 };
 
 export function clearAlert() {
   return {
   };
 };
 
 export function clearAlert() {
   return {

-    type: ALERT_CLEAR
+    type: ALERT_CLEAR,

   };
 };
 
   };
 };
 


@@ -19,6 +19,6 @@ export function showAlert(title, message) {
   return {
     type: ALERT_SHOW,
     title,
   return {
     type: ALERT_SHOW,
     title,

-    message
+    message,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/blocks.js b/app/javascript/mastodon/actions/blocks.js
index 79e316497ff675bfb4c5277aa9472574d57e2187..553283a71f54bc8962f9159150e9d1cf1dcd4c51 100644 (file)
--- a/app/javascript/mastodon/actions/blocks.js
+++ b/app/javascript/mastodon/actions/blocks.js
@@ -1,4 +1,4 @@
-import api, { getLinks } from '../api'
+import api, { getLinks } from '../api';

 import { fetchRelationships } from './accounts';
 
 export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
 import { fetchRelationships } from './accounts';
 
 export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';


@@ -23,7 +23,7 @@ export function fetchBlocks() {
 
 export function fetchBlocksRequest() {
   return {
 
 export function fetchBlocksRequest() {
   return {

-    type: BLOCKS_FETCH_REQUEST
+    type: BLOCKS_FETCH_REQUEST,

   };
 };
 
   };
 };
 


@@ -31,14 +31,14 @@ export function fetchBlocksSuccess(accounts, next) {
   return {
     type: BLOCKS_FETCH_SUCCESS,
     accounts,
   return {
     type: BLOCKS_FETCH_SUCCESS,
     accounts,

-    next
+    next,

   };
 };
 
 export function fetchBlocksFail(error) {
   return {
     type: BLOCKS_FETCH_FAIL,
   };
 };
 
 export function fetchBlocksFail(error) {
   return {
     type: BLOCKS_FETCH_FAIL,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -62,7 +62,7 @@ export function expandBlocks() {
 
 export function expandBlocksRequest() {
   return {
 
 export function expandBlocksRequest() {
   return {

-    type: BLOCKS_EXPAND_REQUEST
+    type: BLOCKS_EXPAND_REQUEST,

   };
 };
 
   };
 };
 


@@ -70,13 +70,13 @@ export function expandBlocksSuccess(accounts, next) {
   return {
     type: BLOCKS_EXPAND_SUCCESS,
     accounts,
   return {
     type: BLOCKS_EXPAND_SUCCESS,
     accounts,

-    next
+    next,

   };
 };
 
 export function expandBlocksFail(error) {
   return {
     type: BLOCKS_EXPAND_FAIL,
   };
 };
 
 export function expandBlocksFail(error) {
   return {
     type: BLOCKS_EXPAND_FAIL,

-    error
+    error,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/cards.js b/app/javascript/mastodon/actions/cards.js
index 805be9709ba62b0212da7a09cd25dd5e464f014c..baf04833a2c97810d370cec64db2a9c374f4ab6e 100644 (file)
--- a/app/javascript/mastodon/actions/cards.js
+++ b/app/javascript/mastodon/actions/cards.js
@@ -28,7 +28,7 @@ export function fetchStatusCardRequest(id) {
   return {
     type: STATUS_CARD_FETCH_REQUEST,
     id,
   return {
     type: STATUS_CARD_FETCH_REQUEST,
     id,

-    skipLoading: true
+    skipLoading: true,

   };
 };
 
   };
 };
 


@@ -37,7 +37,7 @@ export function fetchStatusCardSuccess(id, card) {
     type: STATUS_CARD_FETCH_SUCCESS,
     id,
     card,
     type: STATUS_CARD_FETCH_SUCCESS,
     id,
     card,

-    skipLoading: true
+    skipLoading: true,

   };
 };
 
   };
 };
 


@@ -47,6 +47,6 @@ export function fetchStatusCardFail(id, error) {
     id,
     error,
     skipLoading: true,
     id,
     error,
     skipLoading: true,

-    skipAlert: true
+    skipAlert: true,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index d7ff6ea63f859a906449adb3fb4ca7e3e1d59126..647a52b9325454dce84f1530316e3c7e4cf93c75 100644 (file)
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -35,7 +35,7 @@ export const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT';
 export function changeCompose(text) {
   return {
     type: COMPOSE_CHANGE,
 export function changeCompose(text) {
   return {
     type: COMPOSE_CHANGE,

-    text: text
+    text: text,

   };
 };
 
   };
 };
 


@@ -43,7 +43,7 @@ export function replyCompose(status, router) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_REPLY,
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_REPLY,

-      status: status
+      status: status,

     });
 
     if (!getState().getIn(['compose', 'mounted'])) {
     });
 
     if (!getState().getIn(['compose', 'mounted'])) {


@@ -54,7 +54,7 @@ export function replyCompose(status, router) {
 
 export function cancelReplyCompose() {
   return {
 
 export function cancelReplyCompose() {
   return {

-    type: COMPOSE_REPLY_CANCEL
+    type: COMPOSE_REPLY_CANCEL,

   };
 };
 
   };
 };
 


@@ -62,7 +62,7 @@ export function mentionCompose(account, router) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_MENTION,
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_MENTION,

-      account: account
+      account: account,

     });
 
     if (!getState().getIn(['compose', 'mounted'])) {
     });
 
     if (!getState().getIn(['compose', 'mounted'])) {


@@ -84,11 +84,11 @@ export function submitCompose() {
       media_ids: getState().getIn(['compose', 'media_attachments']).map(item => item.get('id')),
       sensitive: getState().getIn(['compose', 'sensitive']),
       spoiler_text: getState().getIn(['compose', 'spoiler_text'], ''),
       media_ids: getState().getIn(['compose', 'media_attachments']).map(item => item.get('id')),
       sensitive: getState().getIn(['compose', 'sensitive']),
       spoiler_text: getState().getIn(['compose', 'spoiler_text'], ''),

-      visibility: getState().getIn(['compose', 'privacy'])
+      visibility: getState().getIn(['compose', 'privacy']),

     }, {
       headers: {
     }, {
       headers: {

-        'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey'])
-      }
+        'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
+      },

     }).then(function (response) {
       dispatch(submitComposeSuccess({ ...response.data }));
 
     }).then(function (response) {
       dispatch(submitComposeSuccess({ ...response.data }));
 


@@ -112,21 +112,21 @@ export function submitCompose() {
 
 export function submitComposeRequest() {
   return {
 
 export function submitComposeRequest() {
   return {

-    type: COMPOSE_SUBMIT_REQUEST
+    type: COMPOSE_SUBMIT_REQUEST,

   };
 };
 
 export function submitComposeSuccess(status) {
   return {
     type: COMPOSE_SUBMIT_SUCCESS,
   };
 };
 
 export function submitComposeSuccess(status) {
   return {
     type: COMPOSE_SUBMIT_SUCCESS,

-    status: status
+    status: status,

   };
 };
 
 export function submitComposeFail(error) {
   return {
     type: COMPOSE_SUBMIT_FAIL,
   };
 };
 
 export function submitComposeFail(error) {
   return {
     type: COMPOSE_SUBMIT_FAIL,

-    error: error
+    error: error,

   };
 };
 
   };
 };
 


@@ -144,7 +144,7 @@ export function uploadCompose(files) {
     api(getState).post('/api/v1/media', data, {
       onUploadProgress: function (e) {
         dispatch(uploadComposeProgress(e.loaded, e.total));
     api(getState).post('/api/v1/media', data, {
       onUploadProgress: function (e) {
         dispatch(uploadComposeProgress(e.loaded, e.total));

-      }
+      },

     }).then(function (response) {
       dispatch(uploadComposeSuccess(response.data));
     }).catch(function (error) {
     }).then(function (response) {
       dispatch(uploadComposeSuccess(response.data));
     }).catch(function (error) {


@@ -156,7 +156,7 @@ export function uploadCompose(files) {
 export function uploadComposeRequest() {
   return {
     type: COMPOSE_UPLOAD_REQUEST,
 export function uploadComposeRequest() {
   return {
     type: COMPOSE_UPLOAD_REQUEST,

-    skipLoading: true
+    skipLoading: true,

   };
 };
 
   };
 };
 


@@ -164,7 +164,7 @@ export function uploadComposeProgress(loaded, total) {
   return {
     type: COMPOSE_UPLOAD_PROGRESS,
     loaded: loaded,
   return {
     type: COMPOSE_UPLOAD_PROGRESS,
     loaded: loaded,

-    total: total
+    total: total,

   };
 };
 
   };
 };
 


@@ -172,7 +172,7 @@ export function uploadComposeSuccess(media) {
   return {
     type: COMPOSE_UPLOAD_SUCCESS,
     media: media,
   return {
     type: COMPOSE_UPLOAD_SUCCESS,
     media: media,

-    skipLoading: true
+    skipLoading: true,

   };
 };
 
   };
 };
 


@@ -180,20 +180,20 @@ export function uploadComposeFail(error) {
   return {
     type: COMPOSE_UPLOAD_FAIL,
     error: error,
   return {
     type: COMPOSE_UPLOAD_FAIL,
     error: error,

-    skipLoading: true
+    skipLoading: true,

   };
 };
 
 export function undoUploadCompose(media_id) {
   return {
     type: COMPOSE_UPLOAD_UNDO,
   };
 };
 
 export function undoUploadCompose(media_id) {
   return {
     type: COMPOSE_UPLOAD_UNDO,

-    media_id: media_id
+    media_id: media_id,

   };
 };
 
 export function clearComposeSuggestions() {
   return {
   };
 };
 
 export function clearComposeSuggestions() {
   return {

-    type: COMPOSE_SUGGESTIONS_CLEAR
+    type: COMPOSE_SUGGESTIONS_CLEAR,

   };
 };
 
   };
 };
 


@@ -203,8 +203,8 @@ export function fetchComposeSuggestions(token) {
       params: {
         q: token,
         resolve: false,
       params: {
         q: token,
         resolve: false,

-        limit: 4
-      }
+        limit: 4,
+      },

     }).then(response => {
       dispatch(readyComposeSuggestions(token, response.data));
     });
     }).then(response => {
       dispatch(readyComposeSuggestions(token, response.data));
     });


@@ -215,7 +215,7 @@ export function readyComposeSuggestions(token, accounts) {
   return {
     type: COMPOSE_SUGGESTIONS_READY,
     token,
   return {
     type: COMPOSE_SUGGESTIONS_READY,
     token,

-    accounts
+    accounts,

   };
 };
 
   };
 };
 


@@ -227,20 +227,20 @@ export function selectComposeSuggestion(position, token, accountId) {
       type: COMPOSE_SUGGESTION_SELECT,
       position,
       token,
       type: COMPOSE_SUGGESTION_SELECT,
       position,
       token,

-      completion
+      completion,

     });
   };
 };
 
 export function mountCompose() {
   return {
     });
   };
 };
 
 export function mountCompose() {
   return {

-    type: COMPOSE_MOUNT
+    type: COMPOSE_MOUNT,

   };
 };
 
 export function unmountCompose() {
   return {
   };
 };
 
 export function unmountCompose() {
   return {

-    type: COMPOSE_UNMOUNT
+    type: COMPOSE_UNMOUNT,

   };
 };
 
   };
 };
 


@@ -252,21 +252,21 @@ export function changeComposeSensitivity() {
 
 export function changeComposeSpoilerness() {
   return {
 
 export function changeComposeSpoilerness() {
   return {

-    type: COMPOSE_SPOILERNESS_CHANGE
+    type: COMPOSE_SPOILERNESS_CHANGE,

   };
 };
 
 export function changeComposeSpoilerText(text) {
   return {
     type: COMPOSE_SPOILER_TEXT_CHANGE,
   };
 };
 
 export function changeComposeSpoilerText(text) {
   return {
     type: COMPOSE_SPOILER_TEXT_CHANGE,

-    text
+    text,

   };
 };
 
 export function changeComposeVisibility(value) {
   return {
     type: COMPOSE_VISIBILITY_CHANGE,
   };
 };
 
 export function changeComposeVisibility(value) {
   return {
     type: COMPOSE_VISIBILITY_CHANGE,

-    value
+    value,

   };
 };
 
   };
 };
 


@@ -274,6 +274,6 @@ export function insertEmojiCompose(position, emoji) {
   return {
     type: COMPOSE_EMOJI_INSERT,
     position,
   return {
     type: COMPOSE_EMOJI_INSERT,
     position,

-    emoji
+    emoji,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/domain_blocks.js b/app/javascript/mastodon/actions/domain_blocks.js
index c884981176b5922bfcff23ab9c9850590ec593c5..530ba9cf1ddd14525a5b2de3f7bc3f49fb954a33 100644 (file)
--- a/app/javascript/mastodon/actions/domain_blocks.js
+++ b/app/javascript/mastodon/actions/domain_blocks.js
@@ -1,4 +1,4 @@
-import api, { getLinks } from '../api'
+import api, { getLinks } from '../api';

 
 export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
 export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';
 
 export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
 export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';


@@ -27,7 +27,7 @@ export function blockDomain(domain, accountId) {
 export function blockDomainRequest(domain) {
   return {
     type: DOMAIN_BLOCK_REQUEST,
 export function blockDomainRequest(domain) {
   return {
     type: DOMAIN_BLOCK_REQUEST,

-    domain
+    domain,

   };
 };
 
   };
 };
 


@@ -35,7 +35,7 @@ export function blockDomainSuccess(domain, accountId) {
   return {
     type: DOMAIN_BLOCK_SUCCESS,
     domain,
   return {
     type: DOMAIN_BLOCK_SUCCESS,
     domain,

-    accountId
+    accountId,

   };
 };
 
   };
 };
 


@@ -43,7 +43,7 @@ export function blockDomainFail(domain, error) {
   return {
     type: DOMAIN_BLOCK_FAIL,
     domain,
   return {
     type: DOMAIN_BLOCK_FAIL,
     domain,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -62,7 +62,7 @@ export function unblockDomain(domain, accountId) {
 export function unblockDomainRequest(domain) {
   return {
     type: DOMAIN_UNBLOCK_REQUEST,
 export function unblockDomainRequest(domain) {
   return {
     type: DOMAIN_UNBLOCK_REQUEST,

-    domain
+    domain,

   };
 };
 
   };
 };
 


@@ -70,7 +70,7 @@ export function unblockDomainSuccess(domain, accountId) {
   return {
     type: DOMAIN_UNBLOCK_SUCCESS,
     domain,
   return {
     type: DOMAIN_UNBLOCK_SUCCESS,
     domain,

-    accountId
+    accountId,

   };
 };
 
   };
 };
 


@@ -78,7 +78,7 @@ export function unblockDomainFail(domain, error) {
   return {
     type: DOMAIN_UNBLOCK_FAIL,
     domain,
   return {
     type: DOMAIN_UNBLOCK_FAIL,
     domain,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -97,7 +97,7 @@ export function fetchDomainBlocks() {
 
 export function fetchDomainBlocksRequest() {
   return {
 
 export function fetchDomainBlocksRequest() {
   return {

-    type: DOMAIN_BLOCKS_FETCH_REQUEST
+    type: DOMAIN_BLOCKS_FETCH_REQUEST,

   };
 };
 
   };
 };
 


@@ -105,13 +105,13 @@ export function fetchDomainBlocksSuccess(domains, next) {
   return {
     type: DOMAIN_BLOCKS_FETCH_SUCCESS,
     domains,
   return {
     type: DOMAIN_BLOCKS_FETCH_SUCCESS,
     domains,

-    next
+    next,

   };
 };
 
 export function fetchDomainBlocksFail(error) {
   return {
     type: DOMAIN_BLOCKS_FETCH_FAIL,
   };
 };
 
 export function fetchDomainBlocksFail(error) {
   return {
     type: DOMAIN_BLOCKS_FETCH_FAIL,

-    error
+    error,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/favourites.js b/app/javascript/mastodon/actions/favourites.js
index a25c1ae1c861e5d386eeb1683289ab7260dab1bb..09ce51fceb300bd0ec230d609bc0b13f6dd20174 100644 (file)
--- a/app/javascript/mastodon/actions/favourites.js
+++ b/app/javascript/mastodon/actions/favourites.js
@@ -1,4 +1,4 @@
-import api, { getLinks } from '../api'
+import api, { getLinks } from '../api';

 
 export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
 export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
 
 export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
 export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';


@@ -23,7 +23,7 @@ export function fetchFavouritedStatuses() {
 
 export function fetchFavouritedStatusesRequest() {
   return {
 
 export function fetchFavouritedStatusesRequest() {
   return {

-    type: FAVOURITED_STATUSES_FETCH_REQUEST
+    type: FAVOURITED_STATUSES_FETCH_REQUEST,

   };
 };
 
   };
 };
 


@@ -31,14 +31,14 @@ export function fetchFavouritedStatusesSuccess(statuses, next) {
   return {
     type: FAVOURITED_STATUSES_FETCH_SUCCESS,
     statuses,
   return {
     type: FAVOURITED_STATUSES_FETCH_SUCCESS,
     statuses,

-    next
+    next,

   };
 };
 
 export function fetchFavouritedStatusesFail(error) {
   return {
     type: FAVOURITED_STATUSES_FETCH_FAIL,
   };
 };
 
 export function fetchFavouritedStatusesFail(error) {
   return {
     type: FAVOURITED_STATUSES_FETCH_FAIL,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -63,7 +63,7 @@ export function expandFavouritedStatuses() {
 
 export function expandFavouritedStatusesRequest() {
   return {
 
 export function expandFavouritedStatusesRequest() {
   return {

-    type: FAVOURITED_STATUSES_EXPAND_REQUEST
+    type: FAVOURITED_STATUSES_EXPAND_REQUEST,

   };
 };
 
   };
 };
 


@@ -71,13 +71,13 @@ export function expandFavouritedStatusesSuccess(statuses, next) {
   return {
     type: FAVOURITED_STATUSES_EXPAND_SUCCESS,
     statuses,
   return {
     type: FAVOURITED_STATUSES_EXPAND_SUCCESS,
     statuses,

-    next
+    next,

   };
 };
 
 export function expandFavouritedStatusesFail(error) {
   return {
     type: FAVOURITED_STATUSES_EXPAND_FAIL,
   };
 };
 
 export function expandFavouritedStatusesFail(error) {
   return {
     type: FAVOURITED_STATUSES_EXPAND_FAIL,

-    error
+    error,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index 45f4508f6982b6890db43cb70340816a757bcef6..36eec4934f02213ee44f60688f26654668df72ce 100644 (file)
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -1,4 +1,4 @@
-import api from '../api'
+import api from '../api';

 
 export const REBLOG_REQUEST = 'REBLOG_REQUEST';
 export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
 
 export const REBLOG_REQUEST = 'REBLOG_REQUEST';
 export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';


@@ -53,7 +53,7 @@ export function unreblog(status) {
 export function reblogRequest(status) {
   return {
     type: REBLOG_REQUEST,
 export function reblogRequest(status) {
   return {
     type: REBLOG_REQUEST,

-    status: status
+    status: status,

   };
 };
 
   };
 };
 


@@ -61,7 +61,7 @@ export function reblogSuccess(status, response) {
   return {
     type: REBLOG_SUCCESS,
     status: status,
   return {
     type: REBLOG_SUCCESS,
     status: status,

-    response: response
+    response: response,

   };
 };
 
   };
 };
 


@@ -69,14 +69,14 @@ export function reblogFail(status, error) {
   return {
     type: REBLOG_FAIL,
     status: status,
   return {
     type: REBLOG_FAIL,
     status: status,

-    error: error
+    error: error,

   };
 };
 
 export function unreblogRequest(status) {
   return {
     type: UNREBLOG_REQUEST,
   };
 };
 
 export function unreblogRequest(status) {
   return {
     type: UNREBLOG_REQUEST,

-    status: status
+    status: status,

   };
 };
 
   };
 };
 


@@ -84,7 +84,7 @@ export function unreblogSuccess(status, response) {
   return {
     type: UNREBLOG_SUCCESS,
     status: status,
   return {
     type: UNREBLOG_SUCCESS,
     status: status,

-    response: response
+    response: response,

   };
 };
 
   };
 };
 


@@ -92,7 +92,7 @@ export function unreblogFail(status, error) {
   return {
     type: UNREBLOG_FAIL,
     status: status,
   return {
     type: UNREBLOG_FAIL,
     status: status,

-    error: error
+    error: error,

   };
 };
 
   };
 };
 


@@ -123,7 +123,7 @@ export function unfavourite(status) {
 export function favouriteRequest(status) {
   return {
     type: FAVOURITE_REQUEST,
 export function favouriteRequest(status) {
   return {
     type: FAVOURITE_REQUEST,

-    status: status
+    status: status,

   };
 };
 
   };
 };
 


@@ -131,7 +131,7 @@ export function favouriteSuccess(status, response) {
   return {
     type: FAVOURITE_SUCCESS,
     status: status,
   return {
     type: FAVOURITE_SUCCESS,
     status: status,

-    response: response
+    response: response,

   };
 };
 
   };
 };
 


@@ -139,14 +139,14 @@ export function favouriteFail(status, error) {
   return {
     type: FAVOURITE_FAIL,
     status: status,
   return {
     type: FAVOURITE_FAIL,
     status: status,

-    error: error
+    error: error,

   };
 };
 
 export function unfavouriteRequest(status) {
   return {
     type: UNFAVOURITE_REQUEST,
   };
 };
 
 export function unfavouriteRequest(status) {
   return {
     type: UNFAVOURITE_REQUEST,

-    status: status
+    status: status,

   };
 };
 
   };
 };
 


@@ -154,7 +154,7 @@ export function unfavouriteSuccess(status, response) {
   return {
     type: UNFAVOURITE_SUCCESS,
     status: status,
   return {
     type: UNFAVOURITE_SUCCESS,
     status: status,

-    response: response
+    response: response,

   };
 };
 
   };
 };
 


@@ -162,7 +162,7 @@ export function unfavouriteFail(status, error) {
   return {
     type: UNFAVOURITE_FAIL,
     status: status,
   return {
     type: UNFAVOURITE_FAIL,
     status: status,

-    error: error
+    error: error,

   };
 };
 
   };
 };
 


@@ -181,7 +181,7 @@ export function fetchReblogs(id) {
 export function fetchReblogsRequest(id) {
   return {
     type: REBLOGS_FETCH_REQUEST,
 export function fetchReblogsRequest(id) {
   return {
     type: REBLOGS_FETCH_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -189,14 +189,14 @@ export function fetchReblogsSuccess(id, accounts) {
   return {
     type: REBLOGS_FETCH_SUCCESS,
     id,
   return {
     type: REBLOGS_FETCH_SUCCESS,
     id,

-    accounts
+    accounts,

   };
 };
 
 export function fetchReblogsFail(id, error) {
   return {
     type: REBLOGS_FETCH_FAIL,
   };
 };
 
 export function fetchReblogsFail(id, error) {
   return {
     type: REBLOGS_FETCH_FAIL,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -215,7 +215,7 @@ export function fetchFavourites(id) {
 export function fetchFavouritesRequest(id) {
   return {
     type: FAVOURITES_FETCH_REQUEST,
 export function fetchFavouritesRequest(id) {
   return {
     type: FAVOURITES_FETCH_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -223,13 +223,13 @@ export function fetchFavouritesSuccess(id, accounts) {
   return {
     type: FAVOURITES_FETCH_SUCCESS,
     id,
   return {
     type: FAVOURITES_FETCH_SUCCESS,
     id,

-    accounts
+    accounts,

   };
 };
 
 export function fetchFavouritesFail(id, error) {
   return {
     type: FAVOURITES_FETCH_FAIL,
   };
 };
 
 export function fetchFavouritesFail(id, error) {
   return {
     type: FAVOURITES_FETCH_FAIL,

-    error
+    error,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/modal.js b/app/javascript/mastodon/actions/modal.js
index 615cd6bfe82dfaed7bba5531c49cbe6497de9871..80e15c28ec17889413039375509900ffdfbddc50 100644 (file)
--- a/app/javascript/mastodon/actions/modal.js
+++ b/app/javascript/mastodon/actions/modal.js
@@ -5,12 +5,12 @@ export function openModal(type, props) {
   return {
     type: MODAL_OPEN,
     modalType: type,
   return {
     type: MODAL_OPEN,
     modalType: type,

-    modalProps: props
+    modalProps: props,

   };
 };
 
 export function closeModal() {
   return {
   };
 };
 
 export function closeModal() {
   return {

-    type: MODAL_CLOSE
+    type: MODAL_CLOSE,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/mutes.js b/app/javascript/mastodon/actions/mutes.js
index 824821594c741d077a1651b079d562810a25fb9b..febda7219a84d5a2f4d856bdd7b0f1b310c7703e 100644 (file)
--- a/app/javascript/mastodon/actions/mutes.js
+++ b/app/javascript/mastodon/actions/mutes.js
@@ -1,4 +1,4 @@
-import api, { getLinks } from '../api'
+import api, { getLinks } from '../api';

 import { fetchRelationships } from './accounts';
 
 export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
 import { fetchRelationships } from './accounts';
 
 export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';


@@ -23,7 +23,7 @@ export function fetchMutes() {
 
 export function fetchMutesRequest() {
   return {
 
 export function fetchMutesRequest() {
   return {

-    type: MUTES_FETCH_REQUEST
+    type: MUTES_FETCH_REQUEST,

   };
 };
 
   };
 };
 


@@ -31,14 +31,14 @@ export function fetchMutesSuccess(accounts, next) {
   return {
     type: MUTES_FETCH_SUCCESS,
     accounts,
   return {
     type: MUTES_FETCH_SUCCESS,
     accounts,

-    next
+    next,

   };
 };
 
 export function fetchMutesFail(error) {
   return {
     type: MUTES_FETCH_FAIL,
   };
 };
 
 export function fetchMutesFail(error) {
   return {
     type: MUTES_FETCH_FAIL,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -62,7 +62,7 @@ export function expandMutes() {
 
 export function expandMutesRequest() {
   return {
 
 export function expandMutesRequest() {
   return {

-    type: MUTES_EXPAND_REQUEST
+    type: MUTES_EXPAND_REQUEST,

   };
 };
 
   };
 };
 


@@ -70,13 +70,13 @@ export function expandMutesSuccess(accounts, next) {
   return {
     type: MUTES_EXPAND_SUCCESS,
     accounts,
   return {
     type: MUTES_EXPAND_SUCCESS,
     accounts,

-    next
+    next,

   };
 };
 
 export function expandMutesFail(error) {
   return {
     type: MUTES_EXPAND_FAIL,
   };
 };
 
 export function expandMutesFail(error) {
   return {
     type: MUTES_EXPAND_FAIL,

-    error
+    error,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index da3d562d507791b2cb679b36742c8e7ac998457d..51b06ed3248e4c961da3e8558f102e798327f2e7 100644 (file)
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -1,4 +1,4 @@
-import api, { getLinks } from '../api'
+import api, { getLinks } from '../api';

 import Immutable from 'immutable';
 import IntlMessageFormat from 'intl-messageformat';
 import { fetchRelationships } from './accounts';
 import Immutable from 'immutable';
 import IntlMessageFormat from 'intl-messageformat';
 import { fetchRelationships } from './accounts';


@@ -33,7 +33,7 @@ const unescapeHTML = (html) => {
   const wrapper = document.createElement('div');
   wrapper.innerHTML = html;
   return wrapper.textContent;
   const wrapper = document.createElement('div');
   wrapper.innerHTML = html;
   return wrapper.textContent;

-}
+};

 
 export function updateNotifications(notification, intlMessages, intlLocale) {
   return (dispatch, getState) => {
 
 export function updateNotifications(notification, intlMessages, intlLocale) {
   return (dispatch, getState) => {


@@ -45,7 +45,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
       notification,
       account: notification.account,
       status: notification.status,
       notification,
       account: notification.account,
       status: notification.status,

-      meta: playSound ? { sound: 'boop' } : undefined
+      meta: playSound ? { sound: 'boop' } : undefined,

     });
 
     fetchRelatedRelationships(dispatch, [notification]);
     });
 
     fetchRelatedRelationships(dispatch, [notification]);


@@ -99,7 +99,7 @@ export function refreshNotifications() {
 export function refreshNotificationsRequest(skipLoading) {
   return {
     type: NOTIFICATIONS_REFRESH_REQUEST,
 export function refreshNotificationsRequest(skipLoading) {
   return {
     type: NOTIFICATIONS_REFRESH_REQUEST,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -110,7 +110,7 @@ export function refreshNotificationsSuccess(notifications, skipLoading, next) {
     accounts: notifications.map(item => item.account),
     statuses: notifications.map(item => item.status).filter(status => !!status),
     skipLoading,
     accounts: notifications.map(item => item.account),
     statuses: notifications.map(item => item.status).filter(status => !!status),
     skipLoading,

-    next
+    next,

   };
 };
 
   };
 };
 


@@ -118,7 +118,7 @@ export function refreshNotificationsFail(error, skipLoading) {
   return {
     type: NOTIFICATIONS_REFRESH_FAIL,
     error,
   return {
     type: NOTIFICATIONS_REFRESH_FAIL,
     error,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -135,7 +135,7 @@ export function expandNotifications() {
 
     const params = {
       max_id: lastId,
 
     const params = {
       max_id: lastId,

-      limit: 20
+      limit: 20,

     };
 
     params.exclude_types = excludeTypesFromSettings(getState());
     };
 
     params.exclude_types = excludeTypesFromSettings(getState());


@@ -153,7 +153,7 @@ export function expandNotifications() {
 
 export function expandNotificationsRequest() {
   return {
 
 export function expandNotificationsRequest() {
   return {

-    type: NOTIFICATIONS_EXPAND_REQUEST
+    type: NOTIFICATIONS_EXPAND_REQUEST,

   };
 };
 
   };
 };
 


@@ -163,21 +163,21 @@ export function expandNotificationsSuccess(notifications, next) {
     notifications,
     accounts: notifications.map(item => item.account),
     statuses: notifications.map(item => item.status).filter(status => !!status),
     notifications,
     accounts: notifications.map(item => item.account),
     statuses: notifications.map(item => item.status).filter(status => !!status),

-    next
+    next,

   };
 };
 
 export function expandNotificationsFail(error) {
   return {
     type: NOTIFICATIONS_EXPAND_FAIL,
   };
 };
 
 export function expandNotificationsFail(error) {
   return {
     type: NOTIFICATIONS_EXPAND_FAIL,

-    error
+    error,

   };
 };
 
 export function clearNotifications() {
   return (dispatch, getState) => {
     dispatch({
   };
 };
 
 export function clearNotifications() {
   return (dispatch, getState) => {
     dispatch({

-      type: NOTIFICATIONS_CLEAR
+      type: NOTIFICATIONS_CLEAR,

     });
 
     api(getState).post('/api/v1/notifications/clear');
     });
 
     api(getState).post('/api/v1/notifications/clear');


@@ -187,6 +187,6 @@ export function clearNotifications() {
 export function scrollTopNotifications(top) {
   return {
     type: NOTIFICATIONS_SCROLL_TOP,
 export function scrollTopNotifications(top) {
   return {
     type: NOTIFICATIONS_SCROLL_TOP,

-    top
+    top,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/reports.js b/app/javascript/mastodon/actions/reports.js
index 094670d62c373b9d7f6310e29e788d903ec048dc..9b632be745ffa636fc117aea7da720defded39b2 100644 (file)
--- a/app/javascript/mastodon/actions/reports.js
+++ b/app/javascript/mastodon/actions/reports.js
@@ -14,13 +14,13 @@ export function initReport(account, status) {
   return {
     type: REPORT_INIT,
     account,
   return {
     type: REPORT_INIT,
     account,

-    status
+    status,

   };
 };
 
 export function cancelReport() {
   return {
   };
 };
 
 export function cancelReport() {
   return {

-    type: REPORT_CANCEL
+    type: REPORT_CANCEL,

   };
 };
 
   };
 };
 


@@ -39,34 +39,34 @@ export function submitReport() {
     api(getState).post('/api/v1/reports', {
       account_id: getState().getIn(['reports', 'new', 'account_id']),
       status_ids: getState().getIn(['reports', 'new', 'status_ids']),
     api(getState).post('/api/v1/reports', {
       account_id: getState().getIn(['reports', 'new', 'account_id']),
       status_ids: getState().getIn(['reports', 'new', 'status_ids']),

-      comment: getState().getIn(['reports', 'new', 'comment'])
+      comment: getState().getIn(['reports', 'new', 'comment']),

     }).then(response => dispatch(submitReportSuccess(response.data))).catch(error => dispatch(submitReportFail(error)));
   };
 };
 
 export function submitReportRequest() {
   return {
     }).then(response => dispatch(submitReportSuccess(response.data))).catch(error => dispatch(submitReportFail(error)));
   };
 };
 
 export function submitReportRequest() {
   return {

-    type: REPORT_SUBMIT_REQUEST
+    type: REPORT_SUBMIT_REQUEST,

   };
 };
 
 export function submitReportSuccess(report) {
   return {
     type: REPORT_SUBMIT_SUCCESS,
   };
 };
 
 export function submitReportSuccess(report) {
   return {
     type: REPORT_SUBMIT_SUCCESS,

-    report
+    report,

   };
 };
 
 export function submitReportFail(error) {
   return {
     type: REPORT_SUBMIT_FAIL,
   };
 };
 
 export function submitReportFail(error) {
   return {
     type: REPORT_SUBMIT_FAIL,

-    error
+    error,

   };
 };
 
 export function changeReportComment(comment) {
   return {
     type: REPORT_COMMENT_CHANGE,
   };
 };
 
 export function changeReportComment(comment) {
   return {
     type: REPORT_COMMENT_CHANGE,

-    comment
+    comment,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/search.js b/app/javascript/mastodon/actions/search.js
index df3ae0db1a297e04b9bf45353dc101466b3fa6c7..78c6109f7291ad15e322173cb44b66ae3aad347f 100644 (file)
--- a/app/javascript/mastodon/actions/search.js
+++ b/app/javascript/mastodon/actions/search.js
@@ -1,4 +1,4 @@
-import api from '../api'
+import api from '../api';

 
 export const SEARCH_CHANGE = 'SEARCH_CHANGE';
 export const SEARCH_CLEAR  = 'SEARCH_CLEAR';
 
 export const SEARCH_CHANGE = 'SEARCH_CHANGE';
 export const SEARCH_CLEAR  = 'SEARCH_CLEAR';


@@ -11,13 +11,13 @@ export const SEARCH_FETCH_FAIL    = 'SEARCH_FETCH_FAIL';
 export function changeSearch(value) {
   return {
     type: SEARCH_CHANGE,
 export function changeSearch(value) {
   return {
     type: SEARCH_CHANGE,

-    value
+    value,

   };
 };
 
 export function clearSearch() {
   return {
   };
 };
 
 export function clearSearch() {
   return {

-    type: SEARCH_CLEAR
+    type: SEARCH_CLEAR,

   };
 };
 
   };
 };
 


@@ -34,8 +34,8 @@ export function submitSearch() {
     api(getState).get('/api/v1/search', {
       params: {
         q: value,
     api(getState).get('/api/v1/search', {
       params: {
         q: value,

-        resolve: true
-      }
+        resolve: true,
+      },

     }).then(response => {
       dispatch(fetchSearchSuccess(response.data));
     }).catch(error => {
     }).then(response => {
       dispatch(fetchSearchSuccess(response.data));
     }).catch(error => {


@@ -46,7 +46,7 @@ export function submitSearch() {
 
 export function fetchSearchRequest() {
   return {
 
 export function fetchSearchRequest() {
   return {

-    type: SEARCH_FETCH_REQUEST
+    type: SEARCH_FETCH_REQUEST,

   };
 };
 
   };
 };
 


@@ -55,19 +55,19 @@ export function fetchSearchSuccess(results) {
     type: SEARCH_FETCH_SUCCESS,
     results,
     accounts: results.accounts,
     type: SEARCH_FETCH_SUCCESS,
     results,
     accounts: results.accounts,

-    statuses: results.statuses
+    statuses: results.statuses,

   };
 };
 
 export function fetchSearchFail(error) {
   return {
     type: SEARCH_FETCH_FAIL,
   };
 };
 
 export function fetchSearchFail(error) {
   return {
     type: SEARCH_FETCH_FAIL,

-    error
+    error,

   };
 };
 
 export function showSearch() {
   return {
   };
 };
 
 export function showSearch() {
   return {

-    type: SEARCH_SHOW
+    type: SEARCH_SHOW,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/settings.js b/app/javascript/mastodon/actions/settings.js
index c754b30ca2fc4d1656e61c5f55dafc957e9ce9cf..2d260b84c5afcd5fe0113bb891629a125a7bb4ef 100644 (file)
--- a/app/javascript/mastodon/actions/settings.js
+++ b/app/javascript/mastodon/actions/settings.js
@@ -6,14 +6,14 @@ export function changeSetting(key, value) {
   return {
     type: SETTING_CHANGE,
     key,
   return {
     type: SETTING_CHANGE,
     key,

-    value
+    value,

   };
 };
 
 export function saveSettings() {
   return (_, getState) => {
     axios.put('/api/web/settings', {
   };
 };
 
 export function saveSettings() {
   return (_, getState) => {
     axios.put('/api/web/settings', {

-      data: getState().get('settings').toJS()
+      data: getState().get('settings').toJS(),

     });
   };
 };
     });
   };
 };

diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 5eb9bf8171ba3307dbea3a2e3818d3563e244cd9..6956447ba4e263087d4d5c9cccbe69b7830f088b 100644 (file)
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -27,7 +27,7 @@ export function fetchStatusRequest(id, skipLoading) {
   return {
     type: STATUS_FETCH_REQUEST,
     id,
   return {
     type: STATUS_FETCH_REQUEST,
     id,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -56,7 +56,7 @@ export function fetchStatusSuccess(status, skipLoading) {
   return {
     type: STATUS_FETCH_SUCCESS,
     status,
   return {
     type: STATUS_FETCH_SUCCESS,
     status,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -66,7 +66,7 @@ export function fetchStatusFail(id, error, skipLoading) {
     id,
     error,
     skipLoading,
     id,
     error,
     skipLoading,

-    skipAlert: true
+    skipAlert: true,

   };
 };
 
   };
 };
 


@@ -86,14 +86,14 @@ export function deleteStatus(id) {
 export function deleteStatusRequest(id) {
   return {
     type: STATUS_DELETE_REQUEST,
 export function deleteStatusRequest(id) {
   return {
     type: STATUS_DELETE_REQUEST,

-    id: id
+    id: id,

   };
 };
 
 export function deleteStatusSuccess(id) {
   return {
     type: STATUS_DELETE_SUCCESS,
   };
 };
 
 export function deleteStatusSuccess(id) {
   return {
     type: STATUS_DELETE_SUCCESS,

-    id: id
+    id: id,

   };
 };
 
   };
 };
 


@@ -101,7 +101,7 @@ export function deleteStatusFail(id, error) {
   return {
     type: STATUS_DELETE_FAIL,
     id: id,
   return {
     type: STATUS_DELETE_FAIL,
     id: id,

-    error: error
+    error: error,

   };
 };
 
   };
 };
 


@@ -125,7 +125,7 @@ export function fetchContext(id) {
 export function fetchContextRequest(id) {
   return {
     type: CONTEXT_FETCH_REQUEST,
 export function fetchContextRequest(id) {
   return {
     type: CONTEXT_FETCH_REQUEST,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -135,7 +135,7 @@ export function fetchContextSuccess(id, ancestors, descendants) {
     id,
     ancestors,
     descendants,
     id,
     ancestors,
     descendants,

-    statuses: ancestors.concat(descendants)
+    statuses: ancestors.concat(descendants),

   };
 };
 
   };
 };
 


@@ -144,7 +144,7 @@ export function fetchContextFail(id, error) {
     type: CONTEXT_FETCH_FAIL,
     id,
     error,
     type: CONTEXT_FETCH_FAIL,
     id,
     error,

-    skipAlert: true
+    skipAlert: true,

   };
 };
 
   };
 };
 


@@ -163,14 +163,14 @@ export function muteStatus(id) {
 export function muteStatusRequest(id) {
   return {
     type: STATUS_MUTE_REQUEST,
 export function muteStatusRequest(id) {
   return {
     type: STATUS_MUTE_REQUEST,

-    id
+    id,

   };
 };
 
 export function muteStatusSuccess(id) {
   return {
     type: STATUS_MUTE_SUCCESS,
   };
 };
 
 export function muteStatusSuccess(id) {
   return {
     type: STATUS_MUTE_SUCCESS,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -178,7 +178,7 @@ export function muteStatusFail(id, error) {
   return {
     type: STATUS_MUTE_FAIL,
     id,
   return {
     type: STATUS_MUTE_FAIL,
     id,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -197,14 +197,14 @@ export function unmuteStatus(id) {
 export function unmuteStatusRequest(id) {
   return {
     type: STATUS_UNMUTE_REQUEST,
 export function unmuteStatusRequest(id) {
   return {
     type: STATUS_UNMUTE_REQUEST,

-    id
+    id,

   };
 };
 
 export function unmuteStatusSuccess(id) {
   return {
     type: STATUS_UNMUTE_SUCCESS,
   };
 };
 
 export function unmuteStatusSuccess(id) {
   return {
     type: STATUS_UNMUTE_SUCCESS,

-    id
+    id,

   };
 };
 
   };
 };
 


@@ -212,6 +212,6 @@ export function unmuteStatusFail(id, error) {
   return {
     type: STATUS_UNMUTE_FAIL,
     id,
   return {
     type: STATUS_UNMUTE_FAIL,
     id,

-    error
+    error,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/store.js b/app/javascript/mastodon/actions/store.js
index 3bba99549cecb70211b4a1016144052700067a17..601cea0014de8c35bfb171185d2f5ef8ad4e13d4 100644 (file)
--- a/app/javascript/mastodon/actions/store.js
+++ b/app/javascript/mastodon/actions/store.js
@@ -12,6 +12,6 @@ export function hydrateStore(rawState) {
 
   return {
     type: STORE_HYDRATE,
 
   return {
     type: STORE_HYDRATE,

-    state
+    state,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 5b37509a9d8cfea8df90bec6e4c1c85905eab999..98e441cd16ccb4d11572e39bdfb8ee63168a7817 100644 (file)
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -1,4 +1,4 @@
-import api, { getLinks } from '../api'
+import api, { getLinks } from '../api';

 import Immutable from 'immutable';
 
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
 import Immutable from 'immutable';
 
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';


@@ -23,7 +23,7 @@ export function refreshTimelineSuccess(timeline, statuses, skipLoading, next) {
     timeline,
     statuses,
     skipLoading,
     timeline,
     statuses,
     skipLoading,

-    next
+    next,

   };
 };
 
   };
 };
 


@@ -35,7 +35,7 @@ export function updateTimeline(timeline, status) {
       type: TIMELINE_UPDATE,
       timeline,
       status,
       type: TIMELINE_UPDATE,
       timeline,
       status,

-      references
+      references,

     });
   };
 };
     });
   };
 };


@@ -51,7 +51,7 @@ export function deleteFromTimelines(id) {
       id,
       accountId,
       references,
       id,
       accountId,
       references,

-      reblogOf
+      reblogOf,

     });
   };
 };
     });
   };
 };


@@ -61,7 +61,7 @@ export function refreshTimelineRequest(timeline, id, skipLoading) {
     type: TIMELINE_REFRESH_REQUEST,
     timeline,
     id,
     type: TIMELINE_REFRESH_REQUEST,
     timeline,
     id,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -106,7 +106,7 @@ export function refreshTimelineFail(timeline, error, skipLoading) {
     type: TIMELINE_REFRESH_FAIL,
     timeline,
     error,
     type: TIMELINE_REFRESH_FAIL,
     timeline,
     error,

-    skipLoading
+    skipLoading,

   };
 };
 
   };
 };
 


@@ -130,8 +130,8 @@ export function expandTimeline(timeline) {
       params: {
         ...params,
         max_id: lastId,
       params: {
         ...params,
         max_id: lastId,

-        limit: 10
-      }
+        limit: 10,
+      },

     }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandTimelineSuccess(timeline, response.data, next ? next.uri : null));
     }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandTimelineSuccess(timeline, response.data, next ? next.uri : null));


@@ -144,7 +144,7 @@ export function expandTimeline(timeline) {
 export function expandTimelineRequest(timeline) {
   return {
     type: TIMELINE_EXPAND_REQUEST,
 export function expandTimelineRequest(timeline) {
   return {
     type: TIMELINE_EXPAND_REQUEST,

-    timeline
+    timeline,

   };
 };
 
   };
 };
 


@@ -153,7 +153,7 @@ export function expandTimelineSuccess(timeline, statuses, next) {
     type: TIMELINE_EXPAND_SUCCESS,
     timeline,
     statuses,
     type: TIMELINE_EXPAND_SUCCESS,
     timeline,
     statuses,

-    next
+    next,

   };
 };
 
   };
 };
 


@@ -161,7 +161,7 @@ export function expandTimelineFail(timeline, error) {
   return {
     type: TIMELINE_EXPAND_FAIL,
     timeline,
   return {
     type: TIMELINE_EXPAND_FAIL,
     timeline,

-    error
+    error,

   };
 };
 
   };
 };
 


@@ -169,20 +169,20 @@ export function scrollTopTimeline(timeline, top) {
   return {
     type: TIMELINE_SCROLL_TOP,
     timeline,
   return {
     type: TIMELINE_SCROLL_TOP,
     timeline,

-    top
+    top,

   };
 };
 
 export function connectTimeline(timeline) {
   return {
     type: TIMELINE_CONNECT,
   };
 };
 
 export function connectTimeline(timeline) {
   return {
     type: TIMELINE_CONNECT,

-    timeline
+    timeline,

   };
 };
 
 export function disconnectTimeline(timeline) {
   return {
     type: TIMELINE_DISCONNECT,
   };
 };
 
 export function disconnectTimeline(timeline) {
   return {
     type: TIMELINE_DISCONNECT,

-    timeline
+    timeline,

   };
 };
   };
 };

diff --git a/app/javascript/mastodon/api.js b/app/javascript/mastodon/api.js
index 185729ce0f3107a7e0037828edbbcb359f4bb004..ecc703c0aa36a6e70739b6974bf80dedad2afbde 100644 (file)
--- a/app/javascript/mastodon/api.js
+++ b/app/javascript/mastodon/api.js
@@ -13,7 +13,7 @@ export const getLinks = response => {
 
 export default getState => axios.create({
   headers: {
 
 export default getState => axios.create({
   headers: {

-    'Authorization': `Bearer ${getState().getIn(['meta', 'access_token'], '')}`
+    'Authorization': `Bearer ${getState().getIn(['meta', 'access_token'], '')}`,

   },
 
   transformResponse: [function (data) {
   },
 
   transformResponse: [function (data) {


@@ -22,5 +22,5 @@ export default getState => axios.create({
     } catch(Exception) {
       return data;
     }
     } catch(Exception) {
       return data;
     }

-  }]
+  }],

 });
 });

diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index 5850a8791c252bb224004d456ec49be4accdbe5a..baac734aacc862bc25054acb394be0c9549f59b1 100644 (file)
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -13,7 +13,7 @@ const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   requested: { id: 'account.requested', defaultMessage: 'Awaiting approval' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   requested: { id: 'account.requested', defaultMessage: 'Awaiting approval' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },

-  unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' }
+  unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },

 });
 
 class Account extends ImmutablePureComponent {
 });
 
 class Account extends ImmutablePureComponent {


@@ -24,7 +24,7 @@ class Account extends ImmutablePureComponent {
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
     onMute: PropTypes.func.isRequired,
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
     onMute: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   constructor (props, context) {
   };
 
   constructor (props, context) {


@@ -62,7 +62,7 @@ class Account extends ImmutablePureComponent {
       const muting  = account.getIn(['relationship', 'muting']);
 
       if (requested) {
       const muting  = account.getIn(['relationship', 'muting']);
 
       if (requested) {

-        buttons = <IconButton disabled={true} icon='hourglass' title={intl.formatMessage(messages.requested)} />
+        buttons = <IconButton disabled={true} icon='hourglass' title={intl.formatMessage(messages.requested)} />;

       } else if (blocking) {
         buttons = <IconButton active={true} icon='unlock-alt' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />;
       } else if (muting) {
       } else if (blocking) {
         buttons = <IconButton active={true} icon='unlock-alt' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />;
       } else if (muting) {

diff --git a/app/javascript/mastodon/components/attachment_list.js b/app/javascript/mastodon/components/attachment_list.js
index f6449e2c01a6cf86a7c3d7c557e7af5dd49f28d8..54d3643bd98db3a8c8259e4a93b39095af8f03a5 100644 (file)
--- a/app/javascript/mastodon/components/attachment_list.js
+++ b/app/javascript/mastodon/components/attachment_list.js
@@ -6,7 +6,7 @@ const filename = url => url.split('/').pop().split('#')[0].split('?')[0];
 class AttachmentList extends React.PureComponent {
 
   static propTypes = {
 class AttachmentList extends React.PureComponent {
 
   static propTypes = {

-    media: ImmutablePropTypes.list.isRequired
+    media: ImmutablePropTypes.list.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/components/autosuggest_textarea.js b/app/javascript/mastodon/components/autosuggest_textarea.js
index 24fa2b92057885ae3a79960281ad80b94c2421e2..0a9af5126833902ae33a8ba8662b52f2c0c6f4aa 100644 (file)
--- a/app/javascript/mastodon/components/autosuggest_textarea.js
+++ b/app/javascript/mastodon/components/autosuggest_textarea.js
@@ -44,11 +44,11 @@ class AutosuggestTextarea extends ImmutablePureComponent {
     onKeyUp: PropTypes.func,
     onKeyDown: PropTypes.func,
     onPaste: PropTypes.func.isRequired,
     onKeyUp: PropTypes.func,
     onKeyDown: PropTypes.func,
     onPaste: PropTypes.func.isRequired,

-    autoFocus: PropTypes.bool
+    autoFocus: PropTypes.bool,

   };
 
   static defaultProps = {
   };
 
   static defaultProps = {

-    autoFocus: true
+    autoFocus: true,

   };
 
   constructor (props, context) {
   };
 
   constructor (props, context) {


@@ -57,7 +57,7 @@ class AutosuggestTextarea extends ImmutablePureComponent {
       suggestionsHidden: false,
       selectedSuggestion: 0,
       lastToken: null,
       suggestionsHidden: false,
       selectedSuggestion: 0,
       lastToken: null,

-      tokenStart: 0
+      tokenStart: 0,

     };
     this.onChange = this.onChange.bind(this);
     this.onKeyDown = this.onKeyDown.bind(this);
     };
     this.onChange = this.onChange.bind(this);
     this.onKeyDown = this.onKeyDown.bind(this);


@@ -164,7 +164,7 @@ class AutosuggestTextarea extends ImmutablePureComponent {
 
   onPaste (e) {
     if (e.clipboardData && e.clipboardData.files.length === 1) {
 
   onPaste (e) {
     if (e.clipboardData && e.clipboardData.files.length === 1) {

-      this.props.onPaste(e.clipboardData.files)
+      this.props.onPaste(e.clipboardData.files);

       e.preventDefault();
     }
   }
       e.preventDefault();
     }
   }

diff --git a/app/javascript/mastodon/components/avatar.js b/app/javascript/mastodon/components/avatar.js
index 90c84f32a46d4dbd3ad0f494694e2ac3572bd7d5..d8e8e7dda589a31c4eb6afcbbaafbca50f3f6099 100644 (file)
--- a/app/javascript/mastodon/components/avatar.js
+++ b/app/javascript/mastodon/components/avatar.js
@@ -9,17 +9,17 @@ class Avatar extends React.PureComponent {
     size: PropTypes.number.isRequired,
     style: PropTypes.object,
     animate: PropTypes.bool,
     size: PropTypes.number.isRequired,
     style: PropTypes.object,
     animate: PropTypes.bool,

-    inline: PropTypes.bool
+    inline: PropTypes.bool,

   };
 
   static defaultProps = {
     animate: false,
     size: 20,
   };
 
   static defaultProps = {
     animate: false,
     size: 20,

-    inline: false
+    inline: false,

   };
 
   state = {
   };
 
   state = {

-    hovering: true
+    hovering: true,

   };
 
   handleMouseEnter = () => {
   };
 
   handleMouseEnter = () => {


@@ -46,7 +46,7 @@ class Avatar extends React.PureComponent {
       ...this.props.style,
       width: `${size}px`,
       height: `${size}px`,
       ...this.props.style,
       width: `${size}px`,
       height: `${size}px`,

-      backgroundSize: `${size}px ${size}px`
+      backgroundSize: `${size}px ${size}px`,

     };
 
     if (hovering || animate) {
     };
 
     if (hovering || animate) {

diff --git a/app/javascript/mastodon/components/avatar_overlay.js b/app/javascript/mastodon/components/avatar_overlay.js
index b76750513e5622e1e90a67222084f914cae48d4f..a9643499d3a4cfeda597fccaf0c635568e773400 100644 (file)
--- a/app/javascript/mastodon/components/avatar_overlay.js
+++ b/app/javascript/mastodon/components/avatar_overlay.js
@@ -2,20 +2,21 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 class AvatarOverlay extends React.PureComponent {
 import PropTypes from 'prop-types';
 
 class AvatarOverlay extends React.PureComponent {

+

   static propTypes = {
     staticSrc: PropTypes.string.isRequired,
   static propTypes = {
     staticSrc: PropTypes.string.isRequired,

-    overlaySrc: PropTypes.string.isRequired
+    overlaySrc: PropTypes.string.isRequired,

   };
 
   render() {
     const {staticSrc, overlaySrc} = this.props;
 
     const baseStyle = {
   };
 
   render() {
     const {staticSrc, overlaySrc} = this.props;
 
     const baseStyle = {

-      backgroundImage: `url(${staticSrc})`
+      backgroundImage: `url(${staticSrc})`,

     };
 
     const overlayStyle = {
     };
 
     const overlayStyle = {

-      backgroundImage: `url(${overlaySrc})`
+      backgroundImage: `url(${overlaySrc})`,

     };
 
     return (
     };
 
     return (

diff --git a/app/javascript/mastodon/components/button.js b/app/javascript/mastodon/components/button.js
index 7612bd2334c936b3cf19c69cf425e6ffa7e5db68..cc6482cdecad6d46fe34038dd7fcea009caa910e 100644 (file)
--- a/app/javascript/mastodon/components/button.js
+++ b/app/javascript/mastodon/components/button.js
@@ -11,11 +11,11 @@ class Button extends React.PureComponent {
     secondary: PropTypes.bool,
     size: PropTypes.number,
     style: PropTypes.object,
     secondary: PropTypes.bool,
     size: PropTypes.number,
     style: PropTypes.object,

-    children: PropTypes.node
+    children: PropTypes.node,

   };
 
   static defaultProps = {
   };
 
   static defaultProps = {

-    size: 36
+    size: 36,

   };
 
   handleClick = (e) => {
   };
 
   handleClick = (e) => {


@@ -29,7 +29,7 @@ class Button extends React.PureComponent {
       padding: `0 ${this.props.size / 2.25}px`,
       height: `${this.props.size}px`,
       lineHeight: `${this.props.size}px`,
       padding: `0 ${this.props.size / 2.25}px`,
       height: `${this.props.size}px`,
       lineHeight: `${this.props.size}px`,

-      ...this.props.style
+      ...this.props.style,

     };
 
     return (
     };
 
     return (

diff --git a/app/javascript/mastodon/components/collapsable.js b/app/javascript/mastodon/components/collapsable.js
index ac42bc6c76f71eee556abbc6200402c160e6b41a..ad1453589ca457535c00d37bc9203b1ac0b10d6a 100644 (file)
--- a/app/javascript/mastodon/components/collapsable.js
+++ b/app/javascript/mastodon/components/collapsable.js
@@ -16,7 +16,7 @@ const Collapsable = ({ fullHeight, isVisible, children }) => (
 Collapsable.propTypes = {
   fullHeight: PropTypes.number.isRequired,
   isVisible: PropTypes.bool.isRequired,
 Collapsable.propTypes = {
   fullHeight: PropTypes.number.isRequired,
   isVisible: PropTypes.bool.isRequired,

-  children: PropTypes.node.isRequired
+  children: PropTypes.node.isRequired,

 };
 
 export default Collapsable;
 };
 
 export default Collapsable;

diff --git a/app/javascript/mastodon/components/column_back_button.js b/app/javascript/mastodon/components/column_back_button.js
index a4971f5f893badbfc7f071b26f629723e450d2ca..9d2de40f593d1744d80568f21fd2359d182db7a4 100644 (file)
--- a/app/javascript/mastodon/components/column_back_button.js
+++ b/app/javascript/mastodon/components/column_back_button.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 class ColumnBackButton extends React.PureComponent {
 
   static contextTypes = {
 class ColumnBackButton extends React.PureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   handleClick = () => {
   };
 
   handleClick = () => {

diff --git a/app/javascript/mastodon/components/column_back_button_slim.js b/app/javascript/mastodon/components/column_back_button_slim.js
index 6966a138d79ae88e25edc38514147b94c8672e60..6f6bbc0b8e4c59427c1fbe2af351ad82d6cc1789 100644 (file)
--- a/app/javascript/mastodon/components/column_back_button_slim.js
+++ b/app/javascript/mastodon/components/column_back_button_slim.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 class ColumnBackButtonSlim extends React.PureComponent {
 
   static contextTypes = {
 class ColumnBackButtonSlim extends React.PureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   handleClick = () => {
   };
 
   handleClick = () => {


@@ -22,6 +22,7 @@ class ColumnBackButtonSlim extends React.PureComponent {
       </div>
     );
   }
       </div>
     );
   }

+

 }
 
 export default ColumnBackButtonSlim;
 }
 
 export default ColumnBackButtonSlim;

diff --git a/app/javascript/mastodon/components/column_collapsable.js b/app/javascript/mastodon/components/column_collapsable.js
index c75f8ff36bdb2bbb3e11d0ca5759a9cb735f1a1c..fc4ed309c66f7f5f0ddf34118a279cbbc1377a99 100644 (file)
--- a/app/javascript/mastodon/components/column_collapsable.js
+++ b/app/javascript/mastodon/components/column_collapsable.js
@@ -8,11 +8,11 @@ class ColumnCollapsable extends React.PureComponent {
     title: PropTypes.string,
     fullHeight: PropTypes.number.isRequired,
     children: PropTypes.node,
     title: PropTypes.string,
     fullHeight: PropTypes.number.isRequired,
     children: PropTypes.node,

-    onCollapse: PropTypes.func
+    onCollapse: PropTypes.func,

   };
 
   state = {
   };
 
   state = {

-    collapsed: true
+    collapsed: true,

   };
 
   handleToggleCollapsed = () => {
   };
 
   handleToggleCollapsed = () => {


@@ -41,6 +41,7 @@ class ColumnCollapsable extends React.PureComponent {
       </div>
     );
   }
       </div>
     );
   }

+

 }
 
 export default ColumnCollapsable;
 }
 
 export default ColumnCollapsable;

diff --git a/app/javascript/mastodon/components/display_name.js b/app/javascript/mastodon/components/display_name.js
index e122debf47123bfd58df3c001ef009bce6aef18e..6fbc1dfc0ba37d57f92766dfea1fe371581e4292 100644 (file)
--- a/app/javascript/mastodon/components/display_name.js
+++ b/app/javascript/mastodon/components/display_name.js
@@ -6,7 +6,7 @@ import emojify from '../emoji';
 class DisplayName extends React.PureComponent {
 
   static propTypes = {
 class DisplayName extends React.PureComponent {
 
   static propTypes = {

-    account: ImmutablePropTypes.map.isRequired
+    account: ImmutablePropTypes.map.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js
index 8dee211fac10e733f85157a78dd3a22670fe67b2..ea86066264362b1a239677bea3dcf4ba60a86e13 100644 (file)
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 class DropdownMenu extends React.PureComponent {
 
   static contextTypes = {
 class DropdownMenu extends React.PureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
   };
 
   static propTypes = {


@@ -13,11 +13,11 @@ class DropdownMenu extends React.PureComponent {
     items: PropTypes.array.isRequired,
     size: PropTypes.number.isRequired,
     direction: PropTypes.string,
     items: PropTypes.array.isRequired,
     size: PropTypes.number.isRequired,
     direction: PropTypes.string,

-    ariaLabel: PropTypes.string
+    ariaLabel: PropTypes.string,

   };
 
   static defaultProps = {
   };
 
   static defaultProps = {

-    ariaLabel: "Menu"
+    ariaLabel: "Menu",

   };
 
   state = {
   };
 
   state = {

diff --git a/app/javascript/mastodon/components/extended_video_player.js b/app/javascript/mastodon/components/extended_video_player.js
index a07d271860d9c6c7cf652e650f6d2d3255fdf187..4d92bd779b3a31c25359cd2c316784ee0f453173 100644 (file)
--- a/app/javascript/mastodon/components/extended_video_player.js
+++ b/app/javascript/mastodon/components/extended_video_player.js
@@ -7,7 +7,7 @@ class ExtendedVideoPlayer extends React.PureComponent {
     src: PropTypes.string.isRequired,
     time: PropTypes.number,
     controls: PropTypes.bool.isRequired,
     src: PropTypes.string.isRequired,
     time: PropTypes.number,
     controls: PropTypes.bool.isRequired,

-    muted: PropTypes.bool.isRequired
+    muted: PropTypes.bool.isRequired,

   };
 
   handleLoadedData = () => {
   };
 
   handleLoadedData = () => {

diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js
index 3ae22faef2a00aa8e47734b289a8c2f166efd93c..c8df589b60358deb1302a73d34a2ef9c1a404d98 100644 (file)
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -17,7 +17,7 @@ class IconButton extends React.PureComponent {
     disabled: PropTypes.bool,
     inverted: PropTypes.bool,
     animate: PropTypes.bool,
     disabled: PropTypes.bool,
     inverted: PropTypes.bool,
     animate: PropTypes.bool,

-    overlay: PropTypes.bool
+    overlay: PropTypes.bool,

   };
 
   static defaultProps = {
   };
 
   static defaultProps = {


@@ -25,7 +25,7 @@ class IconButton extends React.PureComponent {
     active: false,
     disabled: false,
     animate: false,
     active: false,
     disabled: false,
     animate: false,

-    overlay: false
+    overlay: false,

   };
 
   handleClick = (e) =>  {
   };
 
   handleClick = (e) =>  {


@@ -43,7 +43,7 @@ class IconButton extends React.PureComponent {
       height: `${this.props.size * 1.28571429}px`,
       lineHeight: `${this.props.size}px`,
       ...this.props.style,
       height: `${this.props.size * 1.28571429}px`,
       lineHeight: `${this.props.size}px`,
       ...this.props.style,

-      ...(this.props.active ? this.props.activeStyle : {})
+      ...(this.props.active ? this.props.activeStyle : {}),

     };
 
     const classes = ['icon-button'];
     };
 
     const classes = ['icon-button'];


@@ -65,7 +65,7 @@ class IconButton extends React.PureComponent {
     }
 
     if (this.props.className) {
     }
 
     if (this.props.className) {

-      classes.push(this.props.className)
+      classes.push(this.props.className);

     }
 
     return (
     }
 
     return (

diff --git a/app/javascript/mastodon/components/load_more.js b/app/javascript/mastodon/components/load_more.js
index 36dae79af876534272b0de9aa9adc755ac6aa068..21201138699a8f54c875f032c4bc43b910a559d3 100644 (file)
--- a/app/javascript/mastodon/components/load_more.js
+++ b/app/javascript/mastodon/components/load_more.js
@@ -9,7 +9,7 @@ const LoadMore = ({ onClick }) => (
 );
 
 LoadMore.propTypes = {
 );
 
 LoadMore.propTypes = {

-  onClick: PropTypes.func
+  onClick: PropTypes.func,

 };
 
 export default LoadMore;
 };
 
 export default LoadMore;

diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 10389751ef71c91dba754931b77005caac99a3d0..baa7f9afa932d8100b1b3df4e8e767f8b84958c6 100644 (file)
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -6,7 +6,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { isIOS } from '../is_mobile';
 
 const messages = defineMessages({
 import { isIOS } from '../is_mobile';
 
 const messages = defineMessages({

-  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' }
+  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },

 });
 
 class Item extends React.PureComponent {
 });
 
 class Item extends React.PureComponent {


@@ -16,7 +16,7 @@ class Item extends React.PureComponent {
     index: PropTypes.number.isRequired,
     size: PropTypes.number.isRequired,
     onClick: PropTypes.func.isRequired,
     index: PropTypes.number.isRequired,
     size: PropTypes.number.isRequired,
     onClick: PropTypes.func.isRequired,

-    autoPlayGif: PropTypes.bool.isRequired
+    autoPlayGif: PropTypes.bool.isRequired,

   };
 
   handleClick = (e) => {
   };
 
   handleClick = (e) => {


@@ -131,11 +131,11 @@ class MediaGallery extends React.PureComponent {
     height: PropTypes.number.isRequired,
     onOpenMedia: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     height: PropTypes.number.isRequired,
     onOpenMedia: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,

-    autoPlayGif: PropTypes.bool.isRequired
+    autoPlayGif: PropTypes.bool.isRequired,

   };
 
   state = {
   };
 
   state = {

-    visible: !this.props.sensitive
+    visible: !this.props.sensitive,

   };
 
   handleOpen = (e) => {
   };
 
   handleOpen = (e) => {

diff --git a/app/javascript/mastodon/components/permalink.js b/app/javascript/mastodon/components/permalink.js
index 08f18772869facd0e5dce0299e48270fa08a9a09..b45969d856d4fa7f32fc8ecf20079267b3abf57c 100644 (file)
--- a/app/javascript/mastodon/components/permalink.js
+++ b/app/javascript/mastodon/components/permalink.js
@@ -4,14 +4,14 @@ import PropTypes from 'prop-types';
 class Permalink extends React.PureComponent {
 
   static contextTypes = {
 class Permalink extends React.PureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
     className: PropTypes.string,
     href: PropTypes.string.isRequired,
     to: PropTypes.string.isRequired,
   };
 
   static propTypes = {
     className: PropTypes.string,
     href: PropTypes.string.isRequired,
     to: PropTypes.string.isRequired,

-    children: PropTypes.node
+    children: PropTypes.node,

   };
 
   handleClick = (e) => {
   };
 
   handleClick = (e) => {

diff --git a/app/javascript/mastodon/components/relative_timestamp.js b/app/javascript/mastodon/components/relative_timestamp.js
index 9c7a8121e7567852214026b9ee369ad3d20f0919..13c36c0e4cd51a61f75fe7c5f345c80a82b26fc5 100644 (file)
--- a/app/javascript/mastodon/components/relative_timestamp.js
+++ b/app/javascript/mastodon/components/relative_timestamp.js
@@ -14,7 +14,7 @@ const RelativeTimestamp = ({ intl, timestamp }) => {
 
 RelativeTimestamp.propTypes = {
   intl: PropTypes.object.isRequired,
 
 RelativeTimestamp.propTypes = {
   intl: PropTypes.object.isRequired,

-  timestamp: PropTypes.string.isRequired
+  timestamp: PropTypes.string.isRequired,

 };
 
 export default injectIntl(RelativeTimestamp);
 };
 
 export default injectIntl(RelativeTimestamp);

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 9ce43833fdda82cdef8235d4dcf485f50d1d4cb0..ec83a53315a710d3ef6e5fe991994414b81f7044 100644 (file)
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -18,7 +18,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 class Status extends ImmutablePureComponent {
 
   static contextTypes = {
 class Status extends ImmutablePureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
   };
 
   static propTypes = {


@@ -35,7 +35,7 @@ class Status extends ImmutablePureComponent {
     me: PropTypes.number,
     boostModal: PropTypes.bool,
     autoPlayGif: PropTypes.bool,
     me: PropTypes.number,
     boostModal: PropTypes.bool,
     autoPlayGif: PropTypes.bool,

-    muted: PropTypes.bool
+    muted: PropTypes.bool,

   };
 
   handleClick = () => {
   };
 
   handleClick = () => {

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 4d077fb9876d0f065496df8d739c075359742d56..1f9fa4c67ddc0826779d7769b32ba8c33c7a1ba2 100644 (file)
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -24,7 +24,7 @@ const messages = defineMessages({
 class StatusActionBar extends React.PureComponent {
 
   static contextTypes = {
 class StatusActionBar extends React.PureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
   };
 
   static propTypes = {


@@ -40,7 +40,7 @@ class StatusActionBar extends React.PureComponent {
     onMuteConversation: PropTypes.func,
     me: PropTypes.number.isRequired,
     withDismiss: PropTypes.bool,
     onMuteConversation: PropTypes.func,
     me: PropTypes.number.isRequired,
     withDismiss: PropTypes.bool,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   handleReplyClick = () => {
   };
 
   handleReplyClick = () => {

diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 4d002607d21d98adb6e8033e0bc7eb898cdbdbbc..1a474802ab2c7093cbca4b84861a91794b3cf929 100644 (file)
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -10,16 +10,16 @@ import Permalink from './permalink';
 class StatusContent extends React.PureComponent {
 
   static contextTypes = {
 class StatusContent extends React.PureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
   };
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,

-    onClick: PropTypes.func
+    onClick: PropTypes.func,

   };
 
   state = {
   };
 
   state = {

-    hidden: true
+    hidden: true,

   };
 
   componentDidMount () {
   };
 
   componentDidMount () {


@@ -107,7 +107,7 @@ class StatusContent extends React.PureComponent {
         <Permalink to={`/accounts/${item.get('id')}`} href={item.get('url')} key={item.get('id')} className='mention'>
           @<span>{item.get('username')}</span>
         </Permalink>
         <Permalink to={`/accounts/${item.get('id')}`} href={item.get('url')} key={item.get('id')} className='mention'>
           @<span>{item.get('username')}</span>
         </Permalink>

-      )).reduce((aggregate, item) => [...aggregate, item, ' '], [])
+      )).reduce((aggregate, item) => [...aggregate, item, ' '], []);

 
       const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;
 
 
       const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;
 

diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index 9e6c8fd18eb8e875e7bca9bb92002bfc1e040d91..b669a55642c10710bd075d4410bb6c11671902f6 100644 (file)
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -20,11 +20,11 @@ class StatusList extends ImmutablePureComponent {
     isUnread: PropTypes.bool,
     hasMore: PropTypes.bool,
     prepend: PropTypes.node,
     isUnread: PropTypes.bool,
     hasMore: PropTypes.bool,
     prepend: PropTypes.node,

-    emptyMessage: PropTypes.node
+    emptyMessage: PropTypes.node,

   };
 
   static defaultProps = {
   };
 
   static defaultProps = {

-    trackScroll: true
+    trackScroll: true,

   };
 
   handleScroll = (e) => {
   };
 
   handleScroll = (e) => {

diff --git a/app/javascript/mastodon/components/video_player.js b/app/javascript/mastodon/components/video_player.js
index cd4b69659b3b4c2bc04f43b74052e577fb3a71ec..29da769e0b7090a15210317322087b76d06873d6 100644 (file)
--- a/app/javascript/mastodon/components/video_player.js
+++ b/app/javascript/mastodon/components/video_player.js
@@ -20,12 +20,12 @@ class VideoPlayer extends React.PureComponent {
     sensitive: PropTypes.bool,
     intl: PropTypes.object.isRequired,
     autoplay: PropTypes.bool,
     sensitive: PropTypes.bool,
     intl: PropTypes.object.isRequired,
     autoplay: PropTypes.bool,

-    onOpenVideo: PropTypes.func.isRequired
+    onOpenVideo: PropTypes.func.isRequired,

   };
 
   static defaultProps = {
     width: 239,
   };
 
   static defaultProps = {
     width: 239,

-    height: 110
+    height: 110,

   };
 
   state = {
   };
 
   state = {


@@ -33,7 +33,7 @@ class VideoPlayer extends React.PureComponent {
     preview: true,
     muted: true,
     hasAudio: true,
     preview: true,
     muted: true,
     hasAudio: true,

-    videoError: false
+    videoError: false,

   };
 
   handleClick = () => {
   };
 
   handleClick = () => {


@@ -59,7 +59,7 @@ class VideoPlayer extends React.PureComponent {
   handleVisibility = () => {
     this.setState({
       visible: !this.state.visible,
   handleVisibility = () => {
     this.setState({
       visible: !this.state.visible,

-      preview: true
+      preview: true,

     });
   }
 
     });
   }
 

diff --git a/app/javascript/mastodon/containers/account_container.js b/app/javascript/mastodon/containers/account_container.js
index 3c30be7152e9d8000bb786b664d63e0a828dbd80..1426bcaa47e3e9592b8646b45e8b13f009bf466b 100644 (file)
--- a/app/javascript/mastodon/containers/account_container.js
+++ b/app/javascript/mastodon/containers/account_container.js
@@ -15,7 +15,7 @@ const makeMapStateToProps = () => {
 
   const mapStateToProps = (state, props) => ({
     account: getAccount(state, props.id),
 
   const mapStateToProps = (state, props) => ({
     account: getAccount(state, props.id),

-    me: state.getIn(['meta', 'me'])
+    me: state.getIn(['meta', 'me']),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;


@@ -44,7 +44,7 @@ const mapDispatchToProps = (dispatch) => ({
     } else {
       dispatch(muteAccount(account.get('id')));
     }
     } else {
       dispatch(muteAccount(account.get('id')));
     }

-  }
+  },

 });
 
 export default connect(makeMapStateToProps, mapDispatchToProps)(Account);
 });
 
 export default connect(makeMapStateToProps, mapDispatchToProps)(Account);

diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
index 165a6f04551d18af2ca81280af9e4794e8212604..ac44063a26ba8e2549a54d6c07eafc16eebccee6 100644 (file)
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -8,7 +8,7 @@ import {
   deleteFromTimelines,
   refreshTimeline,
   connectTimeline,
   deleteFromTimelines,
   refreshTimeline,
   connectTimeline,

-  disconnectTimeline
+  disconnectTimeline,

 } from '../actions/timelines';
 import { showOnboardingOnce } from '../actions/onboarding';
 import { updateNotifications, refreshNotifications } from '../actions/notifications';
 } from '../actions/timelines';
 import { showOnboardingOnce } from '../actions/onboarding';
 import { updateNotifications, refreshNotifications } from '../actions/notifications';


@@ -75,7 +75,7 @@ const initialState = JSON.parse(document.getElementById("initial-state").textCon
 store.dispatch(hydrateStore(initialState));
 
 const browserHistory = useRouterHistory(createBrowserHistory)({
 store.dispatch(hydrateStore(initialState));
 
 const browserHistory = useRouterHistory(createBrowserHistory)({

-  basename: '/web'
+  basename: '/web',

 });
 
 addLocaleData([
 });
 
 addLocaleData([


@@ -155,7 +155,7 @@ class Mastodon extends React.PureComponent {
         store.dispatch(connectTimeline('home'));
         store.dispatch(refreshTimeline('home'));
         store.dispatch(refreshNotifications());
         store.dispatch(connectTimeline('home'));
         store.dispatch(refreshTimeline('home'));
         store.dispatch(refreshNotifications());

-      }
+      },

 
     });
 
 
     });
 


@@ -223,7 +223,7 @@ class Mastodon extends React.PureComponent {
 }
 
 Mastodon.propTypes = {
 }
 
 Mastodon.propTypes = {

-  locale: PropTypes.string.isRequired
+  locale: PropTypes.string.isRequired,

 };
 
 export default Mastodon;
 };
 
 export default Mastodon;

diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 8b7d6dc53d012a783486abb269274cb8f0e622f1..141f287afff25830f07786ff51ae88443c683aec 100644 (file)
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -4,23 +4,23 @@ import Status from '../components/status';
 import { makeGetStatus } from '../selectors';
 import {
   replyCompose,
 import { makeGetStatus } from '../selectors';
 import {
   replyCompose,

-  mentionCompose
+  mentionCompose,

 } from '../actions/compose';
 import {
   reblog,
   favourite,
   unreblog,
 } from '../actions/compose';
 import {
   reblog,
   favourite,
   unreblog,

-  unfavourite
+  unfavourite,

 } from '../actions/interactions';
 import {
   blockAccount,
 } from '../actions/interactions';
 import {
   blockAccount,

-  muteAccount
+  muteAccount,

 } from '../actions/accounts';
 import { muteStatus, unmuteStatus, deleteStatus } from '../actions/statuses';
 import { initReport } from '../actions/reports';
 import { openModal } from '../actions/modal';
 } from '../actions/accounts';
 import { muteStatus, unmuteStatus, deleteStatus } from '../actions/statuses';
 import { initReport } from '../actions/reports';
 import { openModal } from '../actions/modal';

-import { createSelector } from 'reselect'
-import { isMobile } from '../is_mobile'
+import { createSelector } from 'reselect';
+import { isMobile } from '../is_mobile';

 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 const messages = defineMessages({
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 const messages = defineMessages({


@@ -37,7 +37,7 @@ const makeMapStateToProps = () => {
     status: getStatus(state, props.id),
     me: state.getIn(['meta', 'me']),
     boostModal: state.getIn(['meta', 'boost_modal']),
     status: getStatus(state, props.id),
     me: state.getIn(['meta', 'me']),
     boostModal: state.getIn(['meta', 'boost_modal']),

-    autoPlayGif: state.getIn(['meta', 'auto_play_gif'])
+    autoPlayGif: state.getIn(['meta', 'auto_play_gif']),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;


@@ -77,7 +77,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('CONFIRM', {
       message: intl.formatMessage(messages.deleteMessage),
       confirm: intl.formatMessage(messages.deleteConfirm),
     dispatch(openModal('CONFIRM', {
       message: intl.formatMessage(messages.deleteMessage),
       confirm: intl.formatMessage(messages.deleteConfirm),

-      onConfirm: () => dispatch(deleteStatus(status.get('id')))
+      onConfirm: () => dispatch(deleteStatus(status.get('id'))),

     }));
   },
 
     }));
   },
 


@@ -97,7 +97,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('CONFIRM', {
       message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
       confirm: intl.formatMessage(messages.blockConfirm),
     dispatch(openModal('CONFIRM', {
       message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
       confirm: intl.formatMessage(messages.blockConfirm),

-      onConfirm: () => dispatch(blockAccount(account.get('id')))
+      onConfirm: () => dispatch(blockAccount(account.get('id'))),

     }));
   },
 
     }));
   },
 


@@ -109,7 +109,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('CONFIRM', {
       message: <FormattedMessage id='confirmations.mute.message' defaultMessage='Are you sure you want to mute {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
       confirm: intl.formatMessage(messages.muteConfirm),
     dispatch(openModal('CONFIRM', {
       message: <FormattedMessage id='confirmations.mute.message' defaultMessage='Are you sure you want to mute {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
       confirm: intl.formatMessage(messages.muteConfirm),

-      onConfirm: () => dispatch(muteAccount(account.get('id')))
+      onConfirm: () => dispatch(muteAccount(account.get('id'))),

     }));
   },
 
     }));
   },
 

diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js
index 3a47a1686ec5ad5bbcb5ce4cb7eb6b36e2669344..56ebefd7773c572127322b92f17f2e055082b771 100644 (file)
--- a/app/javascript/mastodon/features/account/components/action_bar.js
+++ b/app/javascript/mastodon/features/account/components/action_bar.js
@@ -33,7 +33,7 @@ class ActionBar extends React.PureComponent {
     onMute: PropTypes.func.isRequired,
     onBlockDomain: PropTypes.func.isRequired,
     onUnblockDomain: PropTypes.func.isRequired,
     onMute: PropTypes.func.isRequired,
     onBlockDomain: PropTypes.func.isRequired,
     onUnblockDomain: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 8a21c6039478cf1709d458c572395d2e4f56d604..e71d7211245aac4fd0ad4b0e12a384255503515a 100644 (file)
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -13,12 +13,12 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
 const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },

-  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval' }
+  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval' },

 });
 
 const makeMapStateToProps = () => {
   const mapStateToProps = (state, props) => ({
 });
 
 const makeMapStateToProps = () => {
   const mapStateToProps = (state, props) => ({

-    autoPlayGif: state.getIn(['meta', 'auto_play_gif'])
+    autoPlayGif: state.getIn(['meta', 'auto_play_gif']),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;


@@ -28,11 +28,11 @@ class Avatar extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,

-    autoPlayGif: PropTypes.bool.isRequired
+    autoPlayGif: PropTypes.bool.isRequired,

   };
 
   state = {
   };
 
   state = {

-    isHovered: false
+    isHovered: false,

   };
 
   handleMouseOver = () => {
   };
 
   handleMouseOver = () => {


@@ -77,7 +77,7 @@ class Header extends ImmutablePureComponent {
     me: PropTypes.number.isRequired,
     onFollow: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     me: PropTypes.number.isRequired,
     onFollow: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,

-    autoPlayGif: PropTypes.bool.isRequired
+    autoPlayGif: PropTypes.bool.isRequired,

   };
 
   render () {
   };
 
   render () {


@@ -97,7 +97,7 @@ class Header extends ImmutablePureComponent {
     }
 
     if (me !== account.get('id') && account.getIn(['relationship', 'followed_by'])) {
     }
 
     if (me !== account.get('id') && account.getIn(['relationship', 'followed_by'])) {

-      info = <span className='account--follows-info'><FormattedMessage id='account.follows_you' defaultMessage='Follows you' /></span>
+      info = <span className='account--follows-info'><FormattedMessage id='account.follows_you' defaultMessage='Follows you' /></span>;

     }
 
     if (me !== account.get('id')) {
     }
 
     if (me !== account.get('id')) {

diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.js b/app/javascript/mastodon/features/account_gallery/components/media_item.js
index 7d8dddf871e305010ddefc74963bb4425ea1e2e6..8f2949ca5d39225eb1f11c3e1305e815a7661edd 100644 (file)
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.js
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js
@@ -6,7 +6,7 @@ import Permalink from '../../../components/permalink';
 class MediaItem extends ImmutablePureComponent {
 
   static propTypes = {
 class MediaItem extends ImmutablePureComponent {
 
   static propTypes = {

-    media: ImmutablePropTypes.map.isRequired
+    media: ImmutablePropTypes.map.isRequired,

   };
 
   render () {
   };
 
   render () {


@@ -34,6 +34,7 @@ class MediaItem extends ImmutablePureComponent {
       </div>
     );
   }
       </div>
     );
   }

+

 }
 
 export default MediaItem;
 }
 
 export default MediaItem;

diff --git a/app/javascript/mastodon/features/account_gallery/index.js b/app/javascript/mastodon/features/account_gallery/index.js
index 28b19a2698de5d04805c8a132c966f44f08de786..6ddfcb0a0cc652c3c830f62e55a3f17d177a4395 100644 (file)
--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import {
   fetchAccount,
   fetchAccountMediaTimeline,
 import {
   fetchAccount,
   fetchAccountMediaTimeline,

-  expandAccountMediaTimeline
+  expandAccountMediaTimeline,

 } from '../../actions/accounts';
 import LoadingIndicator from '../../components/loading_indicator';
 import Column from '../ui/components/column';
 } from '../../actions/accounts';
 import LoadingIndicator from '../../components/loading_indicator';
 import Column from '../ui/components/column';

diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index f1a0e8d775b4132513ae52385a784d2b9432690e..d2fe86476b7cb4b2d3851e5b2a039821a11dabd4 100644 (file)
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -21,7 +21,7 @@ class Header extends ImmutablePureComponent {
   };
 
   static contextTypes = {
   };
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   handleFollow = () => {
   };
 
   handleFollow = () => {

diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
index 0964efdcfeeb6d560cfbad242816e3339910e52b..19dd6469949ef737f044ba61410955312ba689b4 100644 (file)
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -8,7 +8,7 @@ import {
   blockAccount,
   unblockAccount,
   muteAccount,
   blockAccount,
   unblockAccount,
   muteAccount,

-  unmuteAccount
+  unmuteAccount,

 } from '../../../actions/accounts';
 import { mentionCompose } from '../../../actions/compose';
 import { initReport } from '../../../actions/reports';
 } from '../../../actions/accounts';
 import { mentionCompose } from '../../../actions/compose';
 import { initReport } from '../../../actions/reports';


@@ -27,7 +27,7 @@ const makeMapStateToProps = () => {
 
   const mapStateToProps = (state, { accountId }) => ({
     account: getAccount(state, Number(accountId)),
 
   const mapStateToProps = (state, { accountId }) => ({
     account: getAccount(state, Number(accountId)),

-    me: state.getIn(['meta', 'me'])
+    me: state.getIn(['meta', 'me']),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;


@@ -49,7 +49,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       dispatch(openModal('CONFIRM', {
         message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
         confirm: intl.formatMessage(messages.blockConfirm),
       dispatch(openModal('CONFIRM', {
         message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
         confirm: intl.formatMessage(messages.blockConfirm),

-        onConfirm: () => dispatch(blockAccount(account.get('id')))
+        onConfirm: () => dispatch(blockAccount(account.get('id'))),

       }));
     }
   },
       }));
     }
   },


@@ -69,7 +69,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       dispatch(openModal('CONFIRM', {
         message: <FormattedMessage id='confirmations.mute.message' defaultMessage='Are you sure you want to mute {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
         confirm: intl.formatMessage(messages.muteConfirm),
       dispatch(openModal('CONFIRM', {
         message: <FormattedMessage id='confirmations.mute.message' defaultMessage='Are you sure you want to mute {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
         confirm: intl.formatMessage(messages.muteConfirm),

-        onConfirm: () => dispatch(muteAccount(account.get('id')))
+        onConfirm: () => dispatch(muteAccount(account.get('id'))),

       }));
     }
   },
       }));
     }
   },


@@ -78,13 +78,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('CONFIRM', {
       message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.' values={{ domain: <strong>{domain}</strong> }} />,
       confirm: intl.formatMessage(messages.blockDomainConfirm),
     dispatch(openModal('CONFIRM', {
       message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.' values={{ domain: <strong>{domain}</strong> }} />,
       confirm: intl.formatMessage(messages.blockDomainConfirm),

-      onConfirm: () => dispatch(blockDomain(domain, accountId))
+      onConfirm: () => dispatch(blockDomain(domain, accountId)),

     }));
   },
 
   onUnblockDomain (domain, accountId) {
     dispatch(unblockDomain(domain, accountId));
     }));
   },
 
   onUnblockDomain (domain, accountId) {
     dispatch(unblockDomain(domain, accountId));

-  }
+  },

 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Header));
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Header));

diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index 4a7ac3ebad5afbf0e2a62fc209dd75d0822d893e..299f9ad5c97d4dbe0bab3a1c028c6abcd4b54486 100644 (file)
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import {
   fetchAccount,
   fetchAccountTimeline,
 import {
   fetchAccount,
   fetchAccountTimeline,

-  expandAccountTimeline
+  expandAccountTimeline,

 } from '../../actions/accounts';
 import StatusList from '../../components/status_list';
 import LoadingIndicator from '../../components/loading_indicator';
 } from '../../actions/accounts';
 import StatusList from '../../components/status_list';
 import LoadingIndicator from '../../components/loading_indicator';


@@ -19,7 +19,7 @@ const mapStateToProps = (state, props) => ({
   statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'items'], Immutable.List()),
   isLoading: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'isLoading']),
   hasMore: !!state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'next']),
   statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'items'], Immutable.List()),
   isLoading: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'isLoading']),
   hasMore: !!state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'next']),

-  me: state.getIn(['meta', 'me'])
+  me: state.getIn(['meta', 'me']),

 });
 
 class AccountTimeline extends ImmutablePureComponent {
 });
 
 class AccountTimeline extends ImmutablePureComponent {


@@ -30,7 +30,7 @@ class AccountTimeline extends ImmutablePureComponent {
     statusIds: ImmutablePropTypes.list,
     isLoading: PropTypes.bool,
     hasMore: PropTypes.bool,
     statusIds: ImmutablePropTypes.list,
     isLoading: PropTypes.bool,
     hasMore: PropTypes.bool,

-    me: PropTypes.number.isRequired
+    me: PropTypes.number.isRequired,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {

diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js
index d8fd293250bafb98f9555a1fdc08179f43537821..de02e53cc36901ec73cea19836996736540a53fe 100644 (file)
--- a/app/javascript/mastodon/features/blocks/index.js
+++ b/app/javascript/mastodon/features/blocks/index.js
@@ -12,11 +12,11 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({

-  heading: { id: 'column.blocks', defaultMessage: 'Blocked users' }
+  heading: { id: 'column.blocks', defaultMessage: 'Blocked users' },

 });
 
 const mapStateToProps = state => ({
 });
 
 const mapStateToProps = state => ({

-  accountIds: state.getIn(['user_lists', 'blocks', 'items'])
+  accountIds: state.getIn(['user_lists', 'blocks', 'items']),

 });
 
 class Blocks extends ImmutablePureComponent {
 });
 
 class Blocks extends ImmutablePureComponent {


@@ -25,7 +25,7 @@ class Blocks extends ImmutablePureComponent {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     accountIds: ImmutablePropTypes.list,
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     accountIds: ImmutablePropTypes.list,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {


@@ -64,6 +64,7 @@ class Blocks extends ImmutablePureComponent {
       </Column>
     );
   }
       </Column>
     );
   }

+

 }
 
 export default connect(mapStateToProps)(injectIntl(Blocks));
 }
 
 export default connect(mapStateToProps)(injectIntl(Blocks));

diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js
index 5b0efa77cd7132dcfec595a4aa3136d7eb16962a..a8d58d3fa1224c155678ff2e00f9e88b5997ee85 100644 (file)
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@@ -8,20 +8,20 @@ import {
   updateTimeline,
   deleteFromTimelines,
   connectTimeline,
   updateTimeline,
   deleteFromTimelines,
   connectTimeline,

-  disconnectTimeline
+  disconnectTimeline,

 } from '../../actions/timelines';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import createStream from '../../stream';
 
 const messages = defineMessages({
 } from '../../actions/timelines';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import createStream from '../../stream';
 
 const messages = defineMessages({

-  title: { id: 'column.community', defaultMessage: 'Local timeline' }
+  title: { id: 'column.community', defaultMessage: 'Local timeline' },

 });
 
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'community', 'unread']) > 0,
   streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']),
 });
 
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'community', 'unread']) > 0,
   streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']),

-  accessToken: state.getIn(['meta', 'access_token'])
+  accessToken: state.getIn(['meta', 'access_token']),

 });
 
 let subscription;
 });
 
 let subscription;


@@ -33,7 +33,7 @@ class CommunityTimeline extends React.PureComponent {
     intl: PropTypes.object.isRequired,
     streamingAPIBaseURL: PropTypes.string.isRequired,
     accessToken: PropTypes.string.isRequired,
     intl: PropTypes.object.isRequired,
     streamingAPIBaseURL: PropTypes.string.isRequired,
     accessToken: PropTypes.string.isRequired,

-    hasUnread: PropTypes.bool
+    hasUnread: PropTypes.bool,

   };
 
   componentDidMount () {
   };
 
   componentDidMount () {


@@ -68,7 +68,7 @@ class CommunityTimeline extends React.PureComponent {
           dispatch(deleteFromTimelines(data.payload));
           break;
         }
           dispatch(deleteFromTimelines(data.payload));
           break;
         }

-      }
+      },

 
     });
   }
 
     });
   }

diff --git a/app/javascript/mastodon/features/compose/components/autosuggest_account.js b/app/javascript/mastodon/features/compose/components/autosuggest_account.js
index 32bd3ec5c13bfb01a0299c4f9521875a9dd95084..23665811e8e076f563c51ffe175ab8ae999e79f6 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/autosuggest_account.js
+++ b/app/javascript/mastodon/features/compose/components/autosuggest_account.js
@@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 class AutosuggestAccount extends ImmutablePureComponent {
 
   static propTypes = {
 class AutosuggestAccount extends ImmutablePureComponent {
 
   static propTypes = {

-    account: ImmutablePropTypes.map.isRequired
+    account: ImmutablePropTypes.map.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/compose/components/character_counter.js b/app/javascript/mastodon/features/compose/components/character_counter.js
index 29598f953e98cc49c4cd550426a1507f43f4af03..e35f2b879cf2bba774261f7c082544b195746d04 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/character_counter.js
+++ b/app/javascript/mastodon/features/compose/components/character_counter.js
@@ -6,7 +6,7 @@ class CharacterCounter extends React.PureComponent {
 
   static propTypes = {
     text: PropTypes.string.isRequired,
 
   static propTypes = {
     text: PropTypes.string.isRequired,

-    max: PropTypes.number.isRequired
+    max: PropTypes.number.isRequired,

   };
 
   checkRemainingText (diff) {
   };
 
   checkRemainingText (diff) {

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 43f2897304dbb8a90bf11afa6b3b95fbffd70778..43b76e353592b20767a935ececaf10b37dddcbc5 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -53,7 +53,7 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   static defaultProps = {
   };
 
   static defaultProps = {

-    showSearch: false
+    showSearch: false,

   };
 
   handleChange = (e) => {
   };
 
   handleChange = (e) => {

diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index 50b8ef37e4a93be98ef72517ae068d7240a8f535..e3c61b4fe188e66ebec7dc698a6b959e6d803efd 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -13,13 +13,13 @@ const messages = defineMessages({
   travel: { id: 'emoji_button.travel', defaultMessage: 'Travel & Places' },
   objects: { id: 'emoji_button.objects', defaultMessage: 'Objects' },
   symbols: { id: 'emoji_button.symbols', defaultMessage: 'Symbols' },
   travel: { id: 'emoji_button.travel', defaultMessage: 'Travel & Places' },
   objects: { id: 'emoji_button.objects', defaultMessage: 'Objects' },
   symbols: { id: 'emoji_button.symbols', defaultMessage: 'Symbols' },

-  flags: { id: 'emoji_button.flags', defaultMessage: 'Flags' }
+  flags: { id: 'emoji_button.flags', defaultMessage: 'Flags' },

 });
 
 const settings = {
   imageType: 'png',
   sprites: false,
 });
 
 const settings = {
   imageType: 'png',
   sprites: false,

-  imagePathPNG: '/emoji/'
+  imagePathPNG: '/emoji/',

 };
 
 let EmojiPicker; // load asynchronously
 };
 
 let EmojiPicker; // load asynchronously


@@ -28,12 +28,12 @@ class EmojiPickerDropdown extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
 
   static propTypes = {
     intl: PropTypes.object.isRequired,

-    onPickEmoji: PropTypes.func.isRequired
+    onPickEmoji: PropTypes.func.isRequired,

   };
 
   state = {
     active: false,
   };
 
   state = {
     active: false,

-    loading: false
+    loading: false,

   };
 
   setRef = (c) => {
   };
 
   setRef = (c) => {


@@ -98,8 +98,8 @@ class EmojiPickerDropdown extends React.PureComponent {
       flags: {
         title: intl.formatMessage(messages.flags),
         emoji: 'flag_gb',
       flags: {
         title: intl.formatMessage(messages.flags),
         emoji: 'flag_gb',

-      }
-    }
+      },
+    };

 
     const { active, loading } = this.state;
 
 
     const { active, loading } = this.state;
 

diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.js b/app/javascript/mastodon/features/compose/components/navigation_bar.js
index e9ffa67c4c9db48280b3787acf11f2419690aab6..6f3dbc5af65bbe088065950333d6f93665fc00e8 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.js
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.js
@@ -11,7 +11,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 class NavigationBar extends ImmutablePureComponent {
 
   static propTypes = {
 class NavigationBar extends ImmutablePureComponent {
 
   static propTypes = {

-    account: ImmutablePropTypes.map.isRequired
+    account: ImmutablePropTypes.map.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index b02421949d4c731397f1f46d2e145abbda996ceb..8da5ce72a54edf3c4270c8aa41d18a10d41411b2 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -12,24 +12,24 @@ const messages = defineMessages({
   private_long: { id: 'privacy.private.long', defaultMessage: 'Post to followers only' },
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
   direct_long: { id: 'privacy.direct.long', defaultMessage: 'Post to mentioned users only' },
   private_long: { id: 'privacy.private.long', defaultMessage: 'Post to followers only' },
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
   direct_long: { id: 'privacy.direct.long', defaultMessage: 'Post to mentioned users only' },

-  change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' }
+  change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },

 });
 
 const iconStyle = {
   height: null,
 });
 
 const iconStyle = {
   height: null,

-  lineHeight: '27px'
-}
+  lineHeight: '27px',
+};

 
 class PrivacyDropdown extends React.PureComponent {
 
   static propTypes = {
     value: PropTypes.string.isRequired,
     onChange: PropTypes.func.isRequired,
 
 class PrivacyDropdown extends React.PureComponent {
 
   static propTypes = {
     value: PropTypes.string.isRequired,
     onChange: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   state = {
   };
 
   state = {

-    open: false
+    open: false,

   };
 
   handleToggle = () => {
   };
 
   handleToggle = () => {


@@ -71,7 +71,7 @@ class PrivacyDropdown extends React.PureComponent {
       { icon: 'globe', value: 'public', shortText: intl.formatMessage(messages.public_short), longText: intl.formatMessage(messages.public_long) },
       { icon: 'unlock-alt', value: 'unlisted', shortText: intl.formatMessage(messages.unlisted_short), longText: intl.formatMessage(messages.unlisted_long) },
       { icon: 'lock', value: 'private', shortText: intl.formatMessage(messages.private_short), longText: intl.formatMessage(messages.private_long) },
       { icon: 'globe', value: 'public', shortText: intl.formatMessage(messages.public_short), longText: intl.formatMessage(messages.public_long) },
       { icon: 'unlock-alt', value: 'unlisted', shortText: intl.formatMessage(messages.unlisted_short), longText: intl.formatMessage(messages.unlisted_long) },
       { icon: 'lock', value: 'private', shortText: intl.formatMessage(messages.private_short), longText: intl.formatMessage(messages.private_long) },

-      { icon: 'envelope', value: 'direct', shortText: intl.formatMessage(messages.direct_short), longText: intl.formatMessage(messages.direct_long) }
+      { icon: 'envelope', value: 'direct', shortText: intl.formatMessage(messages.direct_short), longText: intl.formatMessage(messages.direct_long) },

     ];
 
     const valueOption = options.find(item => item.value === value);
     ];
 
     const valueOption = options.find(item => item.value === value);

diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js
index 58375976e80dc575e41aaae8ee6e073513cd8f82..8ad4011210238c37f33a624faef3557af548be34 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js
@@ -9,19 +9,19 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({

-  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' }
+  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },

 });
 
 class ReplyIndicator extends ImmutablePureComponent {
 
   static contextTypes = {
 });
 
 class ReplyIndicator extends ImmutablePureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
     status: ImmutablePropTypes.map,
     onCancel: PropTypes.func.isRequired,
   };
 
   static propTypes = {
     status: ImmutablePropTypes.map,
     onCancel: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   handleClick = () => {
   };
 
   handleClick = () => {

diff --git a/app/javascript/mastodon/features/compose/components/search.js b/app/javascript/mastodon/features/compose/components/search.js
index 341d7692092f81aa0037f5baed3e8b1663c9a1bb..800080a7dda95620363c94524e0b2ac0ae6884f7 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/search.js
+++ b/app/javascript/mastodon/features/compose/components/search.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 const messages = defineMessages({
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 const messages = defineMessages({

-  placeholder: { id: 'search.placeholder', defaultMessage: 'Search' }
+  placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },

 });
 
 class Search extends React.PureComponent {
 });
 
 class Search extends React.PureComponent {


@@ -15,7 +15,7 @@ class Search extends React.PureComponent {
     onSubmit: PropTypes.func.isRequired,
     onClear: PropTypes.func.isRequired,
     onShow: PropTypes.func.isRequired,
     onSubmit: PropTypes.func.isRequired,
     onClear: PropTypes.func.isRequired,
     onShow: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   handleChange = (e) => {
   };
 
   handleChange = (e) => {

diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index 87dc810e5b779745e66e5e4920e91a223b2f02d3..e710cc03093ef0e2568b8e01a337b7c7f401f32a 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -9,7 +9,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 class SearchResults extends ImmutablePureComponent {
 
   static propTypes = {
 class SearchResults extends ImmutablePureComponent {
 
   static propTypes = {

-    results: ImmutablePropTypes.map.isRequired
+    results: ImmutablePropTypes.map.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/compose/components/text_icon_button.js b/app/javascript/mastodon/features/compose/components/text_icon_button.js
index f415398e5e082c4cbdaeefa912742e205b224207..cc0fbd11a811cc2bd3be29657d9ff4b81a03ec0e 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/text_icon_button.js
+++ b/app/javascript/mastodon/features/compose/components/text_icon_button.js
@@ -8,7 +8,7 @@ class TextIconButton extends React.PureComponent {
     title: PropTypes.string,
     active: PropTypes.bool,
     onClick: PropTypes.func.isRequired,
     title: PropTypes.string,
     active: PropTypes.bool,
     onClick: PropTypes.func.isRequired,

-    ariaControls: PropTypes.string
+    ariaControls: PropTypes.string,

   };
 
   handleClick = (e) => {
   };
 
   handleClick = (e) => {

diff --git a/app/javascript/mastodon/features/compose/components/upload_button.js b/app/javascript/mastodon/features/compose/components/upload_button.js
index c8c1c0c9d3dc1dfe8f96c298503d5906f928cc0a..bc5cfd1bccc6c53d0ea4878f0eb07e6616c06186 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/upload_button.js
+++ b/app/javascript/mastodon/features/compose/components/upload_button.js
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 
 const messages = defineMessages({
 import { connect } from 'react-redux';
 
 const messages = defineMessages({

-  upload: { id: 'upload_button.label', defaultMessage: 'Add media' }
+  upload: { id: 'upload_button.label', defaultMessage: 'Add media' },

 });
 
 const makeMapStateToProps = () => {
 });
 
 const makeMapStateToProps = () => {


@@ -14,12 +14,12 @@ const makeMapStateToProps = () => {
   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;

-}
+};

 
 const iconStyle = {
   height: null,
 
 const iconStyle = {
   height: null,

-  lineHeight: '27px'
-}
+  lineHeight: '27px',
+};

 
 class UploadButton extends React.PureComponent {
 
 
 class UploadButton extends React.PureComponent {
 


@@ -29,7 +29,7 @@ class UploadButton extends React.PureComponent {
     style: PropTypes.object,
     resetFileKey: PropTypes.number,
     acceptContentTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
     style: PropTypes.object,
     resetFileKey: PropTypes.number,
     acceptContentTypes: PropTypes.arrayOf(PropTypes.string).isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   handleChange = (e) => {
   };
 
   handleChange = (e) => {

diff --git a/app/javascript/mastodon/features/compose/components/upload_form.js b/app/javascript/mastodon/features/compose/components/upload_form.js
index ac26e018ad6c9bf510245078eb0824d941facce4..7e665683a50291e600038368bea0b5e63ae10e44 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/upload_form.js
+++ b/app/javascript/mastodon/features/compose/components/upload_form.js
@@ -8,7 +8,7 @@ import Motion from 'react-motion/lib/Motion';
 import spring from 'react-motion/lib/spring';
 
 const messages = defineMessages({
 import spring from 'react-motion/lib/spring';
 
 const messages = defineMessages({

-  undo: { id: 'upload_form.undo', defaultMessage: 'Undo' }
+  undo: { id: 'upload_form.undo', defaultMessage: 'Undo' },

 });
 
 class UploadForm extends React.PureComponent {
 });
 
 class UploadForm extends React.PureComponent {


@@ -16,7 +16,7 @@ class UploadForm extends React.PureComponent {
   static propTypes = {
     media: ImmutablePropTypes.list.isRequired,
     onRemoveFile: PropTypes.func.isRequired,
   static propTypes = {
     media: ImmutablePropTypes.list.isRequired,
     onRemoveFile: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   onRemoveFile = (e) => {
   };
 
   onRemoveFile = (e) => {

diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.js b/app/javascript/mastodon/features/compose/components/upload_progress.js
index dae6bf259a849edf883dd3dc7e6fa09bdd062fe7..8c8ce3835196d0a61676378f37c4e1306f3488f2 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/upload_progress.js
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.js
@@ -8,7 +8,7 @@ class UploadProgress extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
 
   static propTypes = {
     active: PropTypes.bool,

-    progress: PropTypes.number
+    progress: PropTypes.number,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/compose/components/warning.js b/app/javascript/mastodon/features/compose/components/warning.js
index 9a06b88c010fe34361406b3d21e2d124484ffead..d0e75a5c3fb503855fcc8f7e727baa41392ecfb3 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/warning.js
+++ b/app/javascript/mastodon/features/compose/components/warning.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 class Warning extends React.PureComponent {
 
   static propTypes = {
 class Warning extends React.PureComponent {
 
   static propTypes = {

-    message: PropTypes.node.isRequired
+    message: PropTypes.node.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/compose/containers/autosuggest_account_container.js b/app/javascript/mastodon/features/compose/containers/autosuggest_account_container.js
index de76a364d06615119584cad4a5ab00be7d5f5ca9..4190e54cac914ebfe3804ad3b69c7c942256159f 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/autosuggest_account_container.js
+++ b/app/javascript/mastodon/features/compose/containers/autosuggest_account_container.js
@@ -6,7 +6,7 @@ const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
 
   const mapStateToProps = (state, { id }) => ({
   const getAccount = makeGetAccount();
 
   const mapStateToProps = (state, { id }) => ({

-    account: getAccount(state, id)
+    account: getAccount(state, id),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;

diff --git a/app/javascript/mastodon/features/compose/containers/autosuggest_status_container.js b/app/javascript/mastodon/features/compose/containers/autosuggest_status_container.js
index ef46eb09caa9d6cf29164ab8e4d9fc0ce8a192de..a9e3a9edf210f86521e723bb576ec344d095df98 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/autosuggest_status_container.js
+++ b/app/javascript/mastodon/features/compose/containers/autosuggest_status_container.js
@@ -6,7 +6,7 @@ const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
 
   const mapStateToProps = (state, { id }) => ({
   const getStatus = makeGetStatus();
 
   const mapStateToProps = (state, { id }) => ({

-    status: getStatus(state, id)
+    status: getStatus(state, id),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;

diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index 33ad65be5da228d4d27b3fa77fb67c498d8572f5..12d435ded8f17c41f8775cb9461185ae21aa3729 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -8,7 +8,7 @@ import {
   fetchComposeSuggestions,
   selectComposeSuggestion,
   changeComposeSpoilerText,
   fetchComposeSuggestions,
   selectComposeSuggestion,
   changeComposeSpoilerText,

-  insertEmojiCompose
+  insertEmojiCompose,

 } from '../../../actions/compose';
 
 const mapStateToProps = state => ({
 } from '../../../actions/compose';
 
 const mapStateToProps = state => ({


@@ -23,7 +23,7 @@ const mapStateToProps = state => ({
   is_submitting: state.getIn(['compose', 'is_submitting']),
   is_uploading: state.getIn(['compose', 'is_uploading']),
   me: state.getIn(['compose', 'me']),
   is_submitting: state.getIn(['compose', 'is_submitting']),
   is_uploading: state.getIn(['compose', 'is_uploading']),
   me: state.getIn(['compose', 'me']),

-  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden'])
+  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),

 });
 
 const mapDispatchToProps = (dispatch) => ({
 });
 
 const mapDispatchToProps = (dispatch) => ({

diff --git a/app/javascript/mastodon/features/compose/containers/navigation_container.js b/app/javascript/mastodon/features/compose/containers/navigation_container.js
index 0006608dacc24fd6969765fc424eb953a7c44915..75f288f18525747df2aea73b9c986285e27604ee 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/navigation_container.js
+++ b/app/javascript/mastodon/features/compose/containers/navigation_container.js
@@ -3,7 +3,7 @@ import NavigationBar from '../components/navigation_bar';
 
 const mapStateToProps = (state, props) => {
   return {
 
 const mapStateToProps = (state, props) => {
   return {

-    account: state.getIn(['accounts', state.getIn(['meta', 'me'])])
+    account: state.getIn(['accounts', state.getIn(['meta', 'me'])]),

   };
 };
 
   };
 };
 

diff --git a/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
index 1eee8f84cf87a44e156a519a28f084b809ea6d3e..9c05e054e81e8ef2bdd7187e8f48b1b0eac671e9 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
@@ -3,14 +3,14 @@ import PrivacyDropdown from '../components/privacy_dropdown';
 import { changeComposeVisibility } from '../../../actions/compose';
 
 const mapStateToProps = state => ({
 import { changeComposeVisibility } from '../../../actions/compose';
 
 const mapStateToProps = state => ({

-  value: state.getIn(['compose', 'privacy'])
+  value: state.getIn(['compose', 'privacy']),

 });
 
 const mapDispatchToProps = dispatch => ({
 
   onChange (value) {
     dispatch(changeComposeVisibility(value));
 });
 
 const mapDispatchToProps = dispatch => ({
 
   onChange (value) {
     dispatch(changeComposeVisibility(value));

-  }
+  },

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js b/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
index 39b48f3b6bb30171207eb6d48c44da24a91b68fb..7f3eeb89ced85cbd51f92501bf6237a0b5892d54 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
+++ b/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
@@ -17,7 +17,7 @@ const mapDispatchToProps = dispatch => ({
 
   onCancel () {
     dispatch(cancelReplyCompose());
 
   onCancel () {
     dispatch(cancelReplyCompose());

-  }
+  },

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/compose/containers/search_container.js b/app/javascript/mastodon/features/compose/containers/search_container.js
index 906c0c28c4d0643293c19970f56326869ba932f2..392bd0f5665034da343aeee3a04ad0ce15d9bde6 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/search_container.js
+++ b/app/javascript/mastodon/features/compose/containers/search_container.js
@@ -3,13 +3,13 @@ import {
   changeSearch,
   clearSearch,
   submitSearch,
   changeSearch,
   clearSearch,
   submitSearch,

-  showSearch
+  showSearch,

 } from '../../../actions/search';
 import Search from '../components/search';
 
 const mapStateToProps = state => ({
   value: state.getIn(['search', 'value']),
 } from '../../../actions/search';
 import Search from '../components/search';
 
 const mapStateToProps = state => ({
   value: state.getIn(['search', 'value']),

-  submitted: state.getIn(['search', 'submitted'])
+  submitted: state.getIn(['search', 'submitted']),

 });
 
 const mapDispatchToProps = dispatch => ({
 });
 
 const mapDispatchToProps = dispatch => ({


@@ -28,7 +28,7 @@ const mapDispatchToProps = dispatch => ({
 
   onShow () {
     dispatch(showSearch());
 
   onShow () {
     dispatch(showSearch());

-  }
+  },

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/compose/containers/search_results_container.js b/app/javascript/mastodon/features/compose/containers/search_results_container.js
index e5911fd38831afae02e4155746304b4916215159..16d95d417e4a501126a16fb55afa795133a04911 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/search_results_container.js
+++ b/app/javascript/mastodon/features/compose/containers/search_results_container.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import SearchResults from '../components/search_results';
 
 const mapStateToProps = state => ({
 import SearchResults from '../components/search_results';
 
 const mapStateToProps = state => ({

-  results: state.getIn(['search', 'results'])
+  results: state.getIn(['search', 'results']),

 });
 
 export default connect(mapStateToProps)(SearchResults);
 });
 
 export default connect(mapStateToProps)(SearchResults);

diff --git a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
index c8aed5589b66ce1e5d3938b7e7f09021db683c3f..761ae8c08193aa378a644f3d4e4dff1fb23162bb 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
@@ -8,19 +8,19 @@ import spring from 'react-motion/lib/spring';
 import { injectIntl, defineMessages } from 'react-intl';
 
 const messages = defineMessages({
 import { injectIntl, defineMessages } from 'react-intl';
 
 const messages = defineMessages({

-  title: { id: 'compose_form.sensitive', defaultMessage: 'Mark media as sensitive' }
+  title: { id: 'compose_form.sensitive', defaultMessage: 'Mark media as sensitive' },

 });
 
 const mapStateToProps = state => ({
   visible: state.getIn(['compose', 'media_attachments']).size > 0,
 });
 
 const mapStateToProps = state => ({
   visible: state.getIn(['compose', 'media_attachments']).size > 0,

-  active: state.getIn(['compose', 'sensitive'])
+  active: state.getIn(['compose', 'sensitive']),

 });
 
 const mapDispatchToProps = dispatch => ({
 
   onClick () {
     dispatch(changeComposeSensitivity());
 });
 
 const mapDispatchToProps = dispatch => ({
 
   onClick () {
     dispatch(changeComposeSensitivity());

-  }
+  },

 
 });
 
 
 });
 


@@ -30,7 +30,7 @@ class SensitiveButton extends React.PureComponent {
     visible: PropTypes.bool,
     active: PropTypes.bool,
     onClick: PropTypes.func.isRequired,
     visible: PropTypes.bool,
     active: PropTypes.bool,
     onClick: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
index b1c80fe1963f841933647b8759d92d0811749e29..4179b9706029a9a1bebf7860b9291193c1098b39 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
@@ -4,21 +4,21 @@ import { changeComposeSpoilerness } from '../../../actions/compose';
 import { injectIntl, defineMessages } from 'react-intl';
 
 const messages = defineMessages({
 import { injectIntl, defineMessages } from 'react-intl';
 
 const messages = defineMessages({

-  title: { id: 'compose_form.spoiler', defaultMessage: 'Hide text behind warning' }
+  title: { id: 'compose_form.spoiler', defaultMessage: 'Hide text behind warning' },

 });
 
 const mapStateToProps = (state, { intl }) => ({
   label: 'CW',
   title: intl.formatMessage(messages.title),
   active: state.getIn(['compose', 'spoiler']),
 });
 
 const mapStateToProps = (state, { intl }) => ({
   label: 'CW',
   title: intl.formatMessage(messages.title),
   active: state.getIn(['compose', 'spoiler']),

-  ariaControls: 'cw-spoiler-input'
+  ariaControls: 'cw-spoiler-input',

 });
 
 const mapDispatchToProps = dispatch => ({
 
   onClick () {
     dispatch(changeComposeSpoilerness());
 });
 
 const mapDispatchToProps = dispatch => ({
 
   onClick () {
     dispatch(changeComposeSpoilerness());

-  }
+  },

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/compose/containers/upload_button_container.js b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
index 78e5312f571e279bf4c0e23be6d48b6844adc85d..1f1d915bc84598c8402cbec89fcc6319c124b1f7 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/upload_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
@@ -4,14 +4,14 @@ import { uploadCompose } from '../../../actions/compose';
 
 const mapStateToProps = state => ({
   disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 3 || state.getIn(['compose', 'media_attachments']).some(m => m.get('type') === 'video')),
 
 const mapStateToProps = state => ({
   disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 3 || state.getIn(['compose', 'media_attachments']).some(m => m.get('type') === 'video')),

-  resetFileKey: state.getIn(['compose', 'resetFileKey'])
+  resetFileKey: state.getIn(['compose', 'resetFileKey']),

 });
 
 const mapDispatchToProps = dispatch => ({
 
   onSelectFile (files) {
     dispatch(uploadCompose(files));
 });
 
 const mapDispatchToProps = dispatch => ({
 
   onSelectFile (files) {
     dispatch(uploadCompose(files));

-  }
+  },

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/compose/containers/upload_form_container.js b/app/javascript/mastodon/features/compose/containers/upload_form_container.js
index a6a202e174ea318605c7e3b17db15a30d85bcc49..3125564c27cc9b7ad78f277cb6776841d4b81529 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/upload_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_form_container.js
@@ -10,7 +10,7 @@ const mapDispatchToProps = dispatch => ({
 
   onRemoveFile (media_id) {
     dispatch(undoUploadCompose(media_id));
 
   onRemoveFile (media_id) {
     dispatch(undoUploadCompose(media_id));

-  }
+  },

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js b/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
index b0f1d4d193d385979d5092e001d2c25b7a20141c..51af4440caf816bbced095a0f7492f00d76ea1f0 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
@@ -3,7 +3,7 @@ import UploadProgress from '../components/upload_progress';
 
 const mapStateToProps = (state, props) => ({
   active: state.getIn(['compose', 'is_uploading']),
 
 const mapStateToProps = (state, props) => ({
   active: state.getIn(['compose', 'is_uploading']),

-  progress: state.getIn(['compose', 'progress'])
+  progress: state.getIn(['compose', 'progress']),

 });
 
 export default connect(mapStateToProps)(UploadProgress);
 });
 
 export default connect(mapStateToProps)(UploadProgress);

diff --git a/app/javascript/mastodon/features/compose/containers/warning_container.js b/app/javascript/mastodon/features/compose/containers/warning_container.js
index a5fb8d79dd75655d479d0146f7c61518bc9597f2..6e7d11c63481393f52d24250a099eae328ce3070 100644 (file)
--- a/app/javascript/mastodon/features/compose/containers/warning_container.js
+++ b/app/javascript/mastodon/features/compose/containers/warning_container.js
@@ -20,7 +20,7 @@ const mapStateToProps = state => {
   return {
     needsLeakWarning: (state.getIn(['compose', 'privacy']) === 'private' || state.getIn(['compose', 'privacy']) === 'direct') && mentionedUsernames !== null,
     mentionedDomains: mentionedUsernamesWithDomains,
   return {
     needsLeakWarning: (state.getIn(['compose', 'privacy']) === 'private' || state.getIn(['compose', 'privacy']) === 'direct') && mentionedUsernames !== null,
     mentionedDomains: mentionedUsernamesWithDomains,

-    needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', state.getIn(['meta', 'me']), 'locked'])
+    needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', state.getIn(['meta', 'me']), 'locked']),

   };
 };
 
   };
 };
 

diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 0bea9a090c9a57a52b3fa21a5bf18eb9e34baf89..f64e3b891b12a735c6c0843a0ee97612088bf44a 100644 (file)
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -17,11 +17,11 @@ const messages = defineMessages({
   public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },

-  logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' }
+  logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },

 });
 
 const mapStateToProps = state => ({
 });
 
 const mapStateToProps = state => ({

-  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden'])
+  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),

 });
 
 class Compose extends React.PureComponent {
 });
 
 class Compose extends React.PureComponent {


@@ -30,7 +30,7 @@ class Compose extends React.PureComponent {
     dispatch: PropTypes.func.isRequired,
     withHeader: PropTypes.bool,
     showSearch: PropTypes.bool,
     dispatch: PropTypes.func.isRequired,
     withHeader: PropTypes.bool,
     showSearch: PropTypes.bool,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   componentDidMount () {
   };
 
   componentDidMount () {

diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index acdeae35c6f71a3e2787cb535ac86ae1cfe6b479..2b343ba5ae76e2be1806918ede42c2332c733b39 100644 (file)
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -11,13 +11,13 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({

-  heading: { id: 'column.favourites', defaultMessage: 'Favourites' }
+  heading: { id: 'column.favourites', defaultMessage: 'Favourites' },

 });
 
 const mapStateToProps = state => ({
   statusIds: state.getIn(['status_lists', 'favourites', 'items']),
   loaded: state.getIn(['status_lists', 'favourites', 'loaded']),
 });
 
 const mapStateToProps = state => ({
   statusIds: state.getIn(['status_lists', 'favourites', 'items']),
   loaded: state.getIn(['status_lists', 'favourites', 'loaded']),

-  me: state.getIn(['meta', 'me'])
+  me: state.getIn(['meta', 'me']),

 });
 
 class Favourites extends ImmutablePureComponent {
 });
 
 class Favourites extends ImmutablePureComponent {


@@ -27,7 +27,7 @@ class Favourites extends ImmutablePureComponent {
     statusIds: ImmutablePropTypes.list.isRequired,
     loaded: PropTypes.bool,
     intl: PropTypes.object.isRequired,
     statusIds: ImmutablePropTypes.list.isRequired,
     loaded: PropTypes.bool,
     intl: PropTypes.object.isRequired,

-    me: PropTypes.number.isRequired
+    me: PropTypes.number.isRequired,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {

diff --git a/app/javascript/mastodon/features/favourites/index.js b/app/javascript/mastodon/features/favourites/index.js
index 9571c2b0b13c74a0716b3d65f8e6cdcafe59ab2a..94f9f268b3879b32d2fb6e936b6447a04a9360e8 100644 (file)
--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@@ -11,7 +11,7 @@ import ColumnBackButton from '../../components/column_back_button';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const mapStateToProps = (state, props) => ({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const mapStateToProps = (state, props) => ({

-  accountIds: state.getIn(['user_lists', 'favourited_by', Number(props.params.statusId)])
+  accountIds: state.getIn(['user_lists', 'favourited_by', Number(props.params.statusId)]),

 });
 
 class Favourites extends ImmutablePureComponent {
 });
 
 class Favourites extends ImmutablePureComponent {


@@ -19,7 +19,7 @@ class Favourites extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,

-    accountIds: ImmutablePropTypes.list
+    accountIds: ImmutablePropTypes.list,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {

diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
index be2a36ff1fa0105e0cf6ab2be3faf173933cf1fb..e41597c17ef9f3a6cc8cab9ab11e6613cc6914b4 100644 (file)
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
@@ -11,7 +11,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
   authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
 
 const messages = defineMessages({
   authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },

-  reject: { id: 'follow_request.reject', defaultMessage: 'Reject' }
+  reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },

 });
 
 class AccountAuthorize extends ImmutablePureComponent {
 });
 
 class AccountAuthorize extends ImmutablePureComponent {


@@ -20,7 +20,7 @@ class AccountAuthorize extends ImmutablePureComponent {
     account: ImmutablePropTypes.map.isRequired,
     onAuthorize: PropTypes.func.isRequired,
     onReject: PropTypes.func.isRequired,
     account: ImmutablePropTypes.map.isRequired,
     onAuthorize: PropTypes.func.isRequired,
     onReject: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/follow_requests/containers/account_authorize_container.js b/app/javascript/mastodon/features/follow_requests/containers/account_authorize_container.js
index da1e5eaa14b18ada50450f1062378cfa0f341da4..a423bc79b69c3799bef352dd1dd71fce2243a570 100644 (file)
--- a/app/javascript/mastodon/features/follow_requests/containers/account_authorize_container.js
+++ b/app/javascript/mastodon/features/follow_requests/containers/account_authorize_container.js
@@ -7,7 +7,7 @@ const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
 
   const mapStateToProps = (state, props) => ({
   const getAccount = makeGetAccount();
 
   const mapStateToProps = (state, props) => ({

-    account: getAccount(state, props.id)
+    account: getAccount(state, props.id),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;


@@ -20,7 +20,7 @@ const mapDispatchToProps = (dispatch, { id }) => ({
 
   onReject (account) {
     dispatch(rejectFollowRequest(id));
 
   onReject (account) {
     dispatch(rejectFollowRequest(id));

-  }
+  },

 });
 
 export default connect(makeMapStateToProps, mapDispatchToProps)(AccountAuthorize);
 });
 
 export default connect(makeMapStateToProps, mapDispatchToProps)(AccountAuthorize);

diff --git a/app/javascript/mastodon/features/follow_requests/index.js b/app/javascript/mastodon/features/follow_requests/index.js
index 9d1aef7cf56216e9a5bbf8a06afb6767d44d57cc..446fdbc6e7cbf1469d21ab5738e3ea5bd9dbe0ef 100644 (file)
--- a/app/javascript/mastodon/features/follow_requests/index.js
+++ b/app/javascript/mastodon/features/follow_requests/index.js
@@ -12,11 +12,11 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({

-  heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' }
+  heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' },

 });
 
 const mapStateToProps = state => ({
 });
 
 const mapStateToProps = state => ({

-  accountIds: state.getIn(['user_lists', 'follow_requests', 'items'])
+  accountIds: state.getIn(['user_lists', 'follow_requests', 'items']),

 });
 
 class FollowRequests extends ImmutablePureComponent {
 });
 
 class FollowRequests extends ImmutablePureComponent {


@@ -25,7 +25,7 @@ class FollowRequests extends ImmutablePureComponent {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     accountIds: ImmutablePropTypes.list,
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     accountIds: ImmutablePropTypes.list,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {

diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js
index 7da03da194106272b5dd5f28f50ba1e0bc8c1580..ed7119cda6c3ef641323d4fc4436c640ed49904d 100644 (file)
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -6,7 +6,7 @@ import LoadingIndicator from '../../components/loading_indicator';
 import {
   fetchAccount,
   fetchFollowers,
 import {
   fetchAccount,
   fetchFollowers,

-  expandFollowers
+  expandFollowers,

 } from '../../actions/accounts';
 import { ScrollContainer } from 'react-router-scroll';
 import AccountContainer from '../../containers/account_container';
 } from '../../actions/accounts';
 import { ScrollContainer } from 'react-router-scroll';
 import AccountContainer from '../../containers/account_container';


@@ -17,7 +17,7 @@ import ColumnBackButton from '../../components/column_back_button';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const mapStateToProps = (state, props) => ({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const mapStateToProps = (state, props) => ({

-  accountIds: state.getIn(['user_lists', 'followers', Number(props.params.accountId), 'items'])
+  accountIds: state.getIn(['user_lists', 'followers', Number(props.params.accountId), 'items']),

 });
 
 class Followers extends ImmutablePureComponent {
 });
 
 class Followers extends ImmutablePureComponent {


@@ -25,7 +25,7 @@ class Followers extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,

-    accountIds: ImmutablePropTypes.list
+    accountIds: ImmutablePropTypes.list,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {

diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js
index 43beba9edc173600ac8483fe4598de1574f031eb..dd7ab4d46d1003e8f590d404df96165b6ce1cb50 100644 (file)
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -6,7 +6,7 @@ import LoadingIndicator from '../../components/loading_indicator';
 import {
   fetchAccount,
   fetchFollowing,
 import {
   fetchAccount,
   fetchFollowing,

-  expandFollowing
+  expandFollowing,

 } from '../../actions/accounts';
 import { ScrollContainer } from 'react-router-scroll';
 import AccountContainer from '../../containers/account_container';
 } from '../../actions/accounts';
 import { ScrollContainer } from 'react-router-scroll';
 import AccountContainer from '../../containers/account_container';


@@ -17,7 +17,7 @@ import ColumnBackButton from '../../components/column_back_button';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const mapStateToProps = (state, props) => ({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const mapStateToProps = (state, props) => ({

-  accountIds: state.getIn(['user_lists', 'following', Number(props.params.accountId), 'items'])
+  accountIds: state.getIn(['user_lists', 'following', Number(props.params.accountId), 'items']),

 });
 
 class Following extends ImmutablePureComponent {
 });
 
 class Following extends ImmutablePureComponent {


@@ -25,7 +25,7 @@ class Following extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,

-    accountIds: ImmutablePropTypes.list
+    accountIds: ImmutablePropTypes.list,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {

diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 5e72a5612bccb2f18f5f10c9cb700b20333653d3..d1123878e23e4afabcaa9a87a52ffa957ed00675 100644 (file)
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -21,18 +21,18 @@ const messages = defineMessages({
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },

-  info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' }
+  info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' },

 });
 
 const mapStateToProps = state => ({
 });
 
 const mapStateToProps = state => ({

-  me: state.getIn(['accounts', state.getIn(['meta', 'me'])])
+  me: state.getIn(['accounts', state.getIn(['meta', 'me'])]),

 });
 
 class GettingStarted extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
 });
 
 class GettingStarted extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,

-    me: ImmutablePropTypes.map.isRequired
+    me: ImmutablePropTypes.map.isRequired,

   };
 
   render () {
   };
 
   render () {


@@ -69,7 +69,7 @@ class GettingStarted extends ImmutablePureComponent {
                 values={{
                   faq: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md" rel="noopener" target="_blank"><FormattedMessage id='getting_started.faq' defaultMessage='FAQ' /></a>,
                   userguide: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md" rel="noopener" target="_blank"><FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' /></a>,
                 values={{
                   faq: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md" rel="noopener" target="_blank"><FormattedMessage id='getting_started.faq' defaultMessage='FAQ' /></a>,
                   userguide: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md" rel="noopener" target="_blank"><FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' /></a>,

-                  apps: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md" rel="noopener" target="_blank"><FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' /></a>
+                  apps: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md" rel="noopener" target="_blank"><FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' /></a>,

                 }}
               />
             </p>
                 }}
               />
             </p>


@@ -85,6 +85,7 @@ class GettingStarted extends ImmutablePureComponent {
       </Column>
     );
   }
       </Column>
     );
   }

+

 }
 
 export default connect(mapStateToProps)(injectIntl(GettingStarted));
 }
 
 export default connect(mapStateToProps)(injectIntl(GettingStarted));

diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index 91b62a6f90e4c7e8efb793158a3c3723e3b2f8cd..d997634bab22a542d12041d9199c09f8ff233376 100644 (file)
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -6,7 +6,7 @@ import Column from '../ui/components/column';
 import {
   refreshTimeline,
   updateTimeline,
 import {
   refreshTimeline,
   updateTimeline,

-  deleteFromTimelines
+  deleteFromTimelines,

 } from '../../actions/timelines';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import { FormattedMessage } from 'react-intl';
 } from '../../actions/timelines';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import { FormattedMessage } from 'react-intl';


@@ -15,7 +15,7 @@ import createStream from '../../stream';
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'tag', 'unread']) > 0,
   streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']),
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'tag', 'unread']) > 0,
   streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']),

-  accessToken: state.getIn(['meta', 'access_token'])
+  accessToken: state.getIn(['meta', 'access_token']),

 });
 
 class HashtagTimeline extends React.PureComponent {
 });
 
 class HashtagTimeline extends React.PureComponent {


@@ -25,7 +25,7 @@ class HashtagTimeline extends React.PureComponent {
     dispatch: PropTypes.func.isRequired,
     streamingAPIBaseURL: PropTypes.string.isRequired,
     accessToken: PropTypes.string.isRequired,
     dispatch: PropTypes.func.isRequired,
     streamingAPIBaseURL: PropTypes.string.isRequired,
     accessToken: PropTypes.string.isRequired,

-    hasUnread: PropTypes.bool
+    hasUnread: PropTypes.bool,

   };
 
   _subscribe (dispatch, id) {
   };
 
   _subscribe (dispatch, id) {


@@ -42,7 +42,7 @@ class HashtagTimeline extends React.PureComponent {
           dispatch(deleteFromTimelines(data.payload));
           break;
         }
           dispatch(deleteFromTimelines(data.payload));
           break;
         }

-      }
+      },

 
     });
   }
 
     });
   }

diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.js b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
index 96cade870c6fa53406a83fd44ef0ebbc19d3b399..094053aa86de4f51d7045eaf35100d1ac0b241b9 100644 (file)
--- a/app/javascript/mastodon/features/home_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
@@ -8,7 +8,7 @@ import SettingText from './setting_text';
 
 const messages = defineMessages({
   filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },
 
 const messages = defineMessages({
   filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },

-  settings: { id: 'home.settings', defaultMessage: 'Column settings' }
+  settings: { id: 'home.settings', defaultMessage: 'Column settings' },

 });
 
 class ColumnSettings extends React.PureComponent {
 });
 
 class ColumnSettings extends React.PureComponent {


@@ -17,7 +17,7 @@ class ColumnSettings extends React.PureComponent {
     settings: ImmutablePropTypes.map.isRequired,
     onChange: PropTypes.func.isRequired,
     onSave: PropTypes.func.isRequired,
     settings: ImmutablePropTypes.map.isRequired,
     onChange: PropTypes.func.isRequired,
     onSave: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/home_timeline/components/setting_text.js b/app/javascript/mastodon/features/home_timeline/components/setting_text.js
index a872ae76f40a5ae870c29937cb60f26393936921..d4f177f8abb2ca718487edb1d51f8699214f9ca9 100644 (file)
--- a/app/javascript/mastodon/features/home_timeline/components/setting_text.js
+++ b/app/javascript/mastodon/features/home_timeline/components/setting_text.js
@@ -8,11 +8,11 @@ class SettingText extends React.PureComponent {
     settings: ImmutablePropTypes.map.isRequired,
     settingKey: PropTypes.array.isRequired,
     label: PropTypes.string.isRequired,
     settings: ImmutablePropTypes.map.isRequired,
     settingKey: PropTypes.array.isRequired,
     label: PropTypes.string.isRequired,

-    onChange: PropTypes.func.isRequired
+    onChange: PropTypes.func.isRequired,

   };
 
   handleChange = (e) => {
   };
 
   handleChange = (e) => {

-    this.props.onChange(this.props.settingKey, e.target.value)
+    this.props.onChange(this.props.settingKey, e.target.value);

   }
 
   render () {
   }
 
   render () {

diff --git a/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js b/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js
index 3b3ce19bc07d35101b38b0fa9e983979e486baed..fd8a392982ab4a8fd9ca5187751c6663474b0aee 100644 (file)
--- a/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js
@@ -3,7 +3,7 @@ import ColumnSettings from '../components/column_settings';
 import { changeSetting, saveSettings } from '../../../actions/settings';
 
 const mapStateToProps = state => ({
 import { changeSetting, saveSettings } from '../../../actions/settings';
 
 const mapStateToProps = state => ({

-  settings: state.getIn(['settings', 'home'])
+  settings: state.getIn(['settings', 'home']),

 });
 
 const mapDispatchToProps = dispatch => ({
 });
 
 const mapDispatchToProps = dispatch => ({


@@ -14,7 +14,7 @@ const mapDispatchToProps = dispatch => ({
 
   onSave () {
     dispatch(saveSettings());
 
   onSave () {
     dispatch(saveSettings());

-  }
+  },

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js
index a44ba688259778a2cb8e40232be4526cf37b66f6..8f03adb120cbbae00d0ae98a07488ce5538138c0 100644 (file)
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -8,12 +8,12 @@ import ColumnSettingsContainer from './containers/column_settings_container';
 import Link from 'react-router/lib/Link';
 
 const messages = defineMessages({
 import Link from 'react-router/lib/Link';
 
 const messages = defineMessages({

-  title: { id: 'column.home', defaultMessage: 'Home' }
+  title: { id: 'column.home', defaultMessage: 'Home' },

 });
 
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
 });
 
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,

-  hasFollows: state.getIn(['accounts_counters', state.getIn(['meta', 'me']), 'following_count']) > 0
+  hasFollows: state.getIn(['accounts_counters', state.getIn(['meta', 'me']), 'following_count']) > 0,

 });
 
 class HomeTimeline extends React.PureComponent {
 });
 
 class HomeTimeline extends React.PureComponent {


@@ -21,7 +21,7 @@ class HomeTimeline extends React.PureComponent {
   static propTypes = {
     intl: PropTypes.object.isRequired,
     hasUnread: PropTypes.bool,
   static propTypes = {
     intl: PropTypes.object.isRequired,
     hasUnread: PropTypes.bool,

-    hasFollows: PropTypes.bool
+    hasFollows: PropTypes.bool,

   };
 
   render () {
   };
 
   render () {


@@ -30,7 +30,7 @@ class HomeTimeline extends React.PureComponent {
     let emptyMessage;
 
     if (hasFollows) {
     let emptyMessage;
 
     if (hasFollows) {

-      emptyMessage = <FormattedMessage id='empty_column.home.inactivity' defaultMessage="Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon." />
+      emptyMessage = <FormattedMessage id='empty_column.home.inactivity' defaultMessage="Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon." />;

     } else {
       emptyMessage = <FormattedMessage id='empty_column.home' defaultMessage="You aren't following anyone yet. Visit {public} or use search to get started and meet other users." values={{ public: <Link to='/timelines/public'><FormattedMessage id='empty_column.home.public_timeline' defaultMessage='the public timeline' /></Link> }} />;
     }
     } else {
       emptyMessage = <FormattedMessage id='empty_column.home' defaultMessage="You aren't following anyone yet. Visit {public} or use search to get started and meet other users." values={{ public: <Link to='/timelines/public'><FormattedMessage id='empty_column.home.public_timeline' defaultMessage='the public timeline' /></Link> }} />;
     }

diff --git a/app/javascript/mastodon/features/mutes/index.js b/app/javascript/mastodon/features/mutes/index.js
index 01d4ac8f7c25d56501d81875bd2f3fd7129117ca..f0d8856beba69eecfdc4cc6064ea96abdef3710e 100644 (file)
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -12,11 +12,11 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({

-  heading: { id: 'column.mutes', defaultMessage: 'Muted users' }
+  heading: { id: 'column.mutes', defaultMessage: 'Muted users' },

 });
 
 const mapStateToProps = state => ({
 });
 
 const mapStateToProps = state => ({

-  accountIds: state.getIn(['user_lists', 'mutes', 'items'])
+  accountIds: state.getIn(['user_lists', 'mutes', 'items']),

 });
 
 class Mutes extends ImmutablePureComponent {
 });
 
 class Mutes extends ImmutablePureComponent {


@@ -64,7 +64,7 @@ Mutes.propTypes = {
   params: PropTypes.object.isRequired,
   dispatch: PropTypes.func.isRequired,
   accountIds: ImmutablePropTypes.list,
   params: PropTypes.object.isRequired,
   dispatch: PropTypes.func.isRequired,
   accountIds: ImmutablePropTypes.list,

-  intl: PropTypes.object.isRequired
+  intl: PropTypes.object.isRequired,

 };
 
 export default connect(mapStateToProps)(injectIntl(Mutes));
 };
 
 export default connect(mapStateToProps)(injectIntl(Mutes));

diff --git a/app/javascript/mastodon/features/notifications/components/clear_column_button.js b/app/javascript/mastodon/features/notifications/components/clear_column_button.js
index ec01626b437b1fd8e54328d7acda4286f0c99668..5af04931357f753ead2483be966d20d2b5e4e681 100644 (file)
--- a/app/javascript/mastodon/features/notifications/components/clear_column_button.js
+++ b/app/javascript/mastodon/features/notifications/components/clear_column_button.js
@@ -3,14 +3,14 @@ import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({
 import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({

-  clear: { id: 'notifications.clear', defaultMessage: 'Clear notifications' }
+  clear: { id: 'notifications.clear', defaultMessage: 'Clear notifications' },

 });
 
 class ClearColumnButton extends React.Component {
 
   static propTypes = {
     onClick: PropTypes.func.isRequired,
 });
 
 class ClearColumnButton extends React.Component {
 
   static propTypes = {
     onClick: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   render () {
   };
 
   render () {


@@ -22,6 +22,7 @@ class ClearColumnButton extends React.Component {
       </div>
     );
   }
       </div>
     );
   }

+

 }
 
 export default injectIntl(ClearColumnButton);
 }
 
 export default injectIntl(ClearColumnButton);

diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.js b/app/javascript/mastodon/features/notifications/components/column_settings.js
index 6891bc6bd589ddfbf7f8b637279725636a0ca031..6c1720b9e6b14885553b329a30401299d1d1dc52 100644 (file)
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -6,7 +6,7 @@ import ColumnCollapsable from '../../../components/column_collapsable';
 import SettingToggle from './setting_toggle';
 
 const messages = defineMessages({
 import SettingToggle from './setting_toggle';
 
 const messages = defineMessages({

-  settings: { id: 'notifications.settings', defaultMessage: 'Column settings' }
+  settings: { id: 'notifications.settings', defaultMessage: 'Column settings' },

 });
 
 class ColumnSettings extends React.PureComponent {
 });
 
 class ColumnSettings extends React.PureComponent {


@@ -16,8 +16,8 @@ class ColumnSettings extends React.PureComponent {
     onChange: PropTypes.func.isRequired,
     onSave: PropTypes.func.isRequired,
     intl: PropTypes.shape({
     onChange: PropTypes.func.isRequired,
     onSave: PropTypes.func.isRequired,
     intl: PropTypes.shape({

-      formatMessage: PropTypes.func.isRequired
-    }).isRequired
+      formatMessage: PropTypes.func.isRequired,
+    }).isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index e20be99eaaa3e33c0a7d7e1fcfbdcb97b53a1fe9..433a0d573edabd89bb0fd5bd1551e755308efbe0 100644 (file)
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -12,7 +12,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 class Notification extends ImmutablePureComponent {
 
   static propTypes = {
 class Notification extends ImmutablePureComponent {
 
   static propTypes = {

-    notification: ImmutablePropTypes.map.isRequired
+    notification: ImmutablePropTypes.map.isRequired,

   };
 
   renderFollow (account, link) {
   };
 
   renderFollow (account, link) {

diff --git a/app/javascript/mastodon/features/notifications/components/setting_toggle.js b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
index 8040495312535e76f859e6d3cc91209aade5ecb8..6a42f7c75342ec018229e60143d49e67ae16565c 100644 (file)
--- a/app/javascript/mastodon/features/notifications/components/setting_toggle.js
+++ b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
@@ -10,7 +10,7 @@ class SettingToggle extends React.PureComponent {
     settingKey: PropTypes.array.isRequired,
     label: PropTypes.node.isRequired,
     onChange: PropTypes.func.isRequired,
     settingKey: PropTypes.array.isRequired,
     label: PropTypes.node.isRequired,
     onChange: PropTypes.func.isRequired,

-    htmlFor: PropTypes.string
+    htmlFor: PropTypes.string,

   }
 
   onChange = (e) => {
   }
 
   onChange = (e) => {

diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index bc24c75e0a44250e15e577f1090a489afd53a403..76991d541b7a7aae848b2b8441740e1e0bd4c5ed 100644 (file)
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -3,7 +3,7 @@ import ColumnSettings from '../components/column_settings';
 import { changeSetting, saveSettings } from '../../../actions/settings';
 
 const mapStateToProps = state => ({
 import { changeSetting, saveSettings } from '../../../actions/settings';
 
 const mapStateToProps = state => ({

-  settings: state.getIn(['settings', 'notifications'])
+  settings: state.getIn(['settings', 'notifications']),

 });
 
 const mapDispatchToProps = dispatch => ({
 });
 
 const mapDispatchToProps = dispatch => ({


@@ -14,7 +14,7 @@ const mapDispatchToProps = dispatch => ({
 
   onSave () {
     dispatch(saveSettings());
 
   onSave () {
     dispatch(saveSettings());

-  }
+  },

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index 4ca1b1b7beff08fd6c01345e33a0231a248ecbbc..7862229676c09091530d4dd9d45221bef7f38c7d 100644 (file)
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -6,7 +6,7 @@ const makeMapStateToProps = () => {
   const getNotification = makeGetNotification();
 
   const mapStateToProps = (state, props) => ({
   const getNotification = makeGetNotification();
 
   const mapStateToProps = (state, props) => ({

-    notification: getNotification(state, props.notification, props.accountId)
+    notification: getNotification(state, props.notification, props.accountId),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;

diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index ea4d9086bbfca6a323164101e0e8b45fd75258e9..a62dcd50dd589046175a68e3edb6085b4fa19ad3 100644 (file)
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -17,18 +17,18 @@ import { openModal } from '../../actions/modal';
 const messages = defineMessages({
   title: { id: 'column.notifications', defaultMessage: 'Notifications' },
   clearMessage: { id: 'notifications.clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all your notifications?' },
 const messages = defineMessages({
   title: { id: 'column.notifications', defaultMessage: 'Notifications' },
   clearMessage: { id: 'notifications.clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all your notifications?' },

-  clearConfirm: { id: 'notifications.clear', defaultMessage: 'Clear notifications' }
+  clearConfirm: { id: 'notifications.clear', defaultMessage: 'Clear notifications' },

 });
 
 const getNotifications = createSelector([
   state => Immutable.List(state.getIn(['settings', 'notifications', 'shows']).filter(item => !item).keys()),
 });
 
 const getNotifications = createSelector([
   state => Immutable.List(state.getIn(['settings', 'notifications', 'shows']).filter(item => !item).keys()),

-  state => state.getIn(['notifications', 'items'])
+  state => state.getIn(['notifications', 'items']),

 ], (excludedTypes, notifications) => notifications.filterNot(item => excludedTypes.includes(item.get('type'))));
 
 const mapStateToProps = state => ({
   notifications: getNotifications(state),
   isLoading: state.getIn(['notifications', 'isLoading'], true),
 ], (excludedTypes, notifications) => notifications.filterNot(item => excludedTypes.includes(item.get('type'))));
 
 const mapStateToProps = state => ({
   notifications: getNotifications(state),
   isLoading: state.getIn(['notifications', 'isLoading'], true),

-  isUnread: state.getIn(['notifications', 'unread']) > 0
+  isUnread: state.getIn(['notifications', 'unread']) > 0,

 });
 
 class Notifications extends React.PureComponent {
 });
 
 class Notifications extends React.PureComponent {


@@ -39,11 +39,11 @@ class Notifications extends React.PureComponent {
     shouldUpdateScroll: PropTypes.func,
     intl: PropTypes.object.isRequired,
     isLoading: PropTypes.bool,
     shouldUpdateScroll: PropTypes.func,
     intl: PropTypes.object.isRequired,
     isLoading: PropTypes.bool,

-    isUnread: PropTypes.bool
+    isUnread: PropTypes.bool,

   };
 
   static defaultProps = {
   };
 
   static defaultProps = {

-    trackScroll: true
+    trackScroll: true,

   };
 
   handleScroll = (e) => {
   };
 
   handleScroll = (e) => {


@@ -77,7 +77,7 @@ class Notifications extends React.PureComponent {
     dispatch(openModal('CONFIRM', {
       message: intl.formatMessage(messages.clearMessage),
       confirm: intl.formatMessage(messages.clearConfirm),
     dispatch(openModal('CONFIRM', {
       message: intl.formatMessage(messages.clearMessage),
       confirm: intl.formatMessage(messages.clearConfirm),

-      onConfirm: () => dispatch(clearNotifications())
+      onConfirm: () => dispatch(clearNotifications()),

     }));
   }
 
     }));
   }
 

diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index e7dee731bccbd110eb370988f13ea99297d513e8..228ee8804e0d986bdf6bcaadce36e41fd0a75392 100644 (file)
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -8,20 +8,20 @@ import {
   updateTimeline,
   deleteFromTimelines,
   connectTimeline,
   updateTimeline,
   deleteFromTimelines,
   connectTimeline,

-  disconnectTimeline
+  disconnectTimeline,

 } from '../../actions/timelines';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import createStream from '../../stream';
 
 const messages = defineMessages({
 } from '../../actions/timelines';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import createStream from '../../stream';
 
 const messages = defineMessages({

-  title: { id: 'column.public', defaultMessage: 'Federated timeline' }
+  title: { id: 'column.public', defaultMessage: 'Federated timeline' },

 });
 
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'public', 'unread']) > 0,
   streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']),
 });
 
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'public', 'unread']) > 0,
   streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']),

-  accessToken: state.getIn(['meta', 'access_token'])
+  accessToken: state.getIn(['meta', 'access_token']),

 });
 
 let subscription;
 });
 
 let subscription;


@@ -33,7 +33,7 @@ class PublicTimeline extends React.PureComponent {
     intl: PropTypes.object.isRequired,
     streamingAPIBaseURL: PropTypes.string.isRequired,
     accessToken: PropTypes.string.isRequired,
     intl: PropTypes.object.isRequired,
     streamingAPIBaseURL: PropTypes.string.isRequired,
     accessToken: PropTypes.string.isRequired,

-    hasUnread: PropTypes.bool
+    hasUnread: PropTypes.bool,

   };
 
   componentDidMount () {
   };
 
   componentDidMount () {


@@ -68,7 +68,7 @@ class PublicTimeline extends React.PureComponent {
           dispatch(deleteFromTimelines(data.payload));
           break;
         }
           dispatch(deleteFromTimelines(data.payload));
           break;
         }

-      }
+      },

 
     });
   }
 
     });
   }

diff --git a/app/javascript/mastodon/features/reblogs/index.js b/app/javascript/mastodon/features/reblogs/index.js
index 46634486aa728ab13170001dd9ab91482127945a..13fd1b20e8b15dab301c47138fe024bc17a5b9da 100644 (file)
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@@ -11,7 +11,7 @@ import ColumnBackButton from '../../components/column_back_button';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const mapStateToProps = (state, props) => ({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const mapStateToProps = (state, props) => ({

-  accountIds: state.getIn(['user_lists', 'reblogged_by', Number(props.params.statusId)])
+  accountIds: state.getIn(['user_lists', 'reblogged_by', Number(props.params.statusId)]),

 });
 
 class Reblogs extends ImmutablePureComponent {
 });
 
 class Reblogs extends ImmutablePureComponent {


@@ -19,7 +19,7 @@ class Reblogs extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,

-    accountIds: ImmutablePropTypes.list
+    accountIds: ImmutablePropTypes.list,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {

diff --git a/app/javascript/mastodon/features/report/components/status_check_box.js b/app/javascript/mastodon/features/report/components/status_check_box.js
index deab546f51b7dd809e3b2dccddcf99a742bbd80d..a31eabc21a385008abbf14da933b26a7b19f84f4 100644 (file)
--- a/app/javascript/mastodon/features/report/components/status_check_box.js
+++ b/app/javascript/mastodon/features/report/components/status_check_box.js
@@ -10,7 +10,7 @@ class StatusCheckBox extends React.PureComponent {
     status: ImmutablePropTypes.map.isRequired,
     checked: PropTypes.bool,
     onToggle: PropTypes.func.isRequired,
     status: ImmutablePropTypes.map.isRequired,
     checked: PropTypes.bool,
     onToggle: PropTypes.func.isRequired,

-    disabled: PropTypes.bool
+    disabled: PropTypes.bool,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/report/containers/status_check_box_container.js b/app/javascript/mastodon/features/report/containers/status_check_box_container.js
index 67ce9d9f3b19b37335a0310ff36e82974fcc84b5..8997718a2aa46c8ea4b56f2e310b42c407162490 100644 (file)
--- a/app/javascript/mastodon/features/report/containers/status_check_box_container.js
+++ b/app/javascript/mastodon/features/report/containers/status_check_box_container.js
@@ -5,14 +5,14 @@ import Immutable from 'immutable';
 
 const mapStateToProps = (state, { id }) => ({
   status: state.getIn(['statuses', id]),
 
 const mapStateToProps = (state, { id }) => ({
   status: state.getIn(['statuses', id]),

-  checked: state.getIn(['reports', 'new', 'status_ids'], Immutable.Set()).includes(id)
+  checked: state.getIn(['reports', 'new', 'status_ids'], Immutable.Set()).includes(id),

 });
 
 const mapDispatchToProps = (dispatch, { id }) => ({
 
   onToggle (e) {
     dispatch(toggleStatusReport(id, e.target.checked));
 });
 
 const mapDispatchToProps = (dispatch, { id }) => ({
 
   onToggle (e) {
     dispatch(toggleStatusReport(id, e.target.checked));

-  }
+  },

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/report/index.js b/app/javascript/mastodon/features/report/index.js
index 93852ae4637fd53a850a591a28502be0f836569b..25e601f1a2f840f4f44f62b5ae616428878196df 100644 (file)
--- a/app/javascript/mastodon/features/report/index.js
+++ b/app/javascript/mastodon/features/report/index.js
@@ -15,7 +15,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 const messages = defineMessages({
   heading: { id: 'report.heading', defaultMessage: 'New report' },
   placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' },
 const messages = defineMessages({
   heading: { id: 'report.heading', defaultMessage: 'New report' },
   placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' },

-  submit: { id: 'report.submit', defaultMessage: 'Submit' }
+  submit: { id: 'report.submit', defaultMessage: 'Submit' },

 });
 
 const makeMapStateToProps = () => {
 });
 
 const makeMapStateToProps = () => {


@@ -28,7 +28,7 @@ const makeMapStateToProps = () => {
       isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
       account: getAccount(state, accountId),
       comment: state.getIn(['reports', 'new', 'comment']),
       isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
       account: getAccount(state, accountId),
       comment: state.getIn(['reports', 'new', 'comment']),

-      statusIds: Immutable.OrderedSet(state.getIn(['timelines', 'accounts_timelines', accountId, 'items'])).union(state.getIn(['reports', 'new', 'status_ids']))
+      statusIds: Immutable.OrderedSet(state.getIn(['timelines', 'accounts_timelines', accountId, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])),

     };
   };
 
     };
   };
 


@@ -38,7 +38,7 @@ const makeMapStateToProps = () => {
 class Report extends React.PureComponent {
 
   static contextTypes = {
 class Report extends React.PureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
   };
 
   static propTypes = {


@@ -47,7 +47,7 @@ class Report extends React.PureComponent {
     statusIds: ImmutablePropTypes.orderedSet.isRequired,
     comment: PropTypes.string.isRequired,
     dispatch: PropTypes.func.isRequired,
     statusIds: ImmutablePropTypes.orderedSet.isRequired,
     comment: PropTypes.string.isRequired,
     dispatch: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {

diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 9779f496555a1ceae1987b4b992b67e4b254db26..f2ae4f259416f6993a3043e68da0d46085af4d59 100644 (file)
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -18,7 +18,7 @@ const messages = defineMessages({
 class ActionBar extends React.PureComponent {
 
   static contextTypes = {
 class ActionBar extends React.PureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
   };
 
   static propTypes = {


@@ -30,7 +30,7 @@ class ActionBar extends React.PureComponent {
     onMention: PropTypes.func.isRequired,
     onReport: PropTypes.func,
     me: PropTypes.number.isRequired,
     onMention: PropTypes.func.isRequired,
     onReport: PropTypes.func,
     me: PropTypes.number.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   handleReplyClick = () => {
   };
 
   handleReplyClick = () => {

diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index ff3024e35cc384147db215d5ccd9357a9bcf8b2c..415587d6e1abe7b59518de2d197bd46ad95d75ba 100644 (file)
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';

-import punycode from 'punycode'
+import punycode from 'punycode';

 
 const IDNA_PREFIX = 'xn--';
 
 
 const IDNA_PREFIX = 'xn--';
 


@@ -9,7 +9,7 @@ const decodeIDNA = domain => {
     .split('.')
     .map(part => part.indexOf(IDNA_PREFIX) === 0 ? punycode.decode(part.slice(IDNA_PREFIX.length)) : part)
     .join('.');
     .split('.')
     .map(part => part.indexOf(IDNA_PREFIX) === 0 ? punycode.decode(part.slice(IDNA_PREFIX.length)) : part)
     .join('.');

-}
+};

 
 const getHostname = url => {
   const parser = document.createElement('a');
 
 const getHostname = url => {
   const parser = document.createElement('a');


@@ -20,7 +20,7 @@ const getHostname = url => {
 class Card extends React.PureComponent {
 
   static propTypes = {
 class Card extends React.PureComponent {
 
   static propTypes = {

-    card: ImmutablePropTypes.map
+    card: ImmutablePropTypes.map,

   };
 
   renderLink () {
   };
 
   renderLink () {


@@ -95,6 +95,7 @@ class Card extends React.PureComponent {
       return null;
     }
   }
       return null;
     }
   }

+

 }
 
 export default Card;
 }
 
 export default Card;

diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 57077da45147fedc1c1d1bd5d5d23ac921e64de2..6bbb8ca33c7e21e9b8e6a32c4d191c3c96930dac 100644 (file)
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -15,7 +15,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 class DetailedStatus extends ImmutablePureComponent {
 
   static contextTypes = {
 class DetailedStatus extends ImmutablePureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
   };
 
   static propTypes = {

diff --git a/app/javascript/mastodon/features/status/containers/card_container.js b/app/javascript/mastodon/features/status/containers/card_container.js
index 5c8bfeec2a3dfe4449ba835717421428244e560c..a97404de1903b2b71b5b3a1b0260a274faf2a49d 100644 (file)
--- a/app/javascript/mastodon/features/status/containers/card_container.js
+++ b/app/javascript/mastodon/features/status/containers/card_container.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import Card from '../components/card';
 
 const mapStateToProps = (state, { statusId }) => ({
 import Card from '../components/card';
 
 const mapStateToProps = (state, { statusId }) => ({

-  card: state.getIn(['cards', statusId], null)
+  card: state.getIn(['cards', statusId], null),

 });
 
 export default connect(mapStateToProps)(Card);
 });
 
 export default connect(mapStateToProps)(Card);

diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index e2ba1c5b90ecdf896ad7e0f8f0f4155f35c6fc8a..24cf3d1089bd01faa14a7486e6bd523d06f40245 100644 (file)
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -13,30 +13,30 @@ import {
   favourite,
   unfavourite,
   reblog,
   favourite,
   unfavourite,
   reblog,

-  unreblog
+  unreblog,

 } from '../../actions/interactions';
 import {
   replyCompose,
 } from '../../actions/interactions';
 import {
   replyCompose,

-  mentionCompose
+  mentionCompose,

 } from '../../actions/compose';
 import { deleteStatus } from '../../actions/statuses';
 import { initReport } from '../../actions/reports';
 import {
   makeGetStatus,
   getStatusAncestors,
 } from '../../actions/compose';
 import { deleteStatus } from '../../actions/statuses';
 import { initReport } from '../../actions/reports';
 import {
   makeGetStatus,
   getStatusAncestors,

-  getStatusDescendants
+  getStatusDescendants,

 } from '../../selectors';
 import { ScrollContainer } from 'react-router-scroll';
 import ColumnBackButton from '../../components/column_back_button';
 import StatusContainer from '../../containers/status_container';
 import { openModal } from '../../actions/modal';
 } from '../../selectors';
 import { ScrollContainer } from 'react-router-scroll';
 import ColumnBackButton from '../../components/column_back_button';
 import StatusContainer from '../../containers/status_container';
 import { openModal } from '../../actions/modal';

-import { isMobile } from '../../is_mobile'
+import { isMobile } from '../../is_mobile';

 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 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?' }
+  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },

 });
 
 const makeMapStateToProps = () => {
 });
 
 const makeMapStateToProps = () => {


@@ -48,7 +48,7 @@ const makeMapStateToProps = () => {
     descendantsIds: state.getIn(['timelines', 'descendants', Number(props.params.statusId)]),
     me: state.getIn(['meta', 'me']),
     boostModal: state.getIn(['meta', 'boost_modal']),
     descendantsIds: state.getIn(['timelines', 'descendants', Number(props.params.statusId)]),
     me: state.getIn(['meta', 'me']),
     boostModal: state.getIn(['meta', 'boost_modal']),

-    autoPlayGif: state.getIn(['meta', 'auto_play_gif'])
+    autoPlayGif: state.getIn(['meta', 'auto_play_gif']),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;


@@ -57,7 +57,7 @@ const makeMapStateToProps = () => {
 class Status extends ImmutablePureComponent {
 
   static contextTypes = {
 class Status extends ImmutablePureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
   };
 
   static propTypes = {


@@ -69,7 +69,7 @@ class Status extends ImmutablePureComponent {
     me: PropTypes.number,
     boostModal: PropTypes.bool,
     autoPlayGif: PropTypes.bool,
     me: PropTypes.number,
     boostModal: PropTypes.bool,
     autoPlayGif: PropTypes.bool,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   componentWillMount () {
   };
 
   componentWillMount () {


@@ -116,7 +116,7 @@ class Status extends ImmutablePureComponent {
     dispatch(openModal('CONFIRM', {
       message: intl.formatMessage(messages.deleteMessage),
       confirm: intl.formatMessage(messages.deleteConfirm),
     dispatch(openModal('CONFIRM', {
       message: intl.formatMessage(messages.deleteMessage),
       confirm: intl.formatMessage(messages.deleteConfirm),

-      onConfirm: () => dispatch(deleteStatus(status.get('id')))
+      onConfirm: () => dispatch(deleteStatus(status.get('id'))),

     }));
   }
 
     }));
   }
 

diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index 0bd19b18d8807293c4be91dae533c8932187b8fe..fc6b370954bfd3376795098a818142dab5aaaeeb 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -11,20 +11,20 @@ import DisplayName from '../../../components/display_name';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({

-  reblog: { id: 'status.reblog', defaultMessage: 'Boost' }
+  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },

 });
 
 class BoostModal extends ImmutablePureComponent {
 
   static contextTypes = {
 });
 
 class BoostModal extends ImmutablePureComponent {
 
   static contextTypes = {

-    router: PropTypes.object
+    router: PropTypes.object,

   };
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
     onReblog: PropTypes.func.isRequired,
     onClose: PropTypes.func.isRequired,
   };
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
     onReblog: PropTypes.func.isRequired,
     onClose: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   constructor (props, context) {
   };
 
   constructor (props, context) {

diff --git a/app/javascript/mastodon/features/ui/components/column.js b/app/javascript/mastodon/features/ui/components/column.js
index bcee674ada884821cfab99a6d82884787cbedee0..6a8f02bb8182df812059c5c149d94e23340ed325 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/column.js
+++ b/app/javascript/mastodon/features/ui/components/column.js
@@ -37,7 +37,7 @@ class Column extends React.PureComponent {
     icon: PropTypes.string,
     children: PropTypes.node,
     active: PropTypes.bool,
     icon: PropTypes.string,
     children: PropTypes.node,
     active: PropTypes.bool,

-    hideHeadingOnMobile: PropTypes.bool
+    hideHeadingOnMobile: PropTypes.bool,

   };
 
   handleHeaderClick = () => {
   };
 
   handleHeaderClick = () => {


@@ -61,11 +61,11 @@ class Column extends React.PureComponent {
   render () {
     const { heading, icon, children, active, hideHeadingOnMobile } = this.props;
 
   render () {
     const { heading, icon, children, active, hideHeadingOnMobile } = this.props;
 

-    let columnHeaderId = null
+    let columnHeaderId = null;

     let header = '';
 
     if (heading) {
     let header = '';
 
     if (heading) {

-      columnHeaderId = heading.replace(/ /g, '-')
+      columnHeaderId = heading.replace(/ /g, '-');

       header = <ColumnHeader icon={icon} active={active} type={heading} onClick={this.handleHeaderClick} hideOnMobile={hideHeadingOnMobile} columnHeaderId={columnHeaderId}/>;
     }
     return (
       header = <ColumnHeader icon={icon} active={active} type={heading} onClick={this.handleHeaderClick} hideOnMobile={hideHeadingOnMobile} columnHeaderId={columnHeaderId}/>;
     }
     return (

diff --git a/app/javascript/mastodon/features/ui/components/column_header.js b/app/javascript/mastodon/features/ui/components/column_header.js
index fd5f27076be7847f27b9fa18d4a519e178aeb0b1..578432fec497bb99a47b54106a50a5144eaf9be6 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/column_header.js
+++ b/app/javascript/mastodon/features/ui/components/column_header.js
@@ -1,5 +1,5 @@
 import React from 'react';
 import React from 'react';

-import PropTypes from 'prop-types'
+import PropTypes from 'prop-types';

 
 class ColumnHeader extends React.PureComponent {
 
 
 class ColumnHeader extends React.PureComponent {
 


@@ -9,7 +9,7 @@ class ColumnHeader extends React.PureComponent {
     active: PropTypes.bool,
     onClick: PropTypes.func,
     hideOnMobile: PropTypes.bool,
     active: PropTypes.bool,
     onClick: PropTypes.func,
     hideOnMobile: PropTypes.bool,

-    columnHeaderId: PropTypes.string
+    columnHeaderId: PropTypes.string,

   };
 
   handleClick = () => {
   };
 
   handleClick = () => {

diff --git a/app/javascript/mastodon/features/ui/components/column_link.js b/app/javascript/mastodon/features/ui/components/column_link.js
index dd30b14e099c633e97295bf0d8797a91f86c6cdc..24387af57c2fe6cbc4001c897d9c8d25e77436e9 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/column_link.js
+++ b/app/javascript/mastodon/features/ui/components/column_link.js
@@ -26,7 +26,7 @@ ColumnLink.propTypes = {
   to: PropTypes.string,
   href: PropTypes.string,
   method: PropTypes.string,
   to: PropTypes.string,
   href: PropTypes.string,
   method: PropTypes.string,

-  hideOnMobile: PropTypes.bool
+  hideOnMobile: PropTypes.bool,

 };
 
 export default ColumnLink;
 };
 
 export default ColumnLink;

diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 588db3abd5c5f08bba79bd89bd489f66d9ab13c3..ccff417efc9176ca84be5d495961c30478e7f033 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 class ColumnsArea extends React.PureComponent {
 
   static propTypes = {
 class ColumnsArea extends React.PureComponent {
 
   static propTypes = {

-    children: PropTypes.node
+    children: PropTypes.node,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modal.js b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
index bb592a2eded01d08cbdbc3c81452a41c0d71097a..d0c0927377196bbc02c179ed0469c0cc09457554 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/confirmation_modal.js
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
@@ -10,7 +10,7 @@ class ConfirmationModal extends React.PureComponent {
     confirm: PropTypes.string.isRequired,
     onClose: PropTypes.func.isRequired,
     onConfirm: PropTypes.func.isRequired,
     confirm: PropTypes.string.isRequired,
     onClose: PropTypes.func.isRequired,
     onConfirm: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   handleClick = () => {
   };
 
   handleClick = () => {

diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index c82ec49e88d626197e8a32d0a01bd003c31f2031..a8912841b5a46ee770e31f914b748291d9376d5b 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -9,7 +9,7 @@ import IconButton from '../../../components/icon_button';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({

-  close: { id: 'lightbox.close', defaultMessage: 'Close' }
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },

 });
 
 class MediaModal extends ImmutablePureComponent {
 });
 
 class MediaModal extends ImmutablePureComponent {


@@ -18,11 +18,11 @@ class MediaModal extends ImmutablePureComponent {
     media: ImmutablePropTypes.list.isRequired,
     index: PropTypes.number.isRequired,
     onClose: PropTypes.func.isRequired,
     media: ImmutablePropTypes.list.isRequired,
     index: PropTypes.number.isRequired,
     onClose: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   state = {
   };
 
   state = {

-    index: null
+    index: null,

   };
 
   handleNextClick = () => {
   };
 
   handleNextClick = () => {

diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index 24b466bc5b84c4f7555105457cdb9f1727ff8d7f..13629da4132cfd861842478402fb8b87ee3fa2b7 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -13,7 +13,7 @@ const MODAL_COMPONENTS = {
   'ONBOARDING': OnboardingModal,
   'VIDEO': VideoModal,
   'BOOST': BoostModal,
   'ONBOARDING': OnboardingModal,
   'VIDEO': VideoModal,
   'BOOST': BoostModal,

-  'CONFIRM': ConfirmationModal
+  'CONFIRM': ConfirmationModal,

 };
 
 class ModalRoot extends React.PureComponent {
 };
 
 class ModalRoot extends React.PureComponent {


@@ -21,7 +21,7 @@ class ModalRoot extends React.PureComponent {
   static propTypes = {
     type: PropTypes.string,
     props: PropTypes.object,
   static propTypes = {
     type: PropTypes.string,
     props: PropTypes.object,

-    onClose: PropTypes.func.isRequired
+    onClose: PropTypes.func.isRequired,

   };
 
   handleKeyUp = (e) => {
   };
 
   handleKeyUp = (e) => {


@@ -56,7 +56,7 @@ class ModalRoot extends React.PureComponent {
       items.push({
         key: type,
         data: { type, props },
       items.push({
         key: type,
         data: { type, props },

-        style: { opacity: spring(1), scale: spring(1, { stiffness: 120, damping: 14 }) }
+        style: { opacity: spring(1), scale: spring(1, { stiffness: 120, damping: 14 }) },

       });
     }
 
       });
     }
 

diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
index ee20fc94a9761b257995737d359bf3805214c5f2..2757ff3237ea6e00443b21b2259f18a458b39c86 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
@@ -18,7 +18,7 @@ const messages = defineMessages({
   home_title: { id: 'column.home', defaultMessage: 'Home' },
   notifications_title: { id: 'column.notifications', defaultMessage: 'Notifications' },
   local_title: { id: 'column.community', defaultMessage: 'Local timeline' },
   home_title: { id: 'column.home', defaultMessage: 'Home' },
   notifications_title: { id: 'column.notifications', defaultMessage: 'Notifications' },
   local_title: { id: 'column.community', defaultMessage: 'Local timeline' },

-  federated_title: { id: 'column.public', defaultMessage: 'Federated timeline' }
+  federated_title: { id: 'column.public', defaultMessage: 'Federated timeline' },

 });
 
 const PageOne = ({ acct, domain }) => (
 });
 
 const PageOne = ({ acct, domain }) => (


@@ -37,7 +37,7 @@ const PageOne = ({ acct, domain }) => (
 
 PageOne.propTypes = {
   acct: PropTypes.string.isRequired,
 
 PageOne.propTypes = {
   acct: PropTypes.string.isRequired,

-  domain: PropTypes.string.isRequired
+  domain: PropTypes.string.isRequired,

 };
 
 const PageTwo = ({ me }) => (
 };
 
 const PageTwo = ({ me }) => (


@@ -93,7 +93,7 @@ const PageThree = ({ me, domain }) => (
 
 PageThree.propTypes = {
   me: ImmutablePropTypes.map.isRequired,
 
 PageThree.propTypes = {
   me: ImmutablePropTypes.map.isRequired,

-  domain: PropTypes.string.isRequired
+  domain: PropTypes.string.isRequired,

 };
 
 const PageFour = ({ domain, intl }) => (
 };
 
 const PageFour = ({ domain, intl }) => (


@@ -128,7 +128,7 @@ const PageFour = ({ domain, intl }) => (
 
 PageFour.propTypes = {
   domain: PropTypes.string.isRequired,
 
 PageFour.propTypes = {
   domain: PropTypes.string.isRequired,

-  intl: PropTypes.object.isRequired
+  intl: PropTypes.object.isRequired,

 };
 
 const PageSix = ({ admin, domain }) => {
 };
 
 const PageSix = ({ admin, domain }) => {


@@ -157,13 +157,13 @@ const PageSix = ({ admin, domain }) => {
 
 PageSix.propTypes = {
   admin: ImmutablePropTypes.map,
 
 PageSix.propTypes = {
   admin: ImmutablePropTypes.map,

-  domain: PropTypes.string.isRequired
+  domain: PropTypes.string.isRequired,

 };
 
 const mapStateToProps = state => ({
   me: state.getIn(['accounts', state.getIn(['meta', 'me'])]),
   admin: state.getIn(['accounts', state.getIn(['meta', 'admin'])]),
 };
 
 const mapStateToProps = state => ({
   me: state.getIn(['accounts', state.getIn(['meta', 'me'])]),
   admin: state.getIn(['accounts', state.getIn(['meta', 'admin'])]),

-  domain: state.getIn(['meta', 'domain'])
+  domain: state.getIn(['meta', 'domain']),

 });
 
 class OnboardingModal extends React.PureComponent {
 });
 
 class OnboardingModal extends React.PureComponent {


@@ -173,11 +173,11 @@ class OnboardingModal extends React.PureComponent {
     intl: PropTypes.object.isRequired,
     me: ImmutablePropTypes.map.isRequired,
     domain: PropTypes.string.isRequired,
     intl: PropTypes.object.isRequired,
     me: ImmutablePropTypes.map.isRequired,
     domain: PropTypes.string.isRequired,

-    admin: ImmutablePropTypes.map
+    admin: ImmutablePropTypes.map,

   };
 
   state = {
   };
 
   state = {

-    currentIndex: 0
+    currentIndex: 0,

   };
 
   handleSkip = (e) => {
   };
 
   handleSkip = (e) => {


@@ -210,7 +210,7 @@ class OnboardingModal extends React.PureComponent {
       <PageTwo me={me} />,
       <PageThree me={me} domain={domain} />,
       <PageFour domain={domain} intl={intl} />,
       <PageTwo me={me} />,
       <PageThree me={me} domain={domain} />,
       <PageFour domain={domain} intl={intl} />,

-      <PageSix admin={admin} domain={domain} />
+      <PageSix admin={admin} domain={domain} />,

     ];
 
     const { currentIndex } = this.state;
     ];
 
     const { currentIndex } = this.state;


@@ -226,7 +226,7 @@ class OnboardingModal extends React.PureComponent {
 
     const styles = pages.map((page, i) => ({
       key: `page-${i}`,
 
     const styles = pages.map((page, i) => ({
       key: `page-${i}`,

-      style: { opacity: spring(i === currentIndex ? 1 : 0) }
+      style: { opacity: spring(i === currentIndex ? 1 : 0) },

     }));
 
     return (
     }));
 
     return (

diff --git a/app/javascript/mastodon/features/ui/components/upload_area.js b/app/javascript/mastodon/features/ui/components/upload_area.js
index c7f54658833e7b57cec987a69c57221f7975d861..c40fe1fb92283643a35dc0662af38e57b621c293 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/upload_area.js
+++ b/app/javascript/mastodon/features/ui/components/upload_area.js
@@ -8,14 +8,14 @@ class UploadArea extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
 
   static propTypes = {
     active: PropTypes.bool,

-    onClose: PropTypes.func
+    onClose: PropTypes.func,

   };
 
   handleKeyUp = (e) => {
     e.preventDefault();
     e.stopPropagation();
 
   };
 
   handleKeyUp = (e) => {
     e.preventDefault();
     e.stopPropagation();
 

-    const keyCode = e.keyCode
+    const keyCode = e.keyCode;

     if (this.props.active) {
       switch(keyCode) {
       case 27:
     if (this.props.active) {
       switch(keyCode) {
       case 27:

diff --git a/app/javascript/mastodon/features/ui/components/video_modal.js b/app/javascript/mastodon/features/ui/components/video_modal.js
index 86567dcb896350376bc3f00b65af705b8627830e..84a2e1b254ce7511061e26b382a70b3f86cd8a62 100644 (file)
--- a/app/javascript/mastodon/features/ui/components/video_modal.js
+++ b/app/javascript/mastodon/features/ui/components/video_modal.js
@@ -8,7 +8,7 @@ import IconButton from '../../../components/icon_button';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({

-  close: { id: 'lightbox.close', defaultMessage: 'Close' }
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },

 });
 
 class VideoModal extends ImmutablePureComponent {
 });
 
 class VideoModal extends ImmutablePureComponent {


@@ -17,7 +17,7 @@ class VideoModal extends ImmutablePureComponent {
     media: ImmutablePropTypes.map.isRequired,
     time: PropTypes.number,
     onClose: PropTypes.func.isRequired,
     media: ImmutablePropTypes.map.isRequired,
     time: PropTypes.number,
     onClose: PropTypes.func.isRequired,

-    intl: PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired,

   };
 
   render () {
   };
 
   render () {

diff --git a/app/javascript/mastodon/features/ui/containers/loading_bar_container.js b/app/javascript/mastodon/features/ui/containers/loading_bar_container.js
index 6c4e73e38690ee7cfe3070364bf3e75ccc8c48cb..4bb90fb689f5ba64ab81b123f4ef64ba332d6e69 100644 (file)
--- a/app/javascript/mastodon/features/ui/containers/loading_bar_container.js
+++ b/app/javascript/mastodon/features/ui/containers/loading_bar_container.js
@@ -2,7 +2,7 @@ import { connect }    from 'react-redux';
 import LoadingBar from 'react-redux-loading-bar';
 
 const mapStateToProps = (state) => ({
 import LoadingBar from 'react-redux-loading-bar';
 
 const mapStateToProps = (state) => ({

-  loading: state.get('loadingBar')
+  loading: state.get('loadingBar'),

 });
 
 export default connect(mapStateToProps)(LoadingBar.WrappedComponent);
 });
 
 export default connect(mapStateToProps)(LoadingBar.WrappedComponent);

diff --git a/app/javascript/mastodon/features/ui/containers/modal_container.js b/app/javascript/mastodon/features/ui/containers/modal_container.js
index 26d77818c252814be87ac4096bcc5c33597fa9c6..2d27180f7ed1cc2461a4da2ae01c0ae9c45fb1ed 100644 (file)
--- a/app/javascript/mastodon/features/ui/containers/modal_container.js
+++ b/app/javascript/mastodon/features/ui/containers/modal_container.js
@@ -4,7 +4,7 @@ import ModalRoot from '../components/modal_root';
 
 const mapStateToProps = state => ({
   type: state.get('modal').modalType,
 
 const mapStateToProps = state => ({
   type: state.get('modal').modalType,

-  props: state.get('modal').modalProps
+  props: state.get('modal').modalProps,

 });
 
 const mapDispatchToProps = dispatch => ({
 });
 
 const mapDispatchToProps = dispatch => ({

diff --git a/app/javascript/mastodon/features/ui/containers/notifications_container.js b/app/javascript/mastodon/features/ui/containers/notifications_container.js
index 529ebf6c8eef0dfdeb6065237c7f1fe6603ce24f..8bc30df3547087ed1eba6d81f7e769dc078aa92a 100644 (file)
--- a/app/javascript/mastodon/features/ui/containers/notifications_container.js
+++ b/app/javascript/mastodon/features/ui/containers/notifications_container.js
@@ -2,19 +2,19 @@ import { connect } from 'react-redux';
 import { NotificationStack } from 'react-notification';
 import {
   dismissAlert,
 import { NotificationStack } from 'react-notification';
 import {
   dismissAlert,

-  clearAlerts
+  clearAlerts,

 } from '../../../actions/alerts';
 import { getAlerts } from '../../../selectors';
 
 const mapStateToProps = (state, props) => ({
 } from '../../../actions/alerts';
 import { getAlerts } from '../../../selectors';
 
 const mapStateToProps = (state, props) => ({

-  notifications: getAlerts(state)
+  notifications: getAlerts(state),

 });
 
 const mapDispatchToProps = (dispatch) => {
   return {
     onDismiss: alert => {
       dispatch(dismissAlert(alert));
 });
 
 const mapDispatchToProps = (dispatch) => {
   return {
     onDismiss: alert => {
       dispatch(dismissAlert(alert));

-    }
+    },

   };
 };
 
   };
 };
 

diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index e0e01cf18f0f0743aced50e0562ab8c91785a12e..14222fedd902dae097e309e69f8ab6a34288e709 100644 (file)
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -9,7 +9,7 @@ const makeGetStatusIds = () => createSelector([
   (state, { type }) => state.getIn(['settings', type], Immutable.Map()),
   (state, { type }) => state.getIn(['timelines', type, 'items'], Immutable.List()),
   (state)           => state.get('statuses'),
   (state, { type }) => state.getIn(['settings', type], Immutable.Map()),
   (state, { type }) => state.getIn(['timelines', type, 'items'], Immutable.List()),
   (state)           => state.get('statuses'),

-  (state)           => state.getIn(['meta', 'me'])
+  (state)           => state.getIn(['meta', 'me']),

 ], (columnSettings, statusIds, statuses, me) => statusIds.filter(id => {
   const statusForId = statuses.get(id);
   let showStatus    = true;
 ], (columnSettings, statusIds, statuses, me) => statusIds.filter(id => {
   const statusForId = statuses.get(id);
   let showStatus    = true;


@@ -45,7 +45,7 @@ const makeMapStateToProps = () => {
     statusIds: getStatusIds(state, props),
     isLoading: state.getIn(['timelines', props.type, 'isLoading'], true),
     isUnread: state.getIn(['timelines', props.type, 'unread']) > 0,
     statusIds: getStatusIds(state, props),
     isLoading: state.getIn(['timelines', props.type, 'isLoading'], true),
     isUnread: state.getIn(['timelines', props.type, 'unread']) > 0,

-    hasMore: !!state.getIn(['timelines', props.type, 'next'])
+    hasMore: !!state.getIn(['timelines', props.type, 'next']),

   });
 
   return mapStateToProps;
   });
 
   return mapStateToProps;


@@ -64,7 +64,7 @@ const mapDispatchToProps = (dispatch, { type, id }) => ({
 
   onScroll: debounce(() => {
     dispatch(scrollTopTimeline(type, false));
 
   onScroll: debounce(() => {
     dispatch(scrollTopTimeline(type, false));

-  }, 100)
+  }, 100),

 
 });
 
 
 });
 

diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index bc465aa5a5b2bd05583c9bb903afb5cdc4535e41..af124b1ee02a1d6373616aabbbcd4b1a39ba3248 100644 (file)
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -22,12 +22,12 @@ class UI extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,

-    children: PropTypes.node
+    children: PropTypes.node,

   };
 
   state = {
     width: window.innerWidth,
   };
 
   state = {
     width: window.innerWidth,

-    draggingOver: false
+    draggingOver: false,

   };
 
   handleResize = () => {
   };
 
   handleResize = () => {

diff --git a/app/javascript/mastodon/link_header.js b/app/javascript/mastodon/link_header.js
index b872dc24ae8a3bf843e543fa6c49d9667421321c..a3e7ccf1c1b01633a65bb2d9734ac72594909177 100644 (file)
--- a/app/javascript/mastodon/link_header.js
+++ b/app/javascript/mastodon/link_header.js
@@ -2,32 +2,32 @@ import Link from 'http-link-header';
 import querystring from 'querystring';
 
 Link.parseAttrs = (link, parts) => {
 import querystring from 'querystring';
 
 Link.parseAttrs = (link, parts) => {

-  let match = null
-  let attr  = ''
-  let value = ''
-  let attrs = ''
+  let match = null;
+  let attr  = '';
+  let value = '';
+  let attrs = '';

 
 

-  let uriAttrs = /<(.*)>;\s*(.*)/gi.exec(parts)
+  let uriAttrs = /<(.*)>;\s*(.*)/gi.exec(parts);

 
   if(uriAttrs) {
 
   if(uriAttrs) {

-    attrs = uriAttrs[2]
-    link  = Link.parseParams(link, uriAttrs[1])
+    attrs = uriAttrs[2];
+    link  = Link.parseParams(link, uriAttrs[1]);

   }
 
   while(match = Link.attrPattern.exec(attrs)) { // eslint-disable-line no-cond-assign
   }
 
   while(match = Link.attrPattern.exec(attrs)) { // eslint-disable-line no-cond-assign

-    attr  = match[1].toLowerCase()
-    value = match[4] || match[3] || match[2]
+    attr  = match[1].toLowerCase();
+    value = match[4] || match[3] || match[2];

 
     if( /\*$/.test(attr)) {
 
     if( /\*$/.test(attr)) {

-      Link.setAttr(link, attr, Link.parseExtendedValue(value))
+      Link.setAttr(link, attr, Link.parseExtendedValue(value));

     } else if(/%/.test(value)) {
     } else if(/%/.test(value)) {

-      Link.setAttr(link, attr, querystring.decode(value))
+      Link.setAttr(link, attr, querystring.decode(value));

     } else {
     } else {

-      Link.setAttr(link, attr, value)
+      Link.setAttr(link, attr, value);

     }
   }
 
     }
   }
 

-  return link
+  return link;

 };
 
 export default Link;
 };
 
 export default Link;

diff --git a/app/javascript/mastodon/locales/locale-data/oc.js b/app/javascript/mastodon/locales/locale-data/oc.js
index 4abd02a2b348b24137eef9f675f91f99217a8c41..5a85866c8348985e34edc488b1196fca02116207 100644 (file)
--- a/app/javascript/mastodon/locales/locale-data/oc.js
+++ b/app/javascript/mastodon/locales/locale-data/oc.js
@@ -12,96 +12,96 @@ export default [{
       relative: {
         0: "ongan",
         1: "l'an que ven",
       relative: {
         0: "ongan",
         1: "l'an que ven",

-        "-1": "l'an passat"
+        "-1": "l'an passat",

       },
       relativeTime: {
         future: {
           one: "dins {0} an",
       },
       relativeTime: {
         future: {
           one: "dins {0} an",

-          other: "dins {0} ans"
+          other: "dins {0} ans",

         },
         past: {
           one: "fa {0} an",
         },
         past: {
           one: "fa {0} an",

-          other: "fa {0} ans"
-        }
-      }
+          other: "fa {0} ans",
+        },
+      },

     },
     month: {
       displayName: "mes",
       relative: {
         0: "aqueste mes",
         1: "lo mes que ven",
     },
     month: {
       displayName: "mes",
       relative: {
         0: "aqueste mes",
         1: "lo mes que ven",

-        "-1": "lo mes passat"
+        "-1": "lo mes passat",

       },
       relativeTime: {
         future: {
           one: "dins {0} mes",
       },
       relativeTime: {
         future: {
           one: "dins {0} mes",

-          other: "dins {0} meses"
+          other: "dins {0} meses",

         },
         past: {
           one: "fa {0} mes",
         },
         past: {
           one: "fa {0} mes",

-          other: "fa {0} meses"
-        }
-      }
+          other: "fa {0} meses",
+        },
+      },

     },
     day: {
       displayName: "jorn",
       relative: {
         0: "uèi",
         1: "deman",
     },
     day: {
       displayName: "jorn",
       relative: {
         0: "uèi",
         1: "deman",

-        "-1": "ièr"
+        "-1": "ièr",

       },
       relativeTime: {
         future: {
           one: "dins {0} jorn",
       },
       relativeTime: {
         future: {
           one: "dins {0} jorn",

-          other: "dins {0} jorns"
+          other: "dins {0} jorns",

         },
         past: {
           one: "fa {0} jorn",
         },
         past: {
           one: "fa {0} jorn",

-          other: "fa {0} jorns"
-        }
-      }
+          other: "fa {0} jorns",
+        },
+      },

     },
     hour: {
       displayName: "ora",
       relativeTime: {
         future: {
           one: "dins {0} ora",
     },
     hour: {
       displayName: "ora",
       relativeTime: {
         future: {
           one: "dins {0} ora",

-          other: "dins {0} oras"
+          other: "dins {0} oras",

         },
         past: {
           one: "fa {0} ora",
         },
         past: {
           one: "fa {0} ora",

-          other: "fa {0} oras"
-        }
-      }
+          other: "fa {0} oras",
+        },
+      },

     },
     minute: {
       displayName: "minuta",
       relativeTime: {
         future: {
           one: "dins {0} minuta",
     },
     minute: {
       displayName: "minuta",
       relativeTime: {
         future: {
           one: "dins {0} minuta",

-          other: "dins {0} minutas"
+          other: "dins {0} minutas",

         },
         past: {
           one: "fa {0} minuta",
         },
         past: {
           one: "fa {0} minuta",

-          other: "fa {0} minutas"
-        }
-      }
+          other: "fa {0} minutas",
+        },
+      },

     },
     second: {
       displayName: "segonda",
       relative: {
     },
     second: {
       displayName: "segonda",
       relative: {

-        0: "ara"
+        0: "ara",

       },
       relativeTime: {
         future: {
           one: "dins {0} segonda",
       },
       relativeTime: {
         future: {
           one: "dins {0} segonda",

-          other: "dins {0} segondas"
+          other: "dins {0} segondas",

         },
         past: {
           one: "fa {0} segonda",
         },
         past: {
           one: "fa {0} segonda",

-          other: "fa {0} segondas"
-        }
-      }
-    }
-  }
-}]
+          other: "fa {0} segondas",
+        },
+      },
+    },
+  },
+}];

diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index 313721c88de79910d906073d899c072a08f5a4f4..d11cb8521926fe05afcf700341920125be401590 100644 (file)
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -32,4 +32,4 @@ function main() {
   });
 }
 
   });
 }
 

-export default main
+export default main;

diff --git a/app/javascript/mastodon/middleware/sounds.js b/app/javascript/mastodon/middleware/sounds.js
index 639214b149b0224c65c79f1ef7f56dfebc1f805c..fd5a2b960ee97911bfce73e18c2bf686ed0f7844 100644 (file)
--- a/app/javascript/mastodon/middleware/sounds.js
+++ b/app/javascript/mastodon/middleware/sounds.js
@@ -7,7 +7,7 @@ const createAudio = sources => {
     audio.appendChild(source);
   });
   return audio;
     audio.appendChild(source);
   });
   return audio;

-}
+};

 
 const play = audio => {
   if (!audio.paused) {
 
 const play = audio => {
   if (!audio.paused) {


@@ -27,7 +27,7 @@ export default function soundsMiddleware() {
       },
       {
         src: '/sounds/boop.mp3',
       },
       {
         src: '/sounds/boop.mp3',

-        type: 'audio/mpeg'
+        type: 'audio/mpeg',

       },
     ]),
   };
       },
     ]),
   };

diff --git a/app/javascript/mastodon/reducers/accounts.js b/app/javascript/mastodon/reducers/accounts.js
index b3c2b6d8887dba68c085363c37bbce59e67e4a40..d4d9ad62ed997d656c98b1c993a757b80a7ef17c 100644 (file)
--- a/app/javascript/mastodon/reducers/accounts.js
+++ b/app/javascript/mastodon/reducers/accounts.js
@@ -7,15 +7,15 @@ import {
   ACCOUNT_TIMELINE_FETCH_SUCCESS,
   ACCOUNT_TIMELINE_EXPAND_SUCCESS,
   FOLLOW_REQUESTS_FETCH_SUCCESS,
   ACCOUNT_TIMELINE_FETCH_SUCCESS,
   ACCOUNT_TIMELINE_EXPAND_SUCCESS,
   FOLLOW_REQUESTS_FETCH_SUCCESS,

-  FOLLOW_REQUESTS_EXPAND_SUCCESS
+  FOLLOW_REQUESTS_EXPAND_SUCCESS,

 } from '../actions/accounts';
 import {
   BLOCKS_FETCH_SUCCESS,
 } from '../actions/accounts';
 import {
   BLOCKS_FETCH_SUCCESS,

-  BLOCKS_EXPAND_SUCCESS
+  BLOCKS_EXPAND_SUCCESS,

 } from '../actions/blocks';
 import {
   MUTES_FETCH_SUCCESS,
 } from '../actions/blocks';
 import {
   MUTES_FETCH_SUCCESS,

-  MUTES_EXPAND_SUCCESS
+  MUTES_EXPAND_SUCCESS,

 } from '../actions/mutes';
 import { COMPOSE_SUGGESTIONS_READY } from '../actions/compose';
 import {
 } from '../actions/mutes';
 import { COMPOSE_SUGGESTIONS_READY } from '../actions/compose';
 import {


@@ -24,26 +24,26 @@ import {
   FAVOURITE_SUCCESS,
   UNFAVOURITE_SUCCESS,
   REBLOGS_FETCH_SUCCESS,
   FAVOURITE_SUCCESS,
   UNFAVOURITE_SUCCESS,
   REBLOGS_FETCH_SUCCESS,

-  FAVOURITES_FETCH_SUCCESS
+  FAVOURITES_FETCH_SUCCESS,

 } from '../actions/interactions';
 import {
   TIMELINE_REFRESH_SUCCESS,
   TIMELINE_UPDATE,
 } from '../actions/interactions';
 import {
   TIMELINE_REFRESH_SUCCESS,
   TIMELINE_UPDATE,

-  TIMELINE_EXPAND_SUCCESS
+  TIMELINE_EXPAND_SUCCESS,

 } from '../actions/timelines';
 import {
   STATUS_FETCH_SUCCESS,
 } from '../actions/timelines';
 import {
   STATUS_FETCH_SUCCESS,

-  CONTEXT_FETCH_SUCCESS
+  CONTEXT_FETCH_SUCCESS,

 } from '../actions/statuses';
 import { SEARCH_FETCH_SUCCESS } from '../actions/search';
 import {
   NOTIFICATIONS_UPDATE,
   NOTIFICATIONS_REFRESH_SUCCESS,
 } from '../actions/statuses';
 import { SEARCH_FETCH_SUCCESS } from '../actions/search';
 import {
   NOTIFICATIONS_UPDATE,
   NOTIFICATIONS_REFRESH_SUCCESS,

-  NOTIFICATIONS_EXPAND_SUCCESS
+  NOTIFICATIONS_EXPAND_SUCCESS,

 } from '../actions/notifications';
 import {
   FAVOURITED_STATUSES_FETCH_SUCCESS,
 } from '../actions/notifications';
 import {
   FAVOURITED_STATUSES_FETCH_SUCCESS,

-  FAVOURITED_STATUSES_EXPAND_SUCCESS
+  FAVOURITED_STATUSES_EXPAND_SUCCESS,

 } from '../actions/favourites';
 import { STORE_HYDRATE } from '../actions/store';
 import Immutable from 'immutable';
 } from '../actions/favourites';
 import { STORE_HYDRATE } from '../actions/store';
 import Immutable from 'immutable';


@@ -55,7 +55,7 @@ const normalizeAccount = (state, account) => {
   delete account.following_count;
   delete account.statuses_count;
 
   delete account.following_count;
   delete account.statuses_count;
 

-  return state.set(account.id, Immutable.fromJS(account))
+  return state.set(account.id, Immutable.fromJS(account));

 };
 
 const normalizeAccounts = (state, accounts) => {
 };
 
 const normalizeAccounts = (state, accounts) => {

diff --git a/app/javascript/mastodon/reducers/accounts_counters.js b/app/javascript/mastodon/reducers/accounts_counters.js
index f0433c48c0b2c0d53e7acaeff9d34a039c08adfc..ea631cecac4dfb581069245bf8690313e38cf0b3 100644 (file)
--- a/app/javascript/mastodon/reducers/accounts_counters.js
+++ b/app/javascript/mastodon/reducers/accounts_counters.js
@@ -9,15 +9,15 @@ import {
   FOLLOW_REQUESTS_FETCH_SUCCESS,
   FOLLOW_REQUESTS_EXPAND_SUCCESS,
   ACCOUNT_FOLLOW_SUCCESS,
   FOLLOW_REQUESTS_FETCH_SUCCESS,
   FOLLOW_REQUESTS_EXPAND_SUCCESS,
   ACCOUNT_FOLLOW_SUCCESS,

-  ACCOUNT_UNFOLLOW_SUCCESS
+  ACCOUNT_UNFOLLOW_SUCCESS,

 } from '../actions/accounts';
 import {
   BLOCKS_FETCH_SUCCESS,
 } from '../actions/accounts';
 import {
   BLOCKS_FETCH_SUCCESS,

-  BLOCKS_EXPAND_SUCCESS
+  BLOCKS_EXPAND_SUCCESS,

 } from '../actions/blocks';
 import {
   MUTES_FETCH_SUCCESS,
 } from '../actions/blocks';
 import {
   MUTES_FETCH_SUCCESS,

-  MUTES_EXPAND_SUCCESS
+  MUTES_EXPAND_SUCCESS,

 } from '../actions/mutes';
 import { COMPOSE_SUGGESTIONS_READY } from '../actions/compose';
 import {
 } from '../actions/mutes';
 import { COMPOSE_SUGGESTIONS_READY } from '../actions/compose';
 import {


@@ -26,26 +26,26 @@ import {
   FAVOURITE_SUCCESS,
   UNFAVOURITE_SUCCESS,
   REBLOGS_FETCH_SUCCESS,
   FAVOURITE_SUCCESS,
   UNFAVOURITE_SUCCESS,
   REBLOGS_FETCH_SUCCESS,

-  FAVOURITES_FETCH_SUCCESS
+  FAVOURITES_FETCH_SUCCESS,

 } from '../actions/interactions';
 import {
   TIMELINE_REFRESH_SUCCESS,
   TIMELINE_UPDATE,
 } from '../actions/interactions';
 import {
   TIMELINE_REFRESH_SUCCESS,
   TIMELINE_UPDATE,

-  TIMELINE_EXPAND_SUCCESS
+  TIMELINE_EXPAND_SUCCESS,

 } from '../actions/timelines';
 import {
   STATUS_FETCH_SUCCESS,
 } from '../actions/timelines';
 import {
   STATUS_FETCH_SUCCESS,

-  CONTEXT_FETCH_SUCCESS
+  CONTEXT_FETCH_SUCCESS,

 } from '../actions/statuses';
 import { SEARCH_FETCH_SUCCESS } from '../actions/search';
 import {
   NOTIFICATIONS_UPDATE,
   NOTIFICATIONS_REFRESH_SUCCESS,
 } from '../actions/statuses';
 import { SEARCH_FETCH_SUCCESS } from '../actions/search';
 import {
   NOTIFICATIONS_UPDATE,
   NOTIFICATIONS_REFRESH_SUCCESS,

-  NOTIFICATIONS_EXPAND_SUCCESS
+  NOTIFICATIONS_EXPAND_SUCCESS,

 } from '../actions/notifications';
 import {
   FAVOURITED_STATUSES_FETCH_SUCCESS,
 } from '../actions/notifications';
 import {
   FAVOURITED_STATUSES_FETCH_SUCCESS,

-  FAVOURITED_STATUSES_EXPAND_SUCCESS
+  FAVOURITED_STATUSES_EXPAND_SUCCESS,

 } from '../actions/favourites';
 import { STORE_HYDRATE } from '../actions/store';
 import Immutable from 'immutable';
 } from '../actions/favourites';
 import { STORE_HYDRATE } from '../actions/store';
 import Immutable from 'immutable';


@@ -90,7 +90,7 @@ export default function accountsCounters(state = initialState, action) {
     return state.merge(action.state.get('accounts').map(item => Immutable.fromJS({
       followers_count: item.get('followers_count'),
       following_count: item.get('following_count'),
     return state.merge(action.state.get('accounts').map(item => Immutable.fromJS({
       followers_count: item.get('followers_count'),
       following_count: item.get('following_count'),

-      statuses_count: item.get('statuses_count')
+      statuses_count: item.get('statuses_count'),

     })));
   case ACCOUNT_FETCH_SUCCESS:
   case NOTIFICATIONS_UPDATE:
     })));
   case ACCOUNT_FETCH_SUCCESS:
   case NOTIFICATIONS_UPDATE:

diff --git a/app/javascript/mastodon/reducers/alerts.js b/app/javascript/mastodon/reducers/alerts.js
index dc01458249c72e56f257e2da7a1d70e1c1338479..aaea9775f3708c79ed013940276730abbaf38620 100644 (file)
--- a/app/javascript/mastodon/reducers/alerts.js
+++ b/app/javascript/mastodon/reducers/alerts.js
@@ -1,7 +1,7 @@
 import {
   ALERT_SHOW,
   ALERT_DISMISS,
 import {
   ALERT_SHOW,
   ALERT_DISMISS,

-  ALERT_CLEAR
+  ALERT_CLEAR,

 } from '../actions/alerts';
 import Immutable from 'immutable';
 
 } from '../actions/alerts';
 import Immutable from 'immutable';
 


@@ -13,7 +13,7 @@ export default function alerts(state = initialState, action) {
     return state.push(Immutable.Map({
       key: state.size > 0 ? state.last().get('key') + 1 : 0,
       title: action.title,
     return state.push(Immutable.Map({
       key: state.size > 0 ? state.last().get('key') + 1 : 0,
       title: action.title,

-      message: action.message
+      message: action.message,

     }));
   case ALERT_DISMISS:
     return state.filterNot(item => item.get('key') === action.alert.key);
     }));
   case ALERT_DISMISS:
     return state.filterNot(item => item.get('key') === action.alert.key);

diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index c87384780406150b252e4bcb7e112c29693f6018..2413df9e242cf8708d19dadda7a9ef4d4fabc682 100644 (file)
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -21,7 +21,7 @@ import {
   COMPOSE_SPOILER_TEXT_CHANGE,
   COMPOSE_VISIBILITY_CHANGE,
   COMPOSE_LISTABILITY_CHANGE,
   COMPOSE_SPOILER_TEXT_CHANGE,
   COMPOSE_VISIBILITY_CHANGE,
   COMPOSE_LISTABILITY_CHANGE,

-  COMPOSE_EMOJI_INSERT
+  COMPOSE_EMOJI_INSERT,

 } from '../actions/compose';
 import { TIMELINE_DELETE } from '../actions/timelines';
 import { STORE_HYDRATE } from '../actions/store';
 } from '../actions/compose';
 import { TIMELINE_DELETE } from '../actions/timelines';
 import { STORE_HYDRATE } from '../actions/store';


@@ -47,7 +47,7 @@ const initialState = Immutable.Map({
   me: null,
   default_privacy: 'public',
   resetFileKey: Math.floor((Math.random() * 0x10000)),
   me: null,
   default_privacy: 'public',
   resetFileKey: Math.floor((Math.random() * 0x10000)),

-  idempotencyKey: null
+  idempotencyKey: null,

 });
 
 function statusToTextMentions(state, status) {
 });
 
 function statusToTextMentions(state, status) {

diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 0665f494b46750c4fbbf8259da300a4174c78261..c4fe28ea73c7f830b564037304f5a4a53c5a0674 100644 (file)
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -36,5 +36,5 @@ export default combineReducers({
   notifications,
   settings,
   cards,
   notifications,
   settings,
   cards,

-  reports
+  reports,

 });
 });

diff --git a/app/javascript/mastodon/reducers/meta.js b/app/javascript/mastodon/reducers/meta.js
index acf6d4be11bd46d3b19fd13aee3a3368db7b5739..1551228ec7b35937b0849d9a3ff555a4816e80f1 100644 (file)
--- a/app/javascript/mastodon/reducers/meta.js
+++ b/app/javascript/mastodon/reducers/meta.js
@@ -4,7 +4,7 @@ import Immutable from 'immutable';
 const initialState = Immutable.Map({
   streaming_api_base_url: null,
   access_token: null,
 const initialState = Immutable.Map({
   streaming_api_base_url: null,
   access_token: null,

-  me: null
+  me: null,

 });
 
 export default function meta(state = initialState, action) {
 });
 
 export default function meta(state = initialState, action) {

diff --git a/app/javascript/mastodon/reducers/modal.js b/app/javascript/mastodon/reducers/modal.js
index 3566820ef1cf560207dcb5ccf68ab7f017c82054..8fd9a69cdae5abe92fb409ffbb4fabe59cffc684 100644 (file)
--- a/app/javascript/mastodon/reducers/modal.js
+++ b/app/javascript/mastodon/reducers/modal.js
@@ -3,7 +3,7 @@ import Immutable from 'immutable';
 
 const initialState = {
   modalType: null,
 
 const initialState = {
   modalType: null,

-  modalProps: {}
+  modalProps: {},

 };
 
 export default function modal(state = initialState, action) {
 };
 
 export default function modal(state = initialState, action) {

diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index ae06b82674f622cbeea0c75668c6b284e34044d7..0c1cf5b0f224a09624cb4fec2c2753f076937e41 100644 (file)
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -7,7 +7,7 @@ import {
   NOTIFICATIONS_REFRESH_FAIL,
   NOTIFICATIONS_EXPAND_FAIL,
   NOTIFICATIONS_CLEAR,
   NOTIFICATIONS_REFRESH_FAIL,
   NOTIFICATIONS_EXPAND_FAIL,
   NOTIFICATIONS_CLEAR,

-  NOTIFICATIONS_SCROLL_TOP
+  NOTIFICATIONS_SCROLL_TOP,

 } from '../actions/notifications';
 import { ACCOUNT_BLOCK_SUCCESS } from '../actions/accounts';
 import { TIMELINE_DELETE } from '../actions/timelines';
 } from '../actions/notifications';
 import { ACCOUNT_BLOCK_SUCCESS } from '../actions/accounts';
 import { TIMELINE_DELETE } from '../actions/timelines';


@@ -19,14 +19,14 @@ const initialState = Immutable.Map({
   top: true,
   unread: 0,
   loaded: false,
   top: true,
   unread: 0,
   loaded: false,

-  isLoading: true
+  isLoading: true,

 });
 
 const notificationToMap = notification => Immutable.Map({
   id: notification.id,
   type: notification.type,
   account: notification.account.id,
 });
 
 const notificationToMap = notification => Immutable.Map({
   id: notification.id,
   type: notification.type,
   account: notification.account.id,

-  status: notification.status ? notification.status.id : null
+  status: notification.status ? notification.status.id : null,

 });
 
 const normalizeNotification = (state, notification) => {
 });
 
 const normalizeNotification = (state, notification) => {

diff --git a/app/javascript/mastodon/reducers/relationships.js b/app/javascript/mastodon/reducers/relationships.js
index f25c0b55a6e6bea014e5896378f6bfc9f92818a7..b6607860cca9e061be10f519ed327019f7eb19a1 100644 (file)
--- a/app/javascript/mastodon/reducers/relationships.js
+++ b/app/javascript/mastodon/reducers/relationships.js
@@ -5,11 +5,11 @@ import {
   ACCOUNT_UNBLOCK_SUCCESS,
   ACCOUNT_MUTE_SUCCESS,
   ACCOUNT_UNMUTE_SUCCESS,
   ACCOUNT_UNBLOCK_SUCCESS,
   ACCOUNT_MUTE_SUCCESS,
   ACCOUNT_UNMUTE_SUCCESS,

-  RELATIONSHIPS_FETCH_SUCCESS
+  RELATIONSHIPS_FETCH_SUCCESS,

 } from '../actions/accounts';
 import {
   DOMAIN_BLOCK_SUCCESS,
 } from '../actions/accounts';
 import {
   DOMAIN_BLOCK_SUCCESS,

-  DOMAIN_UNBLOCK_SUCCESS
+  DOMAIN_UNBLOCK_SUCCESS,

 } from '../actions/domain_blocks';
 import Immutable from 'immutable';
 
 } from '../actions/domain_blocks';
 import Immutable from 'immutable';
 

diff --git a/app/javascript/mastodon/reducers/reports.js b/app/javascript/mastodon/reducers/reports.js
index eab004377480b9f201c506bb691f1cfeacd964f0..ad35eaa059f724143930e6d5e92c548647fd8211 100644 (file)
--- a/app/javascript/mastodon/reducers/reports.js
+++ b/app/javascript/mastodon/reducers/reports.js
@@ -5,7 +5,7 @@ import {
   REPORT_SUBMIT_FAIL,
   REPORT_CANCEL,
   REPORT_STATUS_TOGGLE,
   REPORT_SUBMIT_FAIL,
   REPORT_CANCEL,
   REPORT_STATUS_TOGGLE,

-  REPORT_COMMENT_CHANGE
+  REPORT_COMMENT_CHANGE,

 } from '../actions/reports';
 import Immutable from 'immutable';
 
 } from '../actions/reports';
 import Immutable from 'immutable';
 


@@ -14,8 +14,8 @@ const initialState = Immutable.Map({
     isSubmitting: false,
     account_id: null,
     status_ids: Immutable.Set(),
     isSubmitting: false,
     account_id: null,
     status_ids: Immutable.Set(),

-    comment: ''
-  })
+    comment: '',
+  }),

 });
 
 export default function reports(state = initialState, action) {
 });
 
 export default function reports(state = initialState, action) {

diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index b3fe6c7bea22ae9e6d1f3c582528643544df4492..ed395427e9ef1af11d839893a959e642fcb7f4fc 100644 (file)
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -2,7 +2,7 @@ import {
   SEARCH_CHANGE,
   SEARCH_CLEAR,
   SEARCH_FETCH_SUCCESS,
   SEARCH_CHANGE,
   SEARCH_CLEAR,
   SEARCH_FETCH_SUCCESS,

-  SEARCH_SHOW
+  SEARCH_SHOW,

 } from '../actions/search';
 import { COMPOSE_MENTION, COMPOSE_REPLY } from '../actions/compose';
 import Immutable from 'immutable';
 } from '../actions/search';
 import { COMPOSE_MENTION, COMPOSE_REPLY } from '../actions/compose';
 import Immutable from 'immutable';


@@ -11,7 +11,7 @@ const initialState = Immutable.Map({
   value: '',
   submitted: false,
   hidden: false,
   value: '',
   submitted: false,
   hidden: false,

-  results: Immutable.Map()
+  results: Immutable.Map(),

 });
 
 const normalizeSuggestions = (state, value, accounts, hashtags, statuses) => {
 });
 
 const normalizeSuggestions = (state, value, accounts, hashtags, statuses) => {


@@ -23,8 +23,8 @@ const normalizeSuggestions = (state, value, accounts, hashtags, statuses) => {
       items: accounts.map(item => ({
         type: 'account',
         id: item.id,
       items: accounts.map(item => ({
         type: 'account',
         id: item.id,

-        value: item.acct
-      }))
+        value: item.acct,
+      })),

     });
   }
 
     });
   }
 


@@ -32,21 +32,21 @@ const normalizeSuggestions = (state, value, accounts, hashtags, statuses) => {
     let hashtagItems = hashtags.map(item => ({
       type: 'hashtag',
       id: item,
     let hashtagItems = hashtags.map(item => ({
       type: 'hashtag',
       id: item,

-      value: `#${item}`
+      value: `#${item}`,

     }));
 
     if (value.indexOf('@') === -1 && value.indexOf(' ') === -1 && !value.startsWith('http://') && !value.startsWith('https://') && hashtags.indexOf(value) === -1) {
       hashtagItems.unshift({
         type: 'hashtag',
         id: value,
     }));
 
     if (value.indexOf('@') === -1 && value.indexOf(' ') === -1 && !value.startsWith('http://') && !value.startsWith('https://') && hashtags.indexOf(value) === -1) {
       hashtagItems.unshift({
         type: 'hashtag',
         id: value,

-        value: `#${value}`
+        value: `#${value}`,

       });
     }
 
     if (hashtagItems.length > 0) {
       newSuggestions.push({
         title: 'hashtag',
       });
     }
 
     if (hashtagItems.length > 0) {
       newSuggestions.push({
         title: 'hashtag',

-        items: hashtagItems
+        items: hashtagItems,

       });
     }
   }
       });
     }
   }


@@ -57,8 +57,8 @@ const normalizeSuggestions = (state, value, accounts, hashtags, statuses) => {
       items: statuses.map(item => ({
         type: 'status',
         id: item.id,
       items: statuses.map(item => ({
         type: 'status',
         id: item.id,

-        value: item.id
-      }))
+        value: item.id,
+      })),

     });
   }
 
     });
   }
 


@@ -88,7 +88,7 @@ export default function search(state = initialState, action) {
     return state.set('results', Immutable.Map({
       accounts: Immutable.List(action.results.accounts.map(item => item.id)),
       statuses: Immutable.List(action.results.statuses.map(item => item.id)),
     return state.set('results', Immutable.Map({
       accounts: Immutable.List(action.results.accounts.map(item => item.id)),
       statuses: Immutable.List(action.results.statuses.map(item => item.id)),

-      hashtags: Immutable.List(action.results.hashtags)
+      hashtags: Immutable.List(action.results.hashtags),

     })).set('submitted', true);
   default:
     return state;
     })).set('submitted', true);
   default:
     return state;

diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index b255aabc4de29329583f001738c155856a6e76a5..ababd49839880ff9a13f6476de90a4915c6ee0f3 100644 (file)
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -8,12 +8,12 @@ const initialState = Immutable.Map({
   home: Immutable.Map({
     shows: Immutable.Map({
       reblog: true,
   home: Immutable.Map({
     shows: Immutable.Map({
       reblog: true,

-      reply: true
+      reply: true,

     }),
 
     regex: Immutable.Map({
     }),
 
     regex: Immutable.Map({

-      body: ''
-    })
+      body: '',
+    }),

   }),
 
   notifications: Immutable.Map({
   }),
 
   notifications: Immutable.Map({


@@ -21,23 +21,23 @@ const initialState = Immutable.Map({
       follow: true,
       favourite: true,
       reblog: true,
       follow: true,
       favourite: true,
       reblog: true,

-      mention: true
+      mention: true,

     }),
 
     shows: Immutable.Map({
       follow: true,
       favourite: true,
       reblog: true,
     }),
 
     shows: Immutable.Map({
       follow: true,
       favourite: true,
       reblog: true,

-      mention: true
+      mention: true,

     }),
 
     sounds: Immutable.Map({
       follow: true,
       favourite: true,
       reblog: true,
     }),
 
     sounds: Immutable.Map({
       follow: true,
       favourite: true,
       reblog: true,

-      mention: true
-    })
-  })
+      mention: true,
+    }),
+  }),

 });
 
 export default function settings(state = initialState, action) {
 });
 
 export default function settings(state = initialState, action) {

diff --git a/app/javascript/mastodon/reducers/status_lists.js b/app/javascript/mastodon/reducers/status_lists.js
index fd463cd63e4648174b415b3234d5cc4254b3948b..7d00f6d309f4fa9b5ed9cd95f479ea2b3f45c587 100644 (file)
--- a/app/javascript/mastodon/reducers/status_lists.js
+++ b/app/javascript/mastodon/reducers/status_lists.js
@@ -1,6 +1,6 @@
 import {
   FAVOURITED_STATUSES_FETCH_SUCCESS,
 import {
   FAVOURITED_STATUSES_FETCH_SUCCESS,

-  FAVOURITED_STATUSES_EXPAND_SUCCESS
+  FAVOURITED_STATUSES_EXPAND_SUCCESS,

 } from '../actions/favourites';
 import Immutable from 'immutable';
 
 } from '../actions/favourites';
 import Immutable from 'immutable';
 


@@ -8,8 +8,8 @@ const initialState = Immutable.Map({
   favourites: Immutable.Map({
     next: null,
     loaded: false,
   favourites: Immutable.Map({
     next: null,
     loaded: false,

-    items: Immutable.List()
-  })
+    items: Immutable.List(),
+  }),

 });
 
 const normalizeList = (state, listType, statuses, next) => {
 });
 
 const normalizeList = (state, listType, statuses, next) => {

diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 6d38d905de66cacf9a3435a6db9003ccc8cbcb5a..7bc3710c4604139cb869098a7a4f62a9cb467fba 100644 (file)
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -6,35 +6,35 @@ import {
   FAVOURITE_REQUEST,
   FAVOURITE_SUCCESS,
   FAVOURITE_FAIL,
   FAVOURITE_REQUEST,
   FAVOURITE_SUCCESS,
   FAVOURITE_FAIL,

-  UNFAVOURITE_SUCCESS
+  UNFAVOURITE_SUCCESS,

 } from '../actions/interactions';
 import {
   STATUS_FETCH_SUCCESS,
   CONTEXT_FETCH_SUCCESS,
   STATUS_MUTE_SUCCESS,
 } from '../actions/interactions';
 import {
   STATUS_FETCH_SUCCESS,
   CONTEXT_FETCH_SUCCESS,
   STATUS_MUTE_SUCCESS,

-  STATUS_UNMUTE_SUCCESS
+  STATUS_UNMUTE_SUCCESS,

 } from '../actions/statuses';
 import {
   TIMELINE_REFRESH_SUCCESS,
   TIMELINE_UPDATE,
   TIMELINE_DELETE,
 } from '../actions/statuses';
 import {
   TIMELINE_REFRESH_SUCCESS,
   TIMELINE_UPDATE,
   TIMELINE_DELETE,

-  TIMELINE_EXPAND_SUCCESS
+  TIMELINE_EXPAND_SUCCESS,

 } from '../actions/timelines';
 import {
   ACCOUNT_TIMELINE_FETCH_SUCCESS,
   ACCOUNT_TIMELINE_EXPAND_SUCCESS,
   ACCOUNT_MEDIA_TIMELINE_FETCH_SUCCESS,
   ACCOUNT_MEDIA_TIMELINE_EXPAND_SUCCESS,
 } from '../actions/timelines';
 import {
   ACCOUNT_TIMELINE_FETCH_SUCCESS,
   ACCOUNT_TIMELINE_EXPAND_SUCCESS,
   ACCOUNT_MEDIA_TIMELINE_FETCH_SUCCESS,
   ACCOUNT_MEDIA_TIMELINE_EXPAND_SUCCESS,

-  ACCOUNT_BLOCK_SUCCESS
+  ACCOUNT_BLOCK_SUCCESS,

 } from '../actions/accounts';
 import {
   NOTIFICATIONS_UPDATE,
   NOTIFICATIONS_REFRESH_SUCCESS,
 } from '../actions/accounts';
 import {
   NOTIFICATIONS_UPDATE,
   NOTIFICATIONS_REFRESH_SUCCESS,

-  NOTIFICATIONS_EXPAND_SUCCESS
+  NOTIFICATIONS_EXPAND_SUCCESS,

 } from '../actions/notifications';
 import {
   FAVOURITED_STATUSES_FETCH_SUCCESS,
 } from '../actions/notifications';
 import {
   FAVOURITED_STATUSES_FETCH_SUCCESS,

-  FAVOURITED_STATUSES_EXPAND_SUCCESS
+  FAVOURITED_STATUSES_EXPAND_SUCCESS,

 } from '../actions/favourites';
 import { SEARCH_FETCH_SUCCESS } from '../actions/search';
 import Immutable from 'immutable';
 } from '../actions/favourites';
 import { SEARCH_FETCH_SUCCESS } from '../actions/search';
 import Immutable from 'immutable';

diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 5c37b0dcb17bd65ce666b03de1857cb45514d617..2e95d645e55fb0d8841f54776c8187b6876d0975 100644 (file)
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -9,13 +9,13 @@ import {
   TIMELINE_EXPAND_FAIL,
   TIMELINE_SCROLL_TOP,
   TIMELINE_CONNECT,
   TIMELINE_EXPAND_FAIL,
   TIMELINE_SCROLL_TOP,
   TIMELINE_CONNECT,

-  TIMELINE_DISCONNECT
+  TIMELINE_DISCONNECT,

 } from '../actions/timelines';
 import {
   REBLOG_SUCCESS,
   UNREBLOG_SUCCESS,
   FAVOURITE_SUCCESS,
 } from '../actions/timelines';
 import {
   REBLOG_SUCCESS,
   UNREBLOG_SUCCESS,
   FAVOURITE_SUCCESS,

-  UNFAVOURITE_SUCCESS
+  UNFAVOURITE_SUCCESS,

 } from '../actions/interactions';
 import {
   ACCOUNT_TIMELINE_FETCH_REQUEST,
 } from '../actions/interactions';
 import {
   ACCOUNT_TIMELINE_FETCH_REQUEST,


@@ -31,10 +31,10 @@ import {
   ACCOUNT_MEDIA_TIMELINE_EXPAND_SUCCESS,
   ACCOUNT_MEDIA_TIMELINE_EXPAND_FAIL,
   ACCOUNT_BLOCK_SUCCESS,
   ACCOUNT_MEDIA_TIMELINE_EXPAND_SUCCESS,
   ACCOUNT_MEDIA_TIMELINE_EXPAND_FAIL,
   ACCOUNT_BLOCK_SUCCESS,

-  ACCOUNT_MUTE_SUCCESS
+  ACCOUNT_MUTE_SUCCESS,

 } from '../actions/accounts';
 import {
 } from '../actions/accounts';
 import {

-  CONTEXT_FETCH_SUCCESS
+  CONTEXT_FETCH_SUCCESS,

 } from '../actions/statuses';
 import Immutable from 'immutable';
 
 } from '../actions/statuses';
 import Immutable from 'immutable';
 


@@ -47,7 +47,7 @@ const initialState = Immutable.Map({
     loaded: false,
     top: true,
     unread: 0,
     loaded: false,
     top: true,
     unread: 0,

-    items: Immutable.List()
+    items: Immutable.List(),

   }),
 
   public: Immutable.Map({
   }),
 
   public: Immutable.Map({


@@ -58,7 +58,7 @@ const initialState = Immutable.Map({
     loaded: false,
     top: true,
     unread: 0,
     loaded: false,
     top: true,
     unread: 0,

-    items: Immutable.List()
+    items: Immutable.List(),

   }),
 
   community: Immutable.Map({
   }),
 
   community: Immutable.Map({


@@ -70,7 +70,7 @@ const initialState = Immutable.Map({
     loaded: false,
     top: true,
     unread: 0,
     loaded: false,
     top: true,
     unread: 0,

-    items: Immutable.List()
+    items: Immutable.List(),

   }),
 
   tag: Immutable.Map({
   }),
 
   tag: Immutable.Map({


@@ -81,13 +81,13 @@ const initialState = Immutable.Map({
     loaded: false,
     top: true,
     unread: 0,
     loaded: false,
     top: true,
     unread: 0,

-    items: Immutable.List()
+    items: Immutable.List(),

   }),
 
   accounts_timelines: Immutable.Map(),
   accounts_media_timelines: Immutable.Map(),
   ancestors: Immutable.Map(),
   }),
 
   accounts_timelines: Immutable.Map(),
   accounts_media_timelines: Immutable.Map(),
   ancestors: Immutable.Map(),

-  descendants: Immutable.Map()
+  descendants: Immutable.Map(),

 });
 
 const normalizeStatus = (state, status) => {
 });
 
 const normalizeStatus = (state, status) => {

diff --git a/app/javascript/mastodon/reducers/user_lists.js b/app/javascript/mastodon/reducers/user_lists.js
index af949211915921bf5691915e098646972d0a3ce2..83bf1be1bc60d26bd19aea2645eabc320c291f36 100644 (file)
--- a/app/javascript/mastodon/reducers/user_lists.js
+++ b/app/javascript/mastodon/reducers/user_lists.js
@@ -6,19 +6,19 @@ import {
   FOLLOW_REQUESTS_FETCH_SUCCESS,
   FOLLOW_REQUESTS_EXPAND_SUCCESS,
   FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
   FOLLOW_REQUESTS_FETCH_SUCCESS,
   FOLLOW_REQUESTS_EXPAND_SUCCESS,
   FOLLOW_REQUEST_AUTHORIZE_SUCCESS,

-  FOLLOW_REQUEST_REJECT_SUCCESS
+  FOLLOW_REQUEST_REJECT_SUCCESS,

 } from '../actions/accounts';
 import {
   REBLOGS_FETCH_SUCCESS,
 } from '../actions/accounts';
 import {
   REBLOGS_FETCH_SUCCESS,

-  FAVOURITES_FETCH_SUCCESS
+  FAVOURITES_FETCH_SUCCESS,

 } from '../actions/interactions';
 import {
   BLOCKS_FETCH_SUCCESS,
 } from '../actions/interactions';
 import {
   BLOCKS_FETCH_SUCCESS,

-  BLOCKS_EXPAND_SUCCESS
+  BLOCKS_EXPAND_SUCCESS,

 } from '../actions/blocks';
 import {
   MUTES_FETCH_SUCCESS,
 } from '../actions/blocks';
 import {
   MUTES_FETCH_SUCCESS,

-  MUTES_EXPAND_SUCCESS
+  MUTES_EXPAND_SUCCESS,

 } from '../actions/mutes';
 import Immutable from 'immutable';
 
 } from '../actions/mutes';
 import Immutable from 'immutable';
 


@@ -29,13 +29,13 @@ const initialState = Immutable.Map({
   favourited_by: Immutable.Map(),
   follow_requests: Immutable.Map(),
   blocks: Immutable.Map(),
   favourited_by: Immutable.Map(),
   follow_requests: Immutable.Map(),
   blocks: Immutable.Map(),

-  mutes: Immutable.Map()
+  mutes: Immutable.Map(),

 });
 
 const normalizeList = (state, type, id, accounts, next) => {
   return state.setIn([type, id], Immutable.Map({
     next,
 });
 
 const normalizeList = (state, type, id, accounts, next) => {
   return state.setIn([type, id], Immutable.Map({
     next,

-    items: Immutable.List(accounts.map(item => item.id))
+    items: Immutable.List(accounts.map(item => item.id)),

   }));
 };
 
   }));
 };
 

diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index f1697cc2d2d1d48331cb2a3b2ab7d9e095ef4c7c..0d2ef2ea97fe8246bf94cf1a863f39e9fc873916 100644 (file)
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -58,8 +58,8 @@ export const getAlerts = createSelector([getAlertsBase], (base) => {
       key: item.get('key'),
       dismissAfter: 5000,
       barStyle: {
       key: item.get('key'),
       dismissAfter: 5000,
       barStyle: {

-        zIndex: 200
-      }
+        zIndex: 200,
+      },

     });
   });
 
     });
   });
 


@@ -69,7 +69,7 @@ export const getAlerts = createSelector([getAlertsBase], (base) => {
 export const makeGetNotification = () => {
   return createSelector([
     (_, base)             => base,
 export const makeGetNotification = () => {
   return createSelector([
     (_, base)             => base,

-    (state, _, accountId) => state.getIn(['accounts', accountId])
+    (state, _, accountId) => state.getIn(['accounts', accountId]),

   ], (base, account) => {
     return base.set('account', account);
   });
   ], (base, account) => {
     return base.set('account', account);
   });

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index ea5b9f8f7ac8aa8b21b82b59d57594d85fb12dcf..ca6b476e12da10c37a03340f2223d73434d3996a 100644 (file)
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -4,7 +4,7 @@ if (!window.Intl || !Object.assign || !Number.isNaN ||
     !window.Symbol || !Array.prototype.includes) {
   // load polyfills dynamically
   import('../mastodon/polyfills').then(main).catch(e => {
     !window.Symbol || !Array.prototype.includes) {
   // load polyfills dynamically
   import('../mastodon/polyfills').then(main).catch(e => {

-    console.error(e) // eslint-disable-line no-console
+    console.error(e); // eslint-disable-line no-console

   });
 } else {
   main();
   });
 } else {
   main();

diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 3bd7d7cf055cf77bb443d516ea26afd9e643a476..19dd7fdeed100d02dc89289c4142181edf2e9b16 100644 (file)
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -96,12 +96,12 @@ document.addEventListener('DOMContentLoaded', () => {
   });
 
   delegate(document, '.account_display_name', 'input', ({ target }) => {
   });
 
   delegate(document, '.account_display_name', 'input', ({ target }) => {

-    const [nameCounter, ] = document.getElementsByClassName('name-counter');
+    const [nameCounter ] = document.getElementsByClassName('name-counter');

     nameCounter.textContent = 30 - length(target.value);
   });
 
   delegate(document, '.account_note', 'input', ({ target }) => {
     nameCounter.textContent = 30 - length(target.value);
   });
 
   delegate(document, '.account_note', 'input', ({ target }) => {

-    const [noteCounter, ] = document.getElementsByClassName('note-counter');
+    const [noteCounter ] = document.getElementsByClassName('note-counter');

     noteCounter.textContent = 160 - length(target.value);
   });
 });
     noteCounter.textContent = 160 - length(target.value);
   });
 });

diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index e2f8d2d8bcc400832086fc552ec90bc8c41279e6..922e8c517ea5acaa20c2cc5547d72c7fa8848304 100644 (file)
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -1,20 +1,20 @@
 // Common configuration for webpacker loaded from config/webpack/paths.yml
 
 // Common configuration for webpacker loaded from config/webpack/paths.yml
 

-const { join, resolve } = require('path')
-const { env } = require('process')
-const { safeLoad } = require('js-yaml')
-const { readFileSync } = require('fs')
+const { join, resolve } = require('path');
+const { env } = require('process');
+const { safeLoad } = require('js-yaml');
+const { readFileSync } = require('fs');

 
 

-const configPath = resolve('config', 'webpack')
-const loadersDir = join(__dirname, 'loaders')
-const paths = safeLoad(readFileSync(join(configPath, 'paths.yml'), 'utf8'))[env.NODE_ENV || 'development']
-const devServer = safeLoad(readFileSync(join(configPath, 'development.server.yml'), 'utf8'))[env.NODE_ENV || 'development']
+const configPath = resolve('config', 'webpack');
+const loadersDir = join(__dirname, 'loaders');
+const paths = safeLoad(readFileSync(join(configPath, 'paths.yml'), 'utf8'))[env.NODE_ENV || 'development'];
+const devServer = safeLoad(readFileSync(join(configPath, 'development.server.yml'), 'utf8'))[env.NODE_ENV || 'development'];

 
 // Compute public path based on environment and CDN_HOST in production
 
 // Compute public path based on environment and CDN_HOST in production

-const ifHasCDN = env.CDN_HOST !== undefined && env.NODE_ENV === 'production'
-const devServerUrl = `http://${devServer.host}:${devServer.port}/${paths.entry}/`
-const publicUrl = ifHasCDN ? `${env.CDN_HOST}/${paths.entry}/` : `/${paths.entry}/`
-const publicPath = env.NODE_ENV !== 'production' ? devServerUrl : publicUrl
+const ifHasCDN = env.CDN_HOST !== undefined && env.NODE_ENV === 'production';
+const devServerUrl = `http://${devServer.host}:${devServer.port}/${paths.entry}/`;
+const publicUrl = ifHasCDN ? `${env.CDN_HOST}/${paths.entry}/` : `/${paths.entry}/`;
+const publicPath = env.NODE_ENV !== 'production' ? devServerUrl : publicUrl;

 
 module.exports = {
   devServer,
 
 module.exports = {
   devServer,


@@ -22,5 +22,5 @@ module.exports = {
   paths,
   loadersDir,
   publicUrl,
   paths,
   loadersDir,
   publicUrl,

-  publicPath
-}
+  publicPath,
+};

diff --git a/config/webpack/development.js b/config/webpack/development.js
index 398fcffe347d1d7b77a8fbad970d131c4f624859..f6235f42e514483fc62198b0208d4f779cd3777a 100644 (file)
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -1,16 +1,16 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 

-const merge = require('webpack-merge')
-const sharedConfig = require('./shared.js')
+const merge = require('webpack-merge');
+const sharedConfig = require('./shared.js');

 
 module.exports = merge(sharedConfig, {
   devtool: 'cheap-module-eval-source-map',
 
   stats: {
 
 module.exports = merge(sharedConfig, {
   devtool: 'cheap-module-eval-source-map',
 
   stats: {

-    errorDetails: true
+    errorDetails: true,

   },
 
   output: {
   },
 
   output: {

-    pathinfo: true
-  }
-})
+    pathinfo: true,
+  },
+});

diff --git a/config/webpack/development.server.js b/config/webpack/development.server.js
index 455daad2c7374c119f4621a60fa75769d54cb233..296df150467f2452c238a47ba75b37aef05b0813 100644 (file)
--- a/config/webpack/development.server.js
+++ b/config/webpack/development.server.js
@@ -1,9 +1,9 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 

-const { resolve } = require('path')
-const merge = require('webpack-merge')
-const devConfig = require('./development.js')
-const { devServer, publicPath, paths } = require('./configuration.js')
+const { resolve } = require('path');
+const merge = require('webpack-merge');
+const devConfig = require('./development.js');
+const { devServer, publicPath, paths } = require('./configuration.js');

 
 module.exports = merge(devConfig, {
   devServer: {
 
 module.exports = merge(devConfig, {
   devServer: {


@@ -14,6 +14,6 @@ module.exports = merge(devConfig, {
     historyApiFallback: true,
     contentBase: resolve(paths.output, paths.entry),
     publicPath,
     historyApiFallback: true,
     contentBase: resolve(paths.output, paths.entry),
     publicPath,

-    disableHostCheck: true
-  }
-})
+    disableHostCheck: true,
+  },
+});

diff --git a/config/webpack/loaders/assets.js b/config/webpack/loaders/assets.js
index 595f073fc33f2ab06690515d9e9a05e624368f56..643b3eeb0a8ad65d54f413c7bc626aef54593da5 100644 (file)
--- a/config/webpack/loaders/assets.js
+++ b/config/webpack/loaders/assets.js
@@ -1,4 +1,4 @@
-const { env, publicPath } = require('../configuration.js')
+const { env, publicPath } = require('../configuration.js');

 
 module.exports = {
   test: /\.(jpg|jpeg|png|gif|svg|eot|ttf|woff|woff2)$/i,
 
 module.exports = {
   test: /\.(jpg|jpeg|png|gif|svg|eot|ttf|woff|woff2)$/i,


@@ -6,7 +6,7 @@ module.exports = {
     loader: 'file-loader',
     options: {
       publicPath,
     loader: 'file-loader',
     options: {
       publicPath,

-      name: env.NODE_ENV === 'production' ? '[name]-[hash].[ext]' : '[name].[ext]'
-    }
-  }]
-}
+      name: env.NODE_ENV === 'production' ? '[name]-[hash].[ext]' : '[name].[ext]',
+    },
+  }],
+};

diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js
index e58d0633e79ec8d20ba731a2800fe8b9b47d24ec..8cd9170a23e3a6fe37d8c13a4ad28351c105025a 100644 (file)
--- a/config/webpack/loaders/babel.js
+++ b/config/webpack/loaders/babel.js
@@ -3,6 +3,6 @@ module.exports = {
   exclude: /node_modules/,
   loader: 'babel-loader',
   options: {
   exclude: /node_modules/,
   loader: 'babel-loader',
   options: {

-    forceEnv: process.env.NODE_ENV || 'development'
-  }
-}
+    forceEnv: process.env.NODE_ENV || 'development',
+  },
+};

diff --git a/config/webpack/loaders/coffee.js b/config/webpack/loaders/coffee.js
index dae8742492fc0294bfd35579dd7ed6a70b9b21a4..416f787fe6440163f39a007886c05c92fcd1508e 100644 (file)
--- a/config/webpack/loaders/coffee.js
+++ b/config/webpack/loaders/coffee.js
@@ -1,4 +1,4 @@
 module.exports = {
   test: /\.coffee(\.erb)?$/,
 module.exports = {
   test: /\.coffee(\.erb)?$/,

-  loader: 'coffee-loader'
-}
+  loader: 'coffee-loader',
+};

diff --git a/config/webpack/loaders/erb.js b/config/webpack/loaders/erb.js
index 4cd7d6849559d78d9b29f230e43b4ab6111e84c9..5b523f8d1ffd4a100a5b8d25115cc3cb8267060f 100644 (file)
--- a/config/webpack/loaders/erb.js
+++ b/config/webpack/loaders/erb.js
@@ -4,6 +4,6 @@ module.exports = {
   exclude: /node_modules/,
   loader: 'rails-erb-loader',
   options: {
   exclude: /node_modules/,
   loader: 'rails-erb-loader',
   options: {

-    runner: 'bin/rails runner'
-  }
-}
+    runner: 'bin/rails runner',
+  },
+};

diff --git a/config/webpack/loaders/sass.js b/config/webpack/loaders/sass.js
index 2cb0e759a6f395795a44fdf6d1c9a62c0c39b3c7..24abf168572f6da09afaae911c445dc63a8655d8 100644 (file)
--- a/config/webpack/loaders/sass.js
+++ b/config/webpack/loaders/sass.js
@@ -1,5 +1,5 @@
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const { env } = require('../configuration.js')
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const { env } = require('../configuration.js');

 
 module.exports = {
   test: /\.(scss|sass|css)$/i,
 
 module.exports = {
   test: /\.(scss|sass|css)$/i,


@@ -8,7 +8,7 @@ module.exports = {
     use: [
       { loader: 'css-loader', options: { minimize: env.NODE_ENV === 'production' } },
       'postcss-loader',
     use: [
       { loader: 'css-loader', options: { minimize: env.NODE_ENV === 'production' } },
       'postcss-loader',

-      'sass-loader'
-    ]
-  })
-}
+      'sass-loader',
+    ],
+  }),
+};

diff --git a/config/webpack/production.js b/config/webpack/production.js
index 261bfdd70d203072635cdb22c03e281ed2afa9ba..6969f04a86e258983e66ab10ddd2611c4a63ae98 100644 (file)
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -2,10 +2,10 @@
 
 /* eslint global-require: 0 */
 
 
 /* eslint global-require: 0 */
 

-const webpack = require('webpack')
-const merge = require('webpack-merge')
-const CompressionPlugin = require('compression-webpack-plugin')
-const sharedConfig = require('./shared.js')
+const webpack = require('webpack');
+const merge = require('webpack-merge');
+const CompressionPlugin = require('compression-webpack-plugin');
+const sharedConfig = require('./shared.js');

 
 module.exports = merge(sharedConfig, {
 
 
 module.exports = merge(sharedConfig, {
 


@@ -19,15 +19,15 @@ module.exports = merge(sharedConfig, {
       mangle: true,
 
       output: {
       mangle: true,
 
       output: {

-        comments: false
+        comments: false,

       },
 
       },
 

-      sourceMap: true
+      sourceMap: true,

     }),
     new CompressionPlugin({
       asset: '[path].gz[query]',
       algorithm: 'gzip',
     }),
     new CompressionPlugin({
       asset: '[path].gz[query]',
       algorithm: 'gzip',

-      test: /\.(js|css|svg|eot|ttf|woff|woff2)$/
-    })
-  ]
-})
+      test: /\.(js|css|svg|eot|ttf|woff|woff2)$/,
+    }),
+  ],
+});

diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 00821880816fac2309c3a358936c6ac346f89f32..4986ea24d3bc0f4072c62d61f0501df4fb8e707b 100644 (file)
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -3,24 +3,24 @@
 /* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 
 /* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 

-const webpack = require('webpack')
-const { basename, dirname, join, relative, resolve } = require('path')
-const { sync } = require('glob')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const ManifestPlugin = require('webpack-manifest-plugin')
-const extname = require('path-complete-extname')
-const { env, paths, publicPath, loadersDir } = require('./configuration.js')
+const webpack = require('webpack');
+const { basename, dirname, join, relative, resolve } = require('path');
+const { sync } = require('glob');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const ManifestPlugin = require('webpack-manifest-plugin');
+const extname = require('path-complete-extname');
+const { env, paths, publicPath, loadersDir } = require('./configuration.js');

 
 

-const extensionGlob = `**/*{${paths.extensions.join(',')}}*`
-const packPaths = sync(join(paths.source, paths.entry, extensionGlob))
+const extensionGlob = `**/*{${paths.extensions.join(',')}}*`;
+const packPaths = sync(join(paths.source, paths.entry, extensionGlob));

 
 module.exports = {
   entry: packPaths.reduce(
     (map, entry) => {
 
 module.exports = {
   entry: packPaths.reduce(
     (map, entry) => {

-      const localMap = map
-      const namespace = relative(join(paths.source, paths.entry), dirname(entry))
-      localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry)
-      return localMap
+      const localMap = map;
+      const namespace = relative(join(paths.source, paths.entry), dirname(entry));
+      localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry);
+      return localMap;

     }, {}
   ),
 
     }, {}
   ),
 


@@ -28,11 +28,11 @@ module.exports = {
     filename: '[name].js',
     chunkFilename: '[name]-[chunkhash].js',
     path: resolve(paths.output, paths.entry),
     filename: '[name].js',
     chunkFilename: '[name]-[chunkhash].js',
     path: resolve(paths.output, paths.entry),

-    publicPath
+    publicPath,

   },
 
   module: {
   },
 
   module: {

-    rules: sync(join(loadersDir, '*.js')).map(loader => require(loader))
+    rules: sync(join(loadersDir, '*.js')).map(loader => require(loader)),

   },
 
   plugins: [
   },
 
   plugins: [


@@ -41,25 +41,25 @@ module.exports = {
     new ManifestPlugin({ fileName: paths.manifest, publicPath, writeToFileEmit: true }),
     new webpack.optimize.CommonsChunkPlugin({
       name: 'common',
     new ManifestPlugin({ fileName: paths.manifest, publicPath, writeToFileEmit: true }),
     new webpack.optimize.CommonsChunkPlugin({
       name: 'common',

-      minChunks: 2
-    })
+      minChunks: 2,
+    }),

   ],
 
   resolve: {
     extensions: paths.extensions,
     modules: [
       resolve(paths.source),
   ],
 
   resolve: {
     extensions: paths.extensions,
     modules: [
       resolve(paths.source),

-      resolve(paths.node_modules)
-    ]
+      resolve(paths.node_modules),
+    ],

   },
 
   resolveLoader: {
   },
 
   resolveLoader: {

-    modules: [paths.node_modules]
+    modules: [paths.node_modules],

   },
 
   node: {
     // Called by http-link-header in an API we never use, increases
     // bundle size unnecessarily
   },
 
   node: {
     // Called by http-link-header in an API we never use, increases
     // bundle size unnecessarily

-    Buffer: false
-  }
-}
+    Buffer: false,
+  },
+};

diff --git a/config/webpack/test.js b/config/webpack/test.js
index e002d0cdc5ec0f8c0e2de283c45ea01a4ceb3c36..6b2b073bb957e82c7bf01a88d46b459714b5ff6b 100644 (file)
--- a/config/webpack/test.js
+++ b/config/webpack/test.js
@@ -1,6 +1,6 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 

-const merge = require('webpack-merge')
-const sharedConfig = require('./shared.js')
+const merge = require('webpack-merge');
+const sharedConfig = require('./shared.js');

 
 

-module.exports = merge(sharedConfig, {})
+module.exports = merge(sharedConfig, {});

diff --git a/config/webpack/translationRunner.js b/config/webpack/translationRunner.js
index 7c1f96877f06e5ef5cd48359c624599820116489..8d2fb4893d228d0c6bd326169efcd5173393ad89 100644 (file)
--- a/config/webpack/translationRunner.js
+++ b/config/webpack/translationRunner.js
@@ -7,16 +7,16 @@ const testRFC5626 = function (reRFC5646) {
     if (!language.match(reRFC5646)) {
       throw new Error('Not RFC5626 name');
     }
     if (!language.match(reRFC5646)) {
       throw new Error('Not RFC5626 name');
     }

-  }
-}
+  };
+};

 
 const testAvailability = function (availableLanguages) {
   return function (language) {
     if ((argv.force !== true) && availableLanguages.indexOf(language) < 0) {
       throw new Error('Not an available language');
     }
 
 const testAvailability = function (availableLanguages) {
   return function (language) {
     if ((argv.force !== true) && availableLanguages.indexOf(language) < 0) {
       throw new Error('Not an available language');
     }

-  }
-}
+  };
+};

 
 const validateLanguages = function (languages, validators) {
   let invalidLanguages = languages.reduce((acc, language) => {
 
 const validateLanguages = function (languages, validators) {
   let invalidLanguages = languages.reduce((acc, language) => {


@@ -41,7 +41,7 @@ const validateLanguages = function (languages, validators) {
     console.log(`\nUse yarn "manage:translations -- --help" for usage information\n`);
     process.exit(1);
   }
     console.log(`\nUse yarn "manage:translations -- --help" for usage information\n`);
     process.exit(1);
   }

-}
+};

 
 const printHelpMessages = function () {
   console.log(
 
 const printHelpMessages = function () {
   console.log(


@@ -62,13 +62,13 @@ to input multiple languages, separate them with space.
 Available languages:
 ${availableLanguages}
 `);
 Available languages:
 ${availableLanguages}
 `);

-}
+};

 
 // parse arguments
 const argv = require('minimist')(process.argv.slice(2), {
   'boolean': [
     'force',
 
 // parse arguments
 const argv = require('minimist')(process.argv.slice(2), {
   'boolean': [
     'force',

-    'help'
+    'help',

   ],
   'alias': {
     'f': 'force',
   ],
   'alias': {
     'f': 'force',

diff --git a/package.json b/package.json
index 2a89d02e90b99daf3e0f48d61ec5184f38024e37..23bbf0338eaef34873d5cfe399414b809abfbe9c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "start": "babel-node ./streaming/index.js",
     "storybook": "start-storybook -p 9001 -c storybook",
     "test": "npm run test:lint && npm run test:mocha",
     "start": "babel-node ./streaming/index.js",
     "storybook": "start-storybook -p 9001 -c storybook",
     "test": "npm run test:lint && npm run test:mocha",

-    "test:lint": "eslint -c .eslintrc.yml --ext=js --ext=jsx app/javascript/",
+    "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ storyboard/ streaming/",

     "test:mocha": "NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx",
     "postinstall": "npm rebuild node-sass"
   },
     "test:mocha": "NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx",
     "postinstall": "npm rebuild node-sass"
   },

diff --git a/storybook/config.js b/storybook/config.js
index 2684a738ce240085dbb77df447f3806c3634ce5a..c81cfa2f7674312736cb349cd9884b18332742ba 100644 (file)
--- a/storybook/config.js
+++ b/storybook/config.js
@@ -13,7 +13,7 @@ addLocaleData(en);
 let req = require.context('./stories/', true, /.story.js$/);
 
 function loadStories () {
 let req = require.context('./stories/', true, /.story.js$/);
 
 function loadStories () {

-  req.keys().forEach((filename) => req(filename))
+  req.keys().forEach((filename) => req(filename));

 }
 
 configure(loadStories, module);
 }
 
 configure(loadStories, module);

diff --git a/storybook/stories/autosuggest_textarea.story.js b/storybook/stories/autosuggest_textarea.story.js
index 3f13aa416aee003815b339f344c89ea82ab7522a..32d0604e4c6e6e654f19c186aee047281b24ec4c 100644 (file)
--- a/storybook/stories/autosuggest_textarea.story.js
+++ b/storybook/stories/autosuggest_textarea.story.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import React from 'react';

-import { List } from 'immutable'
+import { List } from 'immutable';

 import { action, storiesOf } from '@kadira/storybook';
 import { action, storiesOf } from '@kadira/storybook';

-import AutosuggestTextarea from 'mastodon/components/autosuggest_textarea'
+import AutosuggestTextarea from 'mastodon/components/autosuggest_textarea';

 
 const props = {
   onChange: action('changed'),
 
 const props = {
   onChange: action('changed'),


@@ -9,9 +9,9 @@ const props = {
   onSuggestionSelected: action('suggestionsSelected'),
   onSuggestionsClearRequested: action('suggestionsClearRequested'),
   onSuggestionsFetchRequested: action('suggestionsFetchRequested'),
   onSuggestionSelected: action('suggestionsSelected'),
   onSuggestionsClearRequested: action('suggestionsClearRequested'),
   onSuggestionsFetchRequested: action('suggestionsFetchRequested'),

-  suggestions: List([])
-}
+  suggestions: List([]),
+};

 
 storiesOf('AutosuggestTextarea', module)
   .add('default state', () => <AutosuggestTextarea value='' {...props} />)
 
 storiesOf('AutosuggestTextarea', module)
   .add('default state', () => <AutosuggestTextarea value='' {...props} />)

-  .add('with text', () => <AutosuggestTextarea value='Hello' {...props} />)
+  .add('with text', () => <AutosuggestTextarea value='Hello' {...props} />);

diff --git a/storybook/webpack.config.js b/storybook/webpack.config.js
index dbcfa3c17fffb9eadb921da96d3bf1c4ce078953..8e268077d325d8bd8f26f2726a55ebc9010d5614 100644 (file)
--- a/storybook/webpack.config.js
+++ b/storybook/webpack.config.js
@@ -5,19 +5,19 @@ module.exports = {
     loaders: [
       {
         test: /\.(jpg|jpeg|png|gif|svg|eot|ttf|woff|woff2)$/i,
     loaders: [
       {
         test: /\.(jpg|jpeg|png|gif|svg|eot|ttf|woff|woff2)$/i,

-        loader: 'url-loader'
+        loader: 'url-loader',

       },
       {
         test: /.scss$/,
       },
       {
         test: /.scss$/,

-        loaders: ["style-loader", "css-loader", "postcss-loader", "sass-loader"]
-      }
-    ]
+        loaders: ["style-loader", "css-loader", "postcss-loader", "sass-loader"],
+      },
+    ],

   },
   resolve: {
     modulesDirectories: [
       path.resolve(__dirname, '..', 'storybook'),
       path.resolve(__dirname, '..', 'app', 'javascript'),
   },
   resolve: {
     modulesDirectories: [
       path.resolve(__dirname, '..', 'storybook'),
       path.resolve(__dirname, '..', 'app', 'javascript'),

-      path.resolve(__dirname, '..', 'node_modules')
-    ]
-  }
+      path.resolve(__dirname, '..', 'node_modules'),
+    ],
+  },

 };
 };

diff --git a/streaming/index.js b/streaming/index.js
index 7f30b4e88fe580dfe3b7ca601c25cc157476d912..cd19631218b17481524d00ca3f2b49302863f12c 100644 (file)
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -1,56 +1,56 @@
 import os from 'os';
 import cluster from 'cluster';
 import os from 'os';
 import cluster from 'cluster';

-import dotenv from 'dotenv'
-import express from 'express'
-import http from 'http'
-import redis from 'redis'
-import pg from 'pg'
-import log from 'npmlog'
-import url from 'url'
-import WebSocket from 'uws'
-import uuid from 'uuid'
-
-const env = process.env.NODE_ENV || 'development'
+import dotenv from 'dotenv';
+import express from 'express';
+import http from 'http';
+import redis from 'redis';
+import pg from 'pg';
+import log from 'npmlog';
+import url from 'url';
+import WebSocket from 'uws';
+import uuid from 'uuid';
+
+const env = process.env.NODE_ENV || 'development';

 
 dotenv.config({
 
 dotenv.config({

-  path: env === 'production' ? '.env.production' : '.env'
-})
+  path: env === 'production' ? '.env.production' : '.env',
+});

 
 const dbUrlToConfig = (dbUrl) => {
   if (!dbUrl) {
 
 const dbUrlToConfig = (dbUrl) => {
   if (!dbUrl) {

-    return {}
+    return {};

   }
 
   }
 

-  const params = url.parse(dbUrl)
-  const config = {}
+  const params = url.parse(dbUrl);
+  const config = {};

 
   if (params.auth) {
 
   if (params.auth) {

-    [config.user, config.password] = params.auth.split(':')
+    [config.user, config.password] = params.auth.split(':');

   }
 
   if (params.hostname) {
   }
 
   if (params.hostname) {

-    config.host = params.hostname
+    config.host = params.hostname;

   }
 
   if (params.port) {
   }
 
   if (params.port) {

-    config.port = params.port
+    config.port = params.port;

   }
 
   if (params.pathname) {
   }
 
   if (params.pathname) {

-    config.database = params.pathname.split('/')[1]
+    config.database = params.pathname.split('/')[1];

   }
 
   }
 

-  const ssl = params.query && params.query.ssl
+  const ssl = params.query && params.query.ssl;

   if (ssl) {
   if (ssl) {

-    config.ssl = ssl === 'true' || ssl === '1'
+    config.ssl = ssl === 'true' || ssl === '1';

   }
 
   }
 

-  return config
-}
+  return config;
+};

 
 if (cluster.isMaster) {
   // Cluster master
 
 if (cluster.isMaster) {
   // Cluster master

-  const core = +process.env.STREAMING_CLUSTER_NUM || (env === 'development' ? 1 : Math.max(os.cpus().length - 1, 1))
+  const core = +process.env.STREAMING_CLUSTER_NUM || (env === 'development' ? 1 : Math.max(os.cpus().length - 1, 1));

 
   const fork = () => {
     const worker = cluster.fork();
 
   const fork = () => {
     const worker = cluster.fork();


@@ -63,14 +63,14 @@ if (cluster.isMaster) {
 
   for (let i = 0; i < core; i++) fork();
 
 
   for (let i = 0; i < core; i++) fork();
 

-  log.info(`Starting streaming API server master with ${core} workers`)
+  log.info(`Starting streaming API server master with ${core} workers`);

 } else {
   // Cluster worker
   const pgConfigs = {
     development: {
       database: 'mastodon_development',
       host:     '/var/run/postgresql',
 } else {
   // Cluster worker
   const pgConfigs = {
     development: {
       database: 'mastodon_development',
       host:     '/var/run/postgresql',

-      max:      10
+      max:      10,

     },
 
     production: {
     },
 
     production: {


@@ -79,315 +79,315 @@ if (cluster.isMaster) {
       database: process.env.DB_NAME || 'mastodon_production',
       host:     process.env.DB_HOST || 'localhost',
       port:     process.env.DB_PORT || 5432,
       database: process.env.DB_NAME || 'mastodon_production',
       host:     process.env.DB_HOST || 'localhost',
       port:     process.env.DB_PORT || 5432,

-      max:      10
-    }
-  }
+      max:      10,
+    },
+  };

 
 

-  const app    = express()
-  const pgPool = new pg.Pool(Object.assign(pgConfigs[env], dbUrlToConfig(process.env.DATABASE_URL)))
-  const server = http.createServer(app)
-  const wss    = new WebSocket.Server({ server })
-  const redisNamespace = process.env.REDIS_NAMESPACE || null
+  const app    = express();
+  const pgPool = new pg.Pool(Object.assign(pgConfigs[env], dbUrlToConfig(process.env.DATABASE_URL)));
+  const server = http.createServer(app);
+  const wss    = new WebSocket.Server({ server });
+  const redisNamespace = process.env.REDIS_NAMESPACE || null;

 
   const redisParams = {
     host:     process.env.REDIS_HOST     || '127.0.0.1',
     port:     process.env.REDIS_PORT     || 6379,
     db:       process.env.REDIS_DB       || 0,
     password: process.env.REDIS_PASSWORD,
 
   const redisParams = {
     host:     process.env.REDIS_HOST     || '127.0.0.1',
     port:     process.env.REDIS_PORT     || 6379,
     db:       process.env.REDIS_DB       || 0,
     password: process.env.REDIS_PASSWORD,

-    url:      process.env.REDIS_URL      || null
-  }
+    url:      process.env.REDIS_URL      || null,
+  };

 
   if (redisNamespace) {
 
   if (redisNamespace) {

-    redisParams.namespace = redisNamespace
+    redisParams.namespace = redisNamespace;

   }
   }

-  const redisPrefix = redisNamespace ? `${redisNamespace}:` : ''
+  const redisPrefix = redisNamespace ? `${redisNamespace}:` : '';

 
 

-  const redisClient = redis.createClient(redisParams)
+  const redisClient = redis.createClient(redisParams);

 
 

-  const subs = {}
+  const subs = {};

 
   redisClient.on('pmessage', (_, channel, message) => {
 
   redisClient.on('pmessage', (_, channel, message) => {

-    const callbacks = subs[channel]
+    const callbacks = subs[channel];

 
 

-    log.silly(`New message on channel ${channel}`)
+    log.silly(`New message on channel ${channel}`);

 
     if (!callbacks) {
 
     if (!callbacks) {

-      return
+      return;

     }
     }

-    callbacks.forEach(callback => callback(message))
-  })
+    callbacks.forEach(callback => callback(message));
+  });

 
 

-  redisClient.psubscribe(`${redisPrefix}timeline:*`)
+  redisClient.psubscribe(`${redisPrefix}timeline:*`);

 
   const subscribe = (channel, callback) => {
 
   const subscribe = (channel, callback) => {

-    log.silly(`Adding listener for ${channel}`)
-    subs[channel] = subs[channel] || []
-    subs[channel].push(callback)
-  }
+    log.silly(`Adding listener for ${channel}`);
+    subs[channel] = subs[channel] || [];
+    subs[channel].push(callback);
+  };

 
   const unsubscribe = (channel, callback) => {
 
   const unsubscribe = (channel, callback) => {

-    log.silly(`Removing listener for ${channel}`)
-    subs[channel] = subs[channel].filter(item => item !== callback)
-  }
+    log.silly(`Removing listener for ${channel}`);
+    subs[channel] = subs[channel].filter(item => item !== callback);
+  };

 
   const allowCrossDomain = (req, res, next) => {
 
   const allowCrossDomain = (req, res, next) => {

-    res.header('Access-Control-Allow-Origin', '*')
-    res.header('Access-Control-Allow-Headers', 'Authorization, Accept, Cache-Control')
-    res.header('Access-Control-Allow-Methods', 'GET, OPTIONS')
+    res.header('Access-Control-Allow-Origin', '*');
+    res.header('Access-Control-Allow-Headers', 'Authorization, Accept, Cache-Control');
+    res.header('Access-Control-Allow-Methods', 'GET, OPTIONS');

 
 

-    next()
-  }
+    next();
+  };

 
   const setRequestId = (req, res, next) => {
 
   const setRequestId = (req, res, next) => {

-    req.requestId = uuid.v4()
-    res.header('X-Request-Id', req.requestId)
+    req.requestId = uuid.v4();
+    res.header('X-Request-Id', req.requestId);

 
 

-    next()
-  }
+    next();
+  };

 
   const accountFromToken = (token, req, next) => {
     pgPool.connect((err, client, done) => {
       if (err) {
 
   const accountFromToken = (token, req, next) => {
     pgPool.connect((err, client, done) => {
       if (err) {

-        next(err)
-        return
+        next(err);
+        return;

       }
 
       client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 LIMIT 1', [token], (err, result) => {
       }
 
       client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 LIMIT 1', [token], (err, result) => {

-        done()
+        done();

 
         if (err) {
 
         if (err) {

-          next(err)
-          return
+          next(err);
+          return;

         }
 
         if (result.rows.length === 0) {
         }
 
         if (result.rows.length === 0) {

-          err = new Error('Invalid access token')
-          err.statusCode = 401
+          err = new Error('Invalid access token');
+          err.statusCode = 401;

 
 

-          next(err)
-          return
+          next(err);
+          return;

         }
 
         }
 

-        req.accountId = result.rows[0].account_id
+        req.accountId = result.rows[0].account_id;

 
 

-        next()
-      })
-    })
-  }
+        next();
+      });
+    });
+  };

 
   const authenticationMiddleware = (req, res, next) => {
     if (req.method === 'OPTIONS') {
 
   const authenticationMiddleware = (req, res, next) => {
     if (req.method === 'OPTIONS') {

-      next()
-      return
+      next();
+      return;

     }
 
     }
 

-    const authorization = req.get('Authorization')
+    const authorization = req.get('Authorization');

 
     if (!authorization) {
 
     if (!authorization) {

-      const err = new Error('Missing access token')
-      err.statusCode = 401
+      const err = new Error('Missing access token');
+      err.statusCode = 401;

 
 

-      next(err)
-      return
+      next(err);
+      return;

     }
 
     }
 

-    const token = authorization.replace(/^Bearer /, '')
+    const token = authorization.replace(/^Bearer /, '');

 
 

-    accountFromToken(token, req, next)
-  }
+    accountFromToken(token, req, next);
+  };

 
   const errorMiddleware = (err, req, res, next) => {
 
   const errorMiddleware = (err, req, res, next) => {

-    log.error(req.requestId, err)
-    res.writeHead(err.statusCode || 500, { 'Content-Type': 'application/json' })
-    res.end(JSON.stringify({ error: err.statusCode ? `${err}` : 'An unexpected error occurred' }))
-  }
+    log.error(req.requestId, err);
+    res.writeHead(err.statusCode || 500, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: err.statusCode ? `${err}` : 'An unexpected error occurred' }));
+  };

 
   const placeholders = (arr, shift = 0) => arr.map((_, i) => `$${i + 1 + shift}`).join(', ');
 
   const streamFrom = (id, req, output, attachCloseHandler, needsFiltering = false) => {
 
   const placeholders = (arr, shift = 0) => arr.map((_, i) => `$${i + 1 + shift}`).join(', ');
 
   const streamFrom = (id, req, output, attachCloseHandler, needsFiltering = false) => {

-    log.verbose(req.requestId, `Starting stream from ${id} for ${req.accountId}`)
+    log.verbose(req.requestId, `Starting stream from ${id} for ${req.accountId}`);

 
     const listener = message => {
 
     const listener = message => {

-      const { event, payload, queued_at } = JSON.parse(message)
+      const { event, payload, queued_at } = JSON.parse(message);

 
       const transmit = () => {
 
       const transmit = () => {

-        const now   = new Date().getTime()
+        const now   = new Date().getTime();

         const delta = now - queued_at;
 
         const delta = now - queued_at;
 

-        log.silly(req.requestId, `Transmitting for ${req.accountId}: ${event} ${payload} Delay: ${delta}ms`)
-        output(event, payload)
-      }
+        log.silly(req.requestId, `Transmitting for ${req.accountId}: ${event} ${payload} Delay: ${delta}ms`);
+        output(event, payload);
+      };

 
       // Only messages that may require filtering are statuses, since notifications
       // are already personalized and deletes do not matter
       if (needsFiltering && event === 'update') {
         pgPool.connect((err, client, done) => {
           if (err) {
 
       // Only messages that may require filtering are statuses, since notifications
       // are already personalized and deletes do not matter
       if (needsFiltering && event === 'update') {
         pgPool.connect((err, client, done) => {
           if (err) {

-            log.error(err)
-            return
+            log.error(err);
+            return;

           }
 
           }
 

-          const unpackedPayload  = JSON.parse(payload)
-          const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id)).concat(unpackedPayload.reblog ? [unpackedPayload.reblog.account.id] : [])
-          const accountDomain    = unpackedPayload.account.acct.split('@')[1]
+          const unpackedPayload  = JSON.parse(payload);
+          const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id)).concat(unpackedPayload.reblog ? [unpackedPayload.reblog.account.id] : []);
+          const accountDomain    = unpackedPayload.account.acct.split('@')[1];

 
           const queries = [
             client.query(`SELECT 1 FROM blocks WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 1)}) UNION SELECT 1 FROM mutes WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 1)})`, [req.accountId].concat(targetAccountIds)),
 
           const queries = [
             client.query(`SELECT 1 FROM blocks WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 1)}) UNION SELECT 1 FROM mutes WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 1)})`, [req.accountId].concat(targetAccountIds)),

-          ]
+          ];

 
           if (accountDomain) {
 
           if (accountDomain) {

-            queries.push(client.query('SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2', [req.accountId, accountDomain]))
+            queries.push(client.query('SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2', [req.accountId, accountDomain]));

           }
 
           Promise.all(queries).then(values => {
           }
 
           Promise.all(queries).then(values => {

-            done()
+            done();

 
             if (values[0].rows.length > 0 || (values.length > 1 && values[1].rows.length > 0)) {
 
             if (values[0].rows.length > 0 || (values.length > 1 && values[1].rows.length > 0)) {

-              return
+              return;

             }
 
             }
 

-            transmit()
+            transmit();

           }).catch(err => {
           }).catch(err => {

-            log.error(err)
-          })
-        })
+            log.error(err);
+          });
+        });

       } else {
       } else {

-        transmit()
+        transmit();

       }
       }

-    }
+    };

 
 

-    subscribe(`${redisPrefix}${id}`, listener)
-    attachCloseHandler(`${redisPrefix}${id}`, listener)
-  }
+    subscribe(`${redisPrefix}${id}`, listener);
+    attachCloseHandler(`${redisPrefix}${id}`, listener);
+  };

 
   // Setup stream output to HTTP
   const streamToHttp = (req, res) => {
 
   // Setup stream output to HTTP
   const streamToHttp = (req, res) => {

-    res.setHeader('Content-Type', 'text/event-stream')
-    res.setHeader('Transfer-Encoding', 'chunked')
+    res.setHeader('Content-Type', 'text/event-stream');
+    res.setHeader('Transfer-Encoding', 'chunked');

 
 

-    const heartbeat = setInterval(() => res.write(':thump\n'), 15000)
+    const heartbeat = setInterval(() => res.write(':thump\n'), 15000);

 
     req.on('close', () => {
 
     req.on('close', () => {

-      log.verbose(req.requestId, `Ending stream for ${req.accountId}`)
-      clearInterval(heartbeat)
-    })
+      log.verbose(req.requestId, `Ending stream for ${req.accountId}`);
+      clearInterval(heartbeat);
+    });

 
     return (event, payload) => {
 
     return (event, payload) => {

-      res.write(`event: ${event}\n`)
-      res.write(`data: ${payload}\n\n`)
-    }
-  }
+      res.write(`event: ${event}\n`);
+      res.write(`data: ${payload}\n\n`);
+    };
+  };

 
   // Setup stream end for HTTP
   const streamHttpEnd = req => (id, listener) => {
     req.on('close', () => {
 
   // Setup stream end for HTTP
   const streamHttpEnd = req => (id, listener) => {
     req.on('close', () => {

-      unsubscribe(id, listener)
-    })
-  }
+      unsubscribe(id, listener);
+    });
+  };

 
   // Setup stream output to WebSockets
   const streamToWs = (req, ws) => {
     const heartbeat = setInterval(() => {
       // TODO: Can't add multiple listeners, due to the limitation of uws.
       if (ws.readyState !== ws.OPEN) {
 
   // Setup stream output to WebSockets
   const streamToWs = (req, ws) => {
     const heartbeat = setInterval(() => {
       // TODO: Can't add multiple listeners, due to the limitation of uws.
       if (ws.readyState !== ws.OPEN) {

-        log.verbose(req.requestId, `Ending stream for ${req.accountId}`)
-        clearInterval(heartbeat)
-        return
+        log.verbose(req.requestId, `Ending stream for ${req.accountId}`);
+        clearInterval(heartbeat);
+        return;

       }
 
       }
 

-      ws.ping()
-    }, 15000)
+      ws.ping();
+    }, 15000);

 
     return (event, payload) => {
       if (ws.readyState !== ws.OPEN) {
 
     return (event, payload) => {
       if (ws.readyState !== ws.OPEN) {

-        log.error(req.requestId, 'Tried writing to closed socket')
-        return
+        log.error(req.requestId, 'Tried writing to closed socket');
+        return;

       }
 
       }
 

-      ws.send(JSON.stringify({ event, payload }))
-    }
-  }
+      ws.send(JSON.stringify({ event, payload }));
+    };
+  };

 
   // Setup stream end for WebSockets
   const streamWsEnd = ws => (id, listener) => {
     ws.on('close', () => {
 
   // Setup stream end for WebSockets
   const streamWsEnd = ws => (id, listener) => {
     ws.on('close', () => {

-      unsubscribe(id, listener)
-    })
+      unsubscribe(id, listener);
+    });

 
     ws.on('error', e => {
 
     ws.on('error', e => {

-      unsubscribe(id, listener)
-    })
-  }
+      unsubscribe(id, listener);
+    });
+  };

 
 

-  app.use(setRequestId)
-  app.use(allowCrossDomain)
-  app.use(authenticationMiddleware)
-  app.use(errorMiddleware)
+  app.use(setRequestId);
+  app.use(allowCrossDomain);
+  app.use(authenticationMiddleware);
+  app.use(errorMiddleware);

 
   app.get('/api/v1/streaming/user', (req, res) => {
 
   app.get('/api/v1/streaming/user', (req, res) => {

-    streamFrom(`timeline:${req.accountId}`, req, streamToHttp(req, res), streamHttpEnd(req))
-  })
+    streamFrom(`timeline:${req.accountId}`, req, streamToHttp(req, res), streamHttpEnd(req));
+  });

 
   app.get('/api/v1/streaming/public', (req, res) => {
 
   app.get('/api/v1/streaming/public', (req, res) => {

-    streamFrom('timeline:public', req, streamToHttp(req, res), streamHttpEnd(req), true)
-  })
+    streamFrom('timeline:public', req, streamToHttp(req, res), streamHttpEnd(req), true);
+  });

 
   app.get('/api/v1/streaming/public/local', (req, res) => {
 
   app.get('/api/v1/streaming/public/local', (req, res) => {

-    streamFrom('timeline:public:local', req, streamToHttp(req, res), streamHttpEnd(req), true)
-  })
+    streamFrom('timeline:public:local', req, streamToHttp(req, res), streamHttpEnd(req), true);
+  });

 
   app.get('/api/v1/streaming/hashtag', (req, res) => {
 
   app.get('/api/v1/streaming/hashtag', (req, res) => {

-    streamFrom(`timeline:hashtag:${req.query.tag}`, req, streamToHttp(req, res), streamHttpEnd(req), true)
-  })
+    streamFrom(`timeline:hashtag:${req.query.tag}`, req, streamToHttp(req, res), streamHttpEnd(req), true);
+  });

 
   app.get('/api/v1/streaming/hashtag/local', (req, res) => {
 
   app.get('/api/v1/streaming/hashtag/local', (req, res) => {

-    streamFrom(`timeline:hashtag:${req.query.tag}:local`, req, streamToHttp(req, res), streamHttpEnd(req), true)
-  })
+    streamFrom(`timeline:hashtag:${req.query.tag}:local`, req, streamToHttp(req, res), streamHttpEnd(req), true);
+  });

 
   wss.on('connection', ws => {
 
   wss.on('connection', ws => {

-    const location = url.parse(ws.upgradeReq.url, true)
-    const token    = location.query.access_token
-    const req      = { requestId: uuid.v4() }
+    const location = url.parse(ws.upgradeReq.url, true);
+    const token    = location.query.access_token;
+    const req      = { requestId: uuid.v4() };

 
     accountFromToken(token, req, err => {
       if (err) {
 
     accountFromToken(token, req, err => {
       if (err) {

-        log.error(req.requestId, err)
-        ws.close()
-        return
+        log.error(req.requestId, err);
+        ws.close();
+        return;

       }
 
       switch(location.query.stream) {
       case 'user':
       }
 
       switch(location.query.stream) {
       case 'user':

-        streamFrom(`timeline:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(ws))
+        streamFrom(`timeline:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(ws));

         break;
       case 'public':
         break;
       case 'public':

-        streamFrom('timeline:public', req, streamToWs(req, ws), streamWsEnd(ws), true)
+        streamFrom('timeline:public', req, streamToWs(req, ws), streamWsEnd(ws), true);

         break;
       case 'public:local':
         break;
       case 'public:local':

-        streamFrom('timeline:public:local', req, streamToWs(req, ws), streamWsEnd(ws), true)
+        streamFrom('timeline:public:local', req, streamToWs(req, ws), streamWsEnd(ws), true);

         break;
       case 'hashtag':
         break;
       case 'hashtag':

-        streamFrom(`timeline:hashtag:${location.query.tag}`, req, streamToWs(req, ws), streamWsEnd(ws), true)
+        streamFrom(`timeline:hashtag:${location.query.tag}`, req, streamToWs(req, ws), streamWsEnd(ws), true);

         break;
       case 'hashtag:local':
         break;
       case 'hashtag:local':

-        streamFrom(`timeline:hashtag:${location.query.tag}:local`, req, streamToWs(req, ws), streamWsEnd(ws), true)
+        streamFrom(`timeline:hashtag:${location.query.tag}:local`, req, streamToWs(req, ws), streamWsEnd(ws), true);

         break;
       default:
         break;
       default:

-        ws.close()
+        ws.close();

       }
       }

-    })
-  })
+    });
+  });

 
   server.listen(process.env.PORT || 4000, () => {
 
   server.listen(process.env.PORT || 4000, () => {

-    log.level = process.env.LOG_LEVEL || 'verbose'
-    log.info(`Starting streaming API server worker on ${server.address().address}:${server.address().port}`)
-  })
+    log.level = process.env.LOG_LEVEL || 'verbose';
+    log.info(`Starting streaming API server worker on ${server.address().address}:${server.address().port}`);
+  });

 
 

-  process.on('SIGINT', exit)
-  process.on('SIGTERM', exit)
-  process.on('exit', exit)
+  process.on('SIGINT', exit);
+  process.on('SIGTERM', exit);
+  process.on('exit', exit);

 
   function exit() {
 
   function exit() {

-    server.close()
+    server.close();

   }
 }
   }
 }