Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A whole bunch of hacks and improvements #91

Closed
wants to merge 5 commits into from

Conversation

Projects
None yet
3 participants
@Cadair
Copy link
Contributor

commented Sep 26, 2018

I can spiit this up into multiple bits, but I have tried to keep the commit history tidy. This does:

Now in #92:

  • Does some html escaping
  • Fixes file bridging because the slack API changed
  • Strips out the language specifiers in triple backticks because they don't render on slack correctly.

In this PR once #92 is merged:

  • Improves pills substitutions to use the new slack mentions
  • Add Gitter style edit bridging
  • Adds a config option to specify the directory the user-store.db and room-store.db files go in
  • Converts slack snippets to inline code dumps in matrix
@Cadair

This comment has been minimized.

Copy link
Contributor Author

commented Sep 26, 2018

Oh also this is a PR to the #89 because I have been using and developing on that for a while.

@turt2live turt2live requested a review from matrix-org/bridges Sep 26, 2018

@turt2live

This comment has been minimized.

Copy link
Member

commented Sep 26, 2018

@Cadair can the changes specific to fixing #89 be split out as a PR to #89 for @Half-Shot to review/incorporate? Everything else pointing towards master would be awesome, and ideally be broken out into (tiny) individual PRs as well, but I won't fight too hard for that.

@turt2live turt2live removed the request for review from matrix-org/bridges Sep 26, 2018

@Cadair

This comment has been minimized.

Copy link
Contributor Author

commented Sep 27, 2018

@turt2live the main reason I havent split this up at this point is that I dont want to rebase them onto anything other than #89 and I dont want to have to keep rebasing a bunch of branches before #89 lands.

I will move the fixes out of here to a PR onto the #89 branch though, thats a good idea. Then I suggest that I tidy this up once #89 lands.

@Cadair Cadair force-pushed the Cadair:halfupdates branch from fd512b6 to a78cfc5 Sep 27, 2018

@Cadair

This comment has been minimized.

Copy link
Contributor Author

commented Sep 27, 2018

Ok this now builds on #92 and should be easy enough to split out the commits into their own branches if needed.

@Half-Shot Half-Shot force-pushed the matrix-org:hs/perissology/slack-events branch 2 times, most recently from 1529a6f to 73814f9 Sep 27, 2018

erdnaxeli and others added some commits Oct 16, 2017

Replace Riot pills mention to slack mention
Fix #52

Signed-off-by: Stuart Mumford <stuart@cadair.com>
Change pills subsitution to follow new slack mention syntax
Signed-off-by: Stuart Mumford <stuart@cadair.com>
Enable support for edits by copying it out of Gitter
Signed-off-by: Stuart Mumford <stuart@cadair.com>
add a dbdir config
Signed-off-by: Stuart Mumford <stuart@cadair.com>
Add support for conversion of snippets to code messages in matrix
Signed-off-by: Stuart Mumford <stuart@cadair.com>

@Cadair Cadair force-pushed the Cadair:halfupdates branch from a78cfc5 to c9897aa Oct 5, 2018

@Cadair Cadair changed the base branch from hs/perissology/slack-events to develop Oct 5, 2018

@Cadair Cadair closed this Oct 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.