Browse Source

streamline credits

tags/v2.0.0-rc1
Shivaram Lingamneni 4 years ago
parent
commit
e78cb70d33
5 changed files with 22 additions and 36 deletions
  1. 5
    10
      README
  2. 5
    10
      README.md
  3. 6
    3
      docs/MANUAL.md
  4. 4
    3
      irc/handlers.go
  5. 2
    10
      irc/server.go

+ 5
- 10
README View File

@@ -55,13 +55,8 @@ Otherwise, just starting the server will run an automagic backup and upgrade.
55 55
 
56 56
 === Credits ===
57 57
 
58
-* Jeremy Latt, creator of Ergonomadic, <https://github.com/jlatt>
59
-* Edmund Huber, maintainer of Ergonomadic, <https://github.com/edmund-huber>
60
-* Niels Freier, added WebSocket support to Ergonomadic, <https://github.com/stumpyfr>
61
-* Daniel Oakley, maintainer of Oragono, <https://github.com/DanielOaks>
62
-* Euan Kemp, contributor to Oragono and lots of useful fixes, <https://github.com/euank>
63
-* Shivaram Lingamneni, has contributed a ton of fixes, refactoring, and general improvements, <https://github.com/slingamn>
64
-* James Mills, contributed Docker support, <https://github.com/prologic>
65
-* Vegax, implementing some commands and helping when Oragono was just getting started, <https://github.com/vegax87>
66
-* Sean Enck, transitioned us from using a custom script to a proper Makefile, <https://github.com/enckse>
67
-* apologies to anyone I forgot.
58
+* Jeremy Latt (2012-2014)
59
+* Edmund Huber (2014-2015)
60
+* Daniel Oaks (2016-present)
61
+* Shivaram Lingamneni (2017-present)
62
+* Many other contributors and friends of the project <3

+ 5
- 10
README.md View File

@@ -117,13 +117,8 @@ Make sure to setup [SASL](https://freenode.net/kb/answer/sasl) in your client to
117 117
 
118 118
 # Credits
119 119
 
120
-* Jeremy Latt, creator of Ergonomadic, <https://github.com/jlatt>
121
-* Edmund Huber, maintainer of Ergonomadic, <https://github.com/edmund-huber>
122
-* Niels Freier, added WebSocket support to Ergonomadic, <https://github.com/stumpyfr>
123
-* Daniel Oakley, maintainer of Oragono, <https://github.com/DanielOaks>
124
-* Euan Kemp, contributor to Oragono and lots of useful fixes, <https://github.com/euank>
125
-* Shivaram Lingamneni, co-maintainer of Oragono, <https://github.com/slingamn>
126
-* James Mills, contributed Docker support, <https://github.com/prologic>
127
-* Vegax, implementing some commands and helping when Oragono was just getting started, <https://github.com/vegax87>
128
-* Sean Enck, transitioned us from using a custom script to a proper Makefile, <https://github.com/enckse>
129
-* apologies to anyone I forgot.
120
+* Jeremy Latt (2012-2014)
121
+* Edmund Huber (2014-2015)
122
+* Daniel Oaks (2016-present)
123
+* Shivaram Lingamneni (2017-present)
124
+* [Many other contributors and friends of the project <3](https://github.com/oragono/oragono/blob/master/CHANGELOG.md)

+ 6
- 3
docs/MANUAL.md View File

@@ -780,8 +780,11 @@ Oragono can emulate certain capabilities of the ZNC bouncer for the benefit of c
780 780
 
781 781
 # Acknowledgements
782 782
 
783
-Always, thanks to Jeremy Latt for creating Ergonomadic. Thanks for Edmund Huber for maintaining Ergonomadic and providing useful help while transitioning.
783
+Oragono's past and present maintainers and core contributors are:
784 784
 
785
-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.
785
+* Jeremy Latt (2012-2014)
786
+* Edmund Huber (2014-2015)
787
+* Daniel Oaks (2016-present)
788
+* Shivaram Lingamneni (2017-present)
786 789
 
787
-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.
790
+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 :-)

+ 4
- 3
irc/handlers.go View File

@@ -1001,16 +1001,17 @@ func infoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp
1001 1001
 	}
1002 1002
 	rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("Oragono is released under the MIT license."))
1003 1003
 	rb.Add(nil, server.name, RPL_INFO, client.nick, "")
1004
-	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")
1005
-	rb.Add(nil, server.name, RPL_INFO, client.nick, "")
1006 1004
 	rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("Core Developers:"))
1007 1005
 	for _, line := range infoString2 {
1008 1006
 		rb.Add(nil, server.name, RPL_INFO, client.nick, line)
1009 1007
 	}
1010
-	rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("Contributors and Former Developers:"))
1008
+	rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("Former Core Developers:"))
1011 1009
 	for _, line := range infoString3 {
1012 1010
 		rb.Add(nil, server.name, RPL_INFO, client.nick, line)
1013 1011
 	}
1012
+	rb.Add(nil, server.name, RPL_INFO, client.nick, client.t("For a more complete list of contributors, see our changelog:"))
1013
+	rb.Add(nil, server.name, RPL_INFO, client.nick, "    https://github.com/oragono/oragono/blob/master/CHANGELOG.md")
1014
+	rb.Add(nil, server.name, RPL_INFO, client.nick, "")
1014 1015
 	// show translators for languages other than good ole' regular English
1015 1016
 	tlines := server.Languages().Translators()
1016 1017
 	if 0 < len(tlines) {

+ 2
- 10
irc/server.go View File

@@ -992,15 +992,7 @@ var (
992 992
 	infoString2 = strings.Split(`    Daniel Oakley,          DanielOaks,    <daniel@danieloaks.net>
993 993
     Shivaram Lingamneni,    slingamn,      <slingamn@cs.stanford.edu>
994 994
 `, "\n")
995
-	infoString3 = strings.Split(`    3onyc
996
-    Edmund Huber
997
-    Euan Kemp (euank)
998
-    Jeremy Latt
999
-    Martin Lindhe (martinlindhe)
1000
-    Roberto Besser (besser)
1001
-    Robin Burchell (rburchell)
1002
-    Sean Enck (enckse)
1003
-    soul9
1004
-    Vegax
995
+	infoString3 = strings.Split(`    Jeremy Latt,            jlatt
996
+    Edmund Huber,           edmund-huber
1005 997
 `, "\n")
1006 998
 )

Loading…
Cancel
Save