From 2f08401a0f1f8b0dbe907a269436b0284c982710 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Wed, 15 Jun 2016 21:50:56 +1000 Subject: [PATCH] Attempt to add mostly-correct license info at the top of each file... track this stuff a bit better --- irc/capability.go | 4 ++++ irc/channel.go | 5 +++++ irc/client.go | 5 +++++ irc/client_lookup_set.go | 3 +++ irc/commands.go | 5 +++++ irc/config.go | 5 +++++ irc/constants.go | 5 +++++ irc/database.go | 6 +++++- irc/debug.go | 3 +++ irc/isupport.go | 3 +++ irc/logging.go | 3 +++ irc/modes.go | 5 +++++ irc/net.go | 4 ++++ irc/net_test.go | 4 ++++ irc/nickname.go | 4 ++++ irc/password.go | 6 +++++- irc/reply.go | 5 +++++ irc/server.go | 5 +++++ irc/socket.go | 4 ++++ irc/strings.go | 5 +++++ irc/theater.go | 4 ++++ irc/types.go | 4 ++++ irc/websocket.go | 9 +++++++-- irc/whowas.go | 3 +++ oragono.go | 5 +++++ 25 files changed, 110 insertions(+), 4 deletions(-) diff --git a/irc/capability.go b/irc/capability.go index 27c12c79..89378af1 100644 --- a/irc/capability.go +++ b/irc/capability.go @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/channel.go b/irc/channel.go index fa73e642..09475f21 100644 --- a/irc/channel.go +++ b/irc/channel.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/client.go b/irc/client.go index 7fc5d63c..d6074e63 100644 --- a/irc/client.go +++ b/irc/client.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/client_lookup_set.go b/irc/client_lookup_set.go index c9147a07..e26d7725 100644 --- a/irc/client_lookup_set.go +++ b/irc/client_lookup_set.go @@ -1,3 +1,6 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// released under the MIT license + package irc import ( diff --git a/irc/commands.go b/irc/commands.go index 9300e440..b1debd21 100644 --- a/irc/commands.go +++ b/irc/commands.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/config.go b/irc/config.go index d9fdf4f8..bc90c1c1 100644 --- a/irc/config.go +++ b/irc/config.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/constants.go b/irc/constants.go index 0a71e8fe..b409bafa 100644 --- a/irc/constants.go +++ b/irc/constants.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc const ( diff --git a/irc/database.go b/irc/database.go index 2a482ecf..6a84901d 100644 --- a/irc/database.go +++ b/irc/database.go @@ -1,11 +1,15 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// released under the MIT license + package irc import ( "database/sql" "fmt" - _ "github.com/mattn/go-sqlite3" "log" "os" + + _ "github.com/mattn/go-sqlite3" ) func InitDB(path string) { diff --git a/irc/debug.go b/irc/debug.go index 9948ad40..3b5ed906 100644 --- a/irc/debug.go +++ b/irc/debug.go @@ -1,3 +1,6 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// released under the MIT license + package irc import ( diff --git a/irc/isupport.go b/irc/isupport.go index 7faaed10..78297c24 100644 --- a/irc/isupport.go +++ b/irc/isupport.go @@ -1,3 +1,6 @@ +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/logging.go b/irc/logging.go index 6390aab2..afc9f27b 100644 --- a/irc/logging.go +++ b/irc/logging.go @@ -1,3 +1,6 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// released under the MIT license + package irc import ( diff --git a/irc/modes.go b/irc/modes.go index 47c39150..8ac084ba 100644 --- a/irc/modes.go +++ b/irc/modes.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/net.go b/irc/net.go index 446dfcbe..c1050121 100644 --- a/irc/net.go +++ b/irc/net.go @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/net_test.go b/irc/net_test.go index 44c5c9fd..be30751b 100644 --- a/irc/net_test.go +++ b/irc/net_test.go @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import "testing" diff --git a/irc/nickname.go b/irc/nickname.go index 6c846a1c..bf3d5bf4 100644 --- a/irc/nickname.go +++ b/irc/nickname.go @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc type NickCommand struct { diff --git a/irc/password.go b/irc/password.go index a814b4a4..71ed849f 100644 --- a/irc/password.go +++ b/irc/password.go @@ -1,9 +1,13 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// released under the MIT license + package irc import ( - "golang.org/x/crypto/bcrypt" "encoding/base64" "errors" + + "golang.org/x/crypto/bcrypt" ) var ( diff --git a/irc/reply.go b/irc/reply.go index 8ce7796f..061f0625 100644 --- a/irc/reply.go +++ b/irc/reply.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/server.go b/irc/server.go index 7e7fab6a..1646d747 100644 --- a/irc/server.go +++ b/irc/server.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/socket.go b/irc/socket.go index eac2e8b4..228c7726 100644 --- a/irc/socket.go +++ b/irc/socket.go @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/strings.go b/irc/strings.go index 97472276..160997cc 100644 --- a/irc/strings.go +++ b/irc/strings.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package irc import ( diff --git a/irc/theater.go b/irc/theater.go index e2eacc1a..e3a06860 100644 --- a/irc/theater.go +++ b/irc/theater.go @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// released under the MIT license + package irc type TheaterClient Name diff --git a/irc/types.go b/irc/types.go index dabe4c2b..7a15b74c 100644 --- a/irc/types.go +++ b/irc/types.go @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// released under the MIT license + package irc import ( diff --git a/irc/websocket.go b/irc/websocket.go index 72a1c1c8..7db80b6a 100644 --- a/irc/websocket.go +++ b/irc/websocket.go @@ -1,9 +1,14 @@ +// Copyright (c) 2015 Niels Freier +// Copyright (c) 2015 Edmund Huber +// released under the MIT license + package irc import ( - "github.com/gorilla/websocket" "net/http" "time" + + "github.com/gorilla/websocket" ) var upgrader = websocket.Upgrader{ @@ -17,7 +22,7 @@ var upgrader = websocket.Upgrader{ // http://www.christian-schneider.net/CrossSiteWebSocketHijacking.html#main. // We don't care about Origin because the (IRC) authentication is contained // in the WS stream -- the WS session is not privileged when it is opened. - CheckOrigin: func(r *http.Request) bool { return true }, + CheckOrigin: func(r *http.Request) bool { return true }, } type WSContainer struct { diff --git a/irc/whowas.go b/irc/whowas.go index b8c4b2f2..c7bca337 100644 --- a/irc/whowas.go +++ b/irc/whowas.go @@ -1,3 +1,6 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// released under the MIT license + package irc type WhoWasList struct { diff --git a/oragono.go b/oragono.go index fd11bf10..f03d0135 100644 --- a/oragono.go +++ b/oragono.go @@ -1,3 +1,8 @@ +// Copyright (c) 2012-2014 Jeremy Latt +// Copyright (c) 2014-2015 Edmund Huber +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + package main import (