From e78cb70d33a55997b941c70e44bd18762ae15ee7 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Wed, 26 Feb 2020 02:39:37 -0500 Subject: [PATCH] streamline credits --- README | 15 +++++---------- README.md | 15 +++++---------- docs/MANUAL.md | 9 ++++++--- irc/handlers.go | 7 ++++--- irc/server.go | 12 ++---------- 5 files changed, 22 insertions(+), 36 deletions(-) diff --git a/README b/README index a17cb730..c189501d 100644 --- a/README +++ b/README @@ -55,13 +55,8 @@ Otherwise, just starting the server will run an automagic backup and upgrade. === Credits === -* Jeremy Latt, creator of Ergonomadic, -* Edmund Huber, maintainer of Ergonomadic, -* Niels Freier, added WebSocket support to Ergonomadic, -* Daniel Oakley, maintainer of Oragono, -* Euan Kemp, contributor to Oragono and lots of useful fixes, -* Shivaram Lingamneni, has contributed a ton of fixes, refactoring, and general improvements, -* James Mills, contributed Docker support, -* Vegax, implementing some commands and helping when Oragono was just getting started, -* Sean Enck, transitioned us from using a custom script to a proper Makefile, -* apologies to anyone I forgot. +* Jeremy Latt (2012-2014) +* Edmund Huber (2014-2015) +* Daniel Oaks (2016-present) +* Shivaram Lingamneni (2017-present) +* Many other contributors and friends of the project <3 diff --git a/README.md b/README.md index 82dd9975..0819036e 100644 --- a/README.md +++ b/README.md @@ -117,13 +117,8 @@ Make sure to setup [SASL](https://freenode.net/kb/answer/sasl) in your client to # Credits -* Jeremy Latt, creator of Ergonomadic, -* Edmund Huber, maintainer of Ergonomadic, -* Niels Freier, added WebSocket support to Ergonomadic, -* Daniel Oakley, maintainer of Oragono, -* Euan Kemp, contributor to Oragono and lots of useful fixes, -* Shivaram Lingamneni, co-maintainer of Oragono, -* James Mills, contributed Docker support, -* Vegax, implementing some commands and helping when Oragono was just getting started, -* Sean Enck, transitioned us from using a custom script to a proper Makefile, -* apologies to anyone I forgot. +* Jeremy Latt (2012-2014) +* Edmund Huber (2014-2015) +* Daniel Oaks (2016-present) +* Shivaram Lingamneni (2017-present) +* [Many other contributors and friends of the project <3](https://github.com/oragono/oragono/blob/master/CHANGELOG.md) diff --git a/docs/MANUAL.md b/docs/MANUAL.md index 25a78997..5e887106 100644 --- a/docs/MANUAL.md +++ b/docs/MANUAL.md @@ -780,8 +780,11 @@ Oragono can emulate certain capabilities of the ZNC bouncer for the benefit of c # Acknowledgements -Always, thanks to Jeremy Latt for creating Ergonomadic. Thanks for Edmund Huber for maintaining Ergonomadic and providing useful help while transitioning. +Oragono's past and present maintainers and core contributors are: -Thanks to Euan Kemp (euank) for the contributions and help with this, along with other projects, and to James Mills, Vegax and Sean Enck for various other help and contributions on the server. +* Jeremy Latt (2012-2014) +* Edmund Huber (2014-2015) +* Daniel Oaks (2016-present) +* Shivaram Lingamneni (2017-present) -And a massive thanks to Shivaram Lingamneni (slingamn) for being an amazing co-maintainer of Oragono! You've contributed a lot to Oragono, and really convinced me to step up with this and take the server forward in a big way. I'm grateful for everything you've done, and working with ya' is a pleasure. +In addition, Oragono has benefited tremendously from its community of contributors, users, and translators, not to mention collaborations with the wider IRCv3 community. There are too many people to name here --- but we try to credit people for individual contributions in the changelog, please reach out to us if we forgot you :-) diff --git a/irc/handlers.go b/irc/handlers.go index 4e898e11..21cc5105 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -1001,16 +1001,17 @@ func infoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("Oragono is released under the MIT license.")) rb.Add(nil, server.name, RPL_INFO, client.nick, "") - rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("Thanks to Jeremy Latt for founding Ergonomadic, the project this is based on")+" <3") - rb.Add(nil, server.name, RPL_INFO, client.nick, "") rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("Core Developers:")) for _, line := range infoString2 { rb.Add(nil, server.name, RPL_INFO, client.nick, line) } - rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("Contributors and Former Developers:")) + rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("Former Core Developers:")) for _, line := range infoString3 { rb.Add(nil, server.name, RPL_INFO, client.nick, line) } + rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("For a more complete list of contributors, see our changelog:")) + rb.Add(nil, server.name, RPL_INFO, client.nick, " https://github.com/oragono/oragono/blob/master/CHANGELOG.md") + rb.Add(nil, server.name, RPL_INFO, client.nick, "") // show translators for languages other than good ole' regular English tlines := server.Languages().Translators() if 0 < len(tlines) { diff --git a/irc/server.go b/irc/server.go index 2ffe41c9..7eba51e9 100644 --- a/irc/server.go +++ b/irc/server.go @@ -992,15 +992,7 @@ var ( infoString2 = strings.Split(` Daniel Oakley, DanielOaks, Shivaram Lingamneni, slingamn, `, "\n") - infoString3 = strings.Split(` 3onyc - Edmund Huber - Euan Kemp (euank) - Jeremy Latt - Martin Lindhe (martinlindhe) - Roberto Besser (besser) - Robin Burchell (rburchell) - Sean Enck (enckse) - soul9 - Vegax + infoString3 = strings.Split(` Jeremy Latt, jlatt + Edmund Huber, edmund-huber `, "\n") )