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

Adding QuoteLengthLimit option for Feature request: #963 #985

Merged
merged 2 commits into from
Jan 29, 2020

Conversation

hmrhkr
Copy link
Contributor

@hmrhkr hmrhkr commented Jan 20, 2020

FR #963 asked for an option to limit the max quoted message length.
QuoteLengthLimit option added to limit max. quoted message length.
If QuoteLengthLimit = 0 the whole message will be quoted.

…QuoteLengthLimit = 0 the whole message will be quoted
@hmrhkr
Copy link
Contributor Author

hmrhkr commented Jan 22, 2020

Travis complains about one simple readability improvement.
Am I supposed to create a new PR?

@@ -11,7 +11,7 @@ import (
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/bridge/helper"
"github.com/jpillora/backoff"
"github.com/matterbridge/go-xmpp"
"github.com/humorhenker/go-xmpp"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should keep go-xmpp from matterbridge

@@ -331,7 +331,7 @@ func (b *Bxmpp) skipMessage(message xmpp.Chat) bool {
}

// skip empty messages
if message.Text == "" {
if message.Text == "" && message.Chatstate == "" {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to change this, please open a new PR for this change (it's not related to the QuoteLengthLimit feature)

@42wim
Copy link
Owner

42wim commented Jan 24, 2020

Thanks for the PR!

I've added some comments to your code.

Travis complains about one simple readability improvement.
Am I supposed to create a new PR?

No, you can just push commits (that will fix the issues travis complains about) to your branch (master in your case)

Travis will rebuild this PR with every commit you push.

@hmrhkr
Copy link
Contributor Author

hmrhkr commented Jan 25, 2020

Updated now.
I am still such a git noob. Did not realized that the pr will update with my changes on the fork. Did not mean to include the other changes.

@42wim
Copy link
Owner

42wim commented Jan 29, 2020

Thanks! No worries, your git-fu will grow :)

@42wim 42wim merged commit fc30b1b into 42wim:master Jan 29, 2020
@42wim 42wim added this to the 1.16.4 milestone Feb 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants