Skip to content

Commit

Permalink
Merge pull request #22 from goodmind/development
Browse files Browse the repository at this point in the history
merge fixes
  • Loading branch information
goodmind authored Nov 20, 2016
2 parents 2fba353 + b7278df commit bc32df1
Show file tree
Hide file tree
Showing 18 changed files with 44 additions and 47 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ before_install:
before_script:
- npm prune
after_success:
- 'curl -Lo travis_after_all.py https://git.io/travis_after_all'
- python travis_after_all.py
- export $(cat .to_export_back) &> /dev/null
- npm run semantic-release
branches:
except:
Expand Down
2 changes: 1 addition & 1 deletion lib/helpers/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/helpers/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/interfaces.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { TcombWebhookResponse, TcombRequest, TcombUpdate, TcombUpdatesState } fr
export declare type Token = string;
export declare type GenericStream<T> = any;
export declare type DriverSink = TcombRequest | TcombWebhookResponse;
export declare type EventNames = 'message' | 'inline_query' | 'chosen_inline_result' | 'callback_query';
export interface DriverOptions {
webhook?: boolean;
startDate?: number;
Expand Down
4 changes: 3 additions & 1 deletion lib/plugins.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ export interface PluginsExecution {
matchStream(sourceObservable: GenericStream<TcombUpdate>, ...args: any[]): GenericStream<ComponentSinks>;
}
export declare function makePlugins(externalSA?: StreamAdapter): PluginsExecution;
export { matchWith, matchStream };
export declare let matchWith: (this: any, plugins: Plugin[], sources: ComponentSources, {dupe}?: {
dupe?: boolean;
}) => any, matchStream: (sourceObservable: any, ...args: any[]) => any;
5 changes: 2 additions & 3 deletions lib/plugins.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/plugins.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib/runtime-types/keyboard-types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export interface TcombReplyKeyboardMarkup {
one_time_keyboard?: boolean;
selective?: boolean;
}
export declare const ReplyKeyboardHide: t.Struct<TcombReplyKeyboardHide>;
export interface TcombReplyKeyboardHide {
export declare const ReplyKeyboardRemove: t.Struct<TcombReplyKeyboardRemove>;
export interface TcombReplyKeyboardRemove {
hide_keyboard: boolean;
selective?: boolean;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/runtime-types/keyboard-types.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/runtime-types/keyboard-types.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bc32df1

Please sign in to comment.