fix lint

5 years ago · 902e678a64
parent 9b8ad976e3
commit 902e678a64
7 changed files with 188 additions and 160 deletions
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@ -2564,7 +2564,8 @@
    "message": "https://yourchannel.lokinet.org"
  },
  "addChannelDescription": {
-    "message": "Enter the URL of the public channel you'd like to join in the format above."
+    "message":
+      "Enter the URL of the public channel you'd like to join in the format above."
  },
  "joinChannel": {
    "message": "Join Channel"
--- a/stylesheets/_session_theme_dark_left_pane.scss
+++ b/stylesheets/_session_theme_dark_left_pane.scss
@ -128,7 +128,7 @@ $session-compose-margin: 20px;

  &-overlay {
    background: linear-gradient(180deg, #171717 0%, #121212 100%);
-    box-shadow: 0 0 100px 0 rgba(0,0,0,0.5);
+    box-shadow: 0 0 100px 0 rgba(0, 0, 0, 0.5);
    display: flex;
    flex-direction: column;
    align-items: center;
@ -220,7 +220,6 @@ $session-compose-margin: 20px;
  display: flex;
  flex-direction: column;
  flex-grow: 1;
-
 }

 .session-left-pane-section-content {
--- a/ts/components/session/LeftPaneChannelSection.tsx
+++ b/ts/components/session/LeftPaneChannelSection.tsx
@ -7,7 +7,11 @@ import {
 } from '../ConversationListItem';

 import { LeftPane, RowRendererParamsType } from '../LeftPane';
-import { SessionButton, SessionButtonColor, SessionButtonType } from './SessionButton';
+import {
+  SessionButton,
+  SessionButtonColor,
+  SessionButtonType,
+} from './SessionButton';
 import {
  PropsData as SearchResultsProps,
  SearchResults,
@ -32,7 +36,6 @@ export interface Props {
  clearSearch: () => void;
 }

-
 interface State {
  showAddChannelView: boolean;
  channelUrlPasted: string;
@ -54,12 +57,13 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
    };

    this.handleOnPasteUrl = this.handleOnPasteUrl.bind(this);
-    this.handleJoinChannelButtonClick = this.handleJoinChannelButtonClick.bind(this);
+    this.handleJoinChannelButtonClick = this.handleJoinChannelButtonClick.bind(
+      this
+    );
    this.handleToggleOverlay = this.handleToggleOverlay.bind(this);
    this.updateSearchBound = this.updateSearch.bind(this);
    this.debouncedSearch = debounce(this.search.bind(this), 20);
    this.attemptConnection = this.attemptConnection.bind(this);
-
  }

  public componentWillUnmount() {
@ -76,14 +80,15 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
      conversationList = conversationList.filter(
        // a channel is either a public group or a rss group
        conversation =>
-          conversation.type === 'group' && (conversation.isPublic || (conversation.lastMessage && conversation.lastMessage.isRss))
+          conversation.type === 'group' &&
+          (conversation.isPublic ||
+            (conversation.lastMessage && conversation.lastMessage.isRss))
      );
    }

    return conversationList;
  }

-
  public renderRow = ({
    index,
    key,
@ -161,10 +166,7 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
  public renderHeader(): JSX.Element {
    const labels = [window.i18n('channels')];

-    return LeftPane.RENDER_HEADER(
-      labels,
-      null
-    );
+    return LeftPane.RENDER_HEADER(labels, null);
  }

  public render(): JSX.Element {
@ -179,9 +181,8 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
  }

  public renderGroups() {
-
    return (
-      <div className="module-conversations-list-content" >
+      <div className="module-conversations-list-content">
        <SessionSearchInput
          searchString={this.props.searchTerm}
          onChange={this.updateSearchBound}
@ -189,7 +190,7 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
        />
        {this.renderList()}
        {this.renderBottomButtons()}
-        </div>
+      </div>
    );
  }

@ -241,7 +242,9 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
  }

  private handleToggleOverlay() {
-    this.setState(prevState => ({ showAddChannelView: !prevState.showAddChannelView }));
+    this.setState(prevState => ({
+      showAddChannelView: !prevState.showAddChannelView,
+    }));
  }

  private renderClosableOverlay() {
@ -249,7 +252,15 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
    const { loading } = this.state;

    return (
-      <SessionClosableOverlay overlayMode="channel" onChangeSessionID={this.handleOnPasteUrl} onCloseClick={this.handleToggleOverlay} onButtonClick={this.handleJoinChannelButtonClick} searchTerm={searchTerm} updateSearch={this.updateSearchBound} showSpinner={loading}/>
+      <SessionClosableOverlay
+        overlayMode="channel"
+        onChangeSessionID={this.handleOnPasteUrl}
+        onCloseClick={this.handleToggleOverlay}
+        onButtonClick={this.handleJoinChannelButtonClick}
+        searchTerm={searchTerm}
+        updateSearch={this.updateSearchBound}
+        showSpinner={loading}
+      />
    );
  }

@ -274,7 +285,6 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
    );
  }

-
  private handleOnPasteUrl(e: any) {
    if (e.target.innerHTML) {
      const cleanText = e.target.innerHTML.replace(/<\/?[^>]+(>|$)/g, '');
@ -283,11 +293,9 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
  }

  private handleJoinChannelButtonClick() {
-
    const { loading, channelUrlPasted } = this.state;

    if (loading) {
-
      return false;
    }

@ -304,7 +312,10 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
    // TODO: Make this not hard coded
    const channelId = 1;
    this.setState({ loading: true });
-    const connectionResult = this.attemptConnection(channelUrlPasted, channelId);
+    const connectionResult = this.attemptConnection(
+      channelUrlPasted,
+      channelId
+    );

    // Give 5s maximum for promise to revole. Else, throw error.
    const maxConnectionDuration = 5000;
@ -322,41 +333,40 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
    }, maxConnectionDuration);

    connectionResult
-    .then(() => {
-      clearTimeout(connectionTimeout);
-
-      if (this.state.loading) {
+      .then(() => {
+        clearTimeout(connectionTimeout);
+
+        if (this.state.loading) {
+          this.setState({
+            connectSuccess: true,
+            loading: false,
+          });
+          window.pushToast({
+            title: window.i18n('connectToServerSuccess'),
+            id: 'connectToServerSuccess',
+            type: 'success',
+          });
+          this.handleToggleOverlay();
+        }
+      })
+      .catch((connectionError: string) => {
+        clearTimeout(connectionTimeout);
        this.setState({
          connectSuccess: true,
          loading: false,
        });
        window.pushToast({
-          title: window.i18n('connectToServerSuccess'),
-          id: 'connectToServerSuccess',
-          type: 'success',
+          title: connectionError,
+          id: 'connectToServerFail',
+          type: 'error',
        });
-        this.handleToggleOverlay();
-      }
-    })
-    .catch((connectionError: string) => {
-      clearTimeout(connectionTimeout);
-      this.setState({
-        connectSuccess: true,
-        loading: false,
-      });
-      window.pushToast({
-        title: connectionError,
-        id: 'connectToServerFail',
-        type: 'error',
-      });

-      return false;
-    });
+        return false;
+      });

    return true;
  }

-
  private async attemptConnection(serverURL: string, channelId: number) {
    const rawserverURL = serverURL
      .replace(/^https?:\/\//i, '')
--- a/ts/components/session/LeftPaneContactSection.tsx
+++ b/ts/components/session/LeftPaneContactSection.tsx
@ -195,7 +195,12 @@ export class LeftPaneContactSection extends React.Component<Props, State> {

  private renderClosableOverlay() {
    return (
-      <SessionClosableOverlay overlayMode="contact" onChangeSessionID={this.handleRecipientSessionIDChanged} onCloseClick={this.handleToggleOverlay} onButtonClick={this.handleOnAddContact} />
+      <SessionClosableOverlay
+        overlayMode="contact"
+        onChangeSessionID={this.handleRecipientSessionIDChanged}
+        onCloseClick={this.handleToggleOverlay}
+        onButtonClick={this.handleOnAddContact}
+      />
    );
  }

--- a/ts/components/session/LeftPaneMessageSection.tsx
+++ b/ts/components/session/LeftPaneMessageSection.tsx
@ -234,7 +234,15 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
    const { searchTerm, searchResults } = this.props;

    return (
-      <SessionClosableOverlay overlayMode="message" onChangeSessionID={this.handleOnPasteSessionID} onCloseClick={this.handleToggleOverlay} onButtonClick={this.handleMessageButtonClick} searchTerm={searchTerm}  searchResults={searchResults} updateSearch={this.updateSearchBound} />
+      <SessionClosableOverlay
+        overlayMode="message"
+        onChangeSessionID={this.handleOnPasteSessionID}
+        onCloseClick={this.handleToggleOverlay}
+        onButtonClick={this.handleMessageButtonClick}
+        searchTerm={searchTerm}
+        searchResults={searchResults}
+        updateSearch={this.updateSearchBound}
+      />
    );
  }

--- a/ts/components/session/SessionClosableOverlay.tsx
+++ b/ts/components/session/SessionClosableOverlay.tsx
@ -1,131 +1,131 @@
 import React from 'react';

-import {
-    SessionIconButton,
-    SessionIconSize,
-    SessionIconType,
-  } from './icon';
+import { SessionIconButton, SessionIconSize, SessionIconType } from './icon';
 import { SessionIdEditable } from './SessionIdEditable';
 import { UserSearchDropdown } from './UserSearchDropdown';
 import {
-    SessionButton,
-    SessionButtonColor,
-    SessionButtonType,
+  SessionButton,
+  SessionButtonColor,
+  SessionButtonType,
 } from './SessionButton';
 import { SessionSpinner } from './SessionSpinner';

-
 interface Props {
-    overlayMode: 'message' | 'contact' | 'channel';
-    onChangeSessionID: any;
-    onCloseClick: any;
-    onButtonClick: any;
-    searchTerm?: string;
-    searchResults?: any;
-    updateSearch?: any;
-    showSpinner?: boolean;
+  overlayMode: 'message' | 'contact' | 'channel';
+  onChangeSessionID: any;
+  onCloseClick: any;
+  onButtonClick: any;
+  searchTerm?: string;
+  searchResults?: any;
+  updateSearch?: any;
+  showSpinner?: boolean;
 }

-
 export class SessionClosableOverlay extends React.Component<Props> {
+  public constructor(props: Props) {
+    super(props);
+  }

-    public constructor(props: Props) {
-        super(props);
-    }
-
-    public render(): JSX.Element {
-        const { overlayMode, onCloseClick, onChangeSessionID, showSpinner, searchTerm, updateSearch, searchResults, onButtonClick } = this.props;
+  public render(): JSX.Element {
+    const {
+      overlayMode,
+      onCloseClick,
+      onChangeSessionID,
+      showSpinner,
+      searchTerm,
+      updateSearch,
+      searchResults,
+      onButtonClick,
+    } = this.props;

-        const isAddContactView = overlayMode === 'contact';
-        const isMessageView = overlayMode === 'message';
-        // const isChannelView = overlayMode === 'channel';
+    const isAddContactView = overlayMode === 'contact';
+    const isMessageView = overlayMode === 'message';
+    // const isChannelView = overlayMode === 'channel';

-        let title;
-        let buttonText;
-        let descriptionLong;
-        let subtitle;
-        let placeholder;
-        switch (overlayMode) {
-        case 'message':
-            title = window.i18n('enterRecipient');
-            buttonText = window.i18n('next');
-            descriptionLong = window.i18n('usersCanShareTheir...');
-            subtitle = window.i18n('enterSessionID');
-            placeholder = window.i18n('pasteSessionIDRecipient');
-            break;
-        case 'contact':
-            title = window.i18n('addContact');
-            buttonText = window.i18n('addContact');
-            descriptionLong = window.i18n('usersCanShareTheir...');
-            subtitle = window.i18n('enterSessionID')
-            placeholder = window.i18n('pasteSessionIDRecipient');
-            break;
-        case 'channel':
-        default:
-            title = window.i18n('addChannel');
-            buttonText = window.i18n('joinChannel');
-            descriptionLong = window.i18n('addChannelDescription');
-            subtitle = window.i18n('enterChannelURL');
-            placeholder = window.i18n('channelUrlPlaceholder');
-        }
+    let title;
+    let buttonText;
+    let descriptionLong;
+    let subtitle;
+    let placeholder;
+    switch (overlayMode) {
+      case 'message':
+        title = window.i18n('enterRecipient');
+        buttonText = window.i18n('next');
+        descriptionLong = window.i18n('usersCanShareTheir...');
+        subtitle = window.i18n('enterSessionID');
+        placeholder = window.i18n('pasteSessionIDRecipient');
+        break;
+      case 'contact':
+        title = window.i18n('addContact');
+        buttonText = window.i18n('addContact');
+        descriptionLong = window.i18n('usersCanShareTheir...');
+        subtitle = window.i18n('enterSessionID');
+        placeholder = window.i18n('pasteSessionIDRecipient');
+        break;
+      case 'channel':
+      default:
+        title = window.i18n('addChannel');
+        buttonText = window.i18n('joinChannel');
+        descriptionLong = window.i18n('addChannelDescription');
+        subtitle = window.i18n('enterChannelURL');
+        placeholder = window.i18n('channelUrlPlaceholder');
+    }

-        const ourSessionID = window.textsecure.storage.user.getNumber();
+    const ourSessionID = window.textsecure.storage.user.getNumber();

-        return (
-        <div className="module-left-pane-overlay">
-            <div className="exit">
-            <SessionIconButton
-                iconSize={SessionIconSize.Small}
-                iconType={SessionIconType.Exit}
-                onClick={onCloseClick}
-            />
-            </div>
-            <h2>{title}</h2>
-            <h3>{subtitle}</h3>
-            <div className="module-left-pane-overlay-border-container">
-            <hr className="white" />
-            <hr className="green" />
-            </div>
-            <SessionIdEditable
-                editable={true}
-                placeholder={placeholder}
-                onChange={onChangeSessionID}
-            />
-            {showSpinner && <SessionSpinner />}
-            <div className="session-description-long">
-            {descriptionLong}
-            </div>
-            {isMessageView && <h4>{window.i18n('or')}</h4>}
+    return (
+      <div className="module-left-pane-overlay">
+        <div className="exit">
+          <SessionIconButton
+            iconSize={SessionIconSize.Small}
+            iconType={SessionIconType.Exit}
+            onClick={onCloseClick}
+          />
+        </div>
+        <h2>{title}</h2>
+        <h3>{subtitle}</h3>
+        <div className="module-left-pane-overlay-border-container">
+          <hr className="white" />
+          <hr className="green" />
+        </div>
+        <SessionIdEditable
+          editable={true}
+          placeholder={placeholder}
+          onChange={onChangeSessionID}
+        />
+        {showSpinner && <SessionSpinner />}
+        <div className="session-description-long">{descriptionLong}</div>
+        {isMessageView && <h4>{window.i18n('or')}</h4>}

-            {isMessageView && (
-            <UserSearchDropdown
-                searchTerm={searchTerm || ''}
-                updateSearch={updateSearch}
-                placeholder={window.i18n('searchByIDOrDisplayName')}
-                searchResults={searchResults}
-            />
-            )}
+        {isMessageView && (
+          <UserSearchDropdown
+            searchTerm={searchTerm || ''}
+            updateSearch={updateSearch}
+            placeholder={window.i18n('searchByIDOrDisplayName')}
+            searchResults={searchResults}
+          />
+        )}

-            {isAddContactView && (
-            <div className="panel-text-divider">
-                <span>{window.i18n('yourPublicKey')}</span>
-            </div>
-            )}
+        {isAddContactView && (
+          <div className="panel-text-divider">
+            <span>{window.i18n('yourPublicKey')}</span>
+          </div>
+        )}

-            {isAddContactView && (
-            <SessionIdEditable
-                editable={false}
-                placeholder=""
-                text={ourSessionID}
-            />
-            )}
-            <SessionButton
-                buttonColor={SessionButtonColor.Green}
-                buttonType={SessionButtonType.BrandOutline}
-                text={buttonText}
-                onClick={onButtonClick}
-            />
-        </div>
-        );
-    }
+        {isAddContactView && (
+          <SessionIdEditable
+            editable={false}
+            placeholder=""
+            text={ourSessionID}
+          />
+        )}
+        <SessionButton
+          buttonColor={SessionButtonColor.Green}
+          buttonType={SessionButtonType.BrandOutline}
+          text={buttonText}
+          onClick={onButtonClick}
+        />
+      </div>
+    );
+  }
 }
--- a/ts/state/ducks/search.ts
+++ b/ts/state/ducks/search.ts
@ -263,7 +263,13 @@ export function reducer(

  if (action.type === 'SEARCH_RESULTS_FULFILLED') {
    const { payload } = action;
-    const { query, messages, normalizedPhoneNumber, conversations, contacts } = payload;
+    const {
+      query,
+      messages,
+      normalizedPhoneNumber,
+      conversations,
+      contacts,
+    } = payload;

    // Reject if the associated query is not the most recent user-provided query
    if (state.query !== query) {
@ -271,7 +277,6 @@ export function reducer(
    }
    const filteredMessage = messages.filter(message => message !== undefined);

-
    return {
      ...state,
      query,