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

Remove references to keybase and switch to Matrix #6005

Merged
merged 1 commit into from
Feb 7, 2022

Conversation

w0000000t
Copy link
Contributor

Except dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN which refers to an
unused role, every other instance of keybase has been contextually
updated to Matrix (bisq.chat); functions to display moderator name
and profile address on keybase have been updated to work with Matrix
usernames and urls.

Fixes #replaceWithIssueNr, fixes #replaceWithIssueNr

Your PR description here.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Good initiative! A couple of comments:

  • you should only commit changes to the maindisplayStrings.properties; the translated ones are updated automatically by transifex
  • pazza in class DisputeAgentLookupMap should be changed to pazza83

@w0000000t
Copy link
Contributor Author

Good initiative! A couple of comments:

  • you should only commit changes to the maindisplayStrings.properties; the translated ones are updated automatically by transifex
  • pazza in class DisputeAgentLookupMap should be changed to pazza83

thanks for the comments!
I suspected as much regarding the translations... did them anyway as, if updated automatically, they are overwritten anyway... regarding pazza I already changed it to pazza83 in the code, or is there another reference to their username elsewhere? Cannot find it by searching in Idea

@ghost
Copy link

ghost commented Jan 28, 2022

ok I missed that you already got that pazza83 name change. 👍
p.s. Its usually the case that @ripcurlx asks for the translated files not to be included.

@w0000000t
Copy link
Contributor Author

Ouch, I do hope he doesn't ask me to adjust it, because I definitely can, but then I couldn't for the life of me squash the commits together even if he was so incredibly kind to show me in my previous PR

@ghost
Copy link

ghost commented Jan 28, 2022

  1. [copy back the original versions of the translated resources]
  2. git status to double-check what files you'll be modifying
  3. git add *
  4. git commit -m"fix"
  5. git rebase -i HEAD~2
  6. [in editor that pops up, change the second commit command from pick to fixup]
  7. git commit --amend -S
  8. git push --force origin
  9. have a 🍺

@w0000000t
Copy link
Contributor Author

Saving this nice writeup for later use! Nice little abstract, thanks!

@w0000000t
Copy link
Contributor Author

I think I've done it @jmacxx ! Had to mess with the access token thingamajig but it appears to have worked!

ripcurlx
ripcurlx previously approved these changes Feb 1, 2022
Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

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

utACK - Code changes are looking fine 👍

@ripcurlx
Copy link
Contributor

ripcurlx commented Feb 1, 2022

@w0000000t But your account is not properly signed 😅

@w0000000t
Copy link
Contributor Author

w0000000t commented Feb 2, 2022

@w0000000t But your account is not properly signed 😅

...I know what happened.
This PR was signed with my previous email, and I have since then removed that emaill from github in favor of a new one, which I managed to get to sign correctly. I thought the signed status of this PR would have stayed, but it didn't apparently as I was royally wrong.
Dang, I'll try and amend it using my new working signature, more practice for me 😅

Except `dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN` which refers to an
unused role, every other instance of `keybase` has been contextually
updated to Matrix (bisq.chat); functions to display moderator name
and profile address on keybase have been updated to work with Matrix
usernames and urls.
Kept translated resources in original state as per jmacxx suggestion.
@w0000000t
Copy link
Contributor Author

@ripcurlx please confirm I didn't make a complete mess, it appears signed now and I should have squashed all commits now, maybe?

Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

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

utACK - Changes are looking fine 👍

@ripcurlx ripcurlx merged commit 5e7ac77 into bisq-network:master Feb 7, 2022
@ripcurlx ripcurlx added this to the v1.8.3 milestone Feb 7, 2022
@w0000000t w0000000t deleted the keybase_>_matrix branch February 7, 2022 10:20
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